From patchwork Wed Oct 26 13:18:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Ricardo Ziviani X-Patchwork-Id: 9397237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 70C9F60231 for ; Wed, 26 Oct 2016 13:23:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 551BA29B5E for ; Wed, 26 Oct 2016 13:23:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4995429B60; Wed, 26 Oct 2016 13:23:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C451329B5E for ; Wed, 26 Oct 2016 13:23:58 +0000 (UTC) Received: from localhost ([::1]:34458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzOBR-000340-Vl for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Oct 2016 09:23:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzO8H-0000xG-Sv for qemu-devel@nongnu.org; Wed, 26 Oct 2016 09:20:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzO8D-00038N-Rq for qemu-devel@nongnu.org; Wed, 26 Oct 2016 09:20:41 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:38303 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzO8D-000385-N9 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 09:20:37 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9QDKSQc031121 for ; Wed, 26 Oct 2016 09:20:37 -0400 Received: from e24smtp02.br.ibm.com (e24smtp02.br.ibm.com [32.104.18.86]) by mx0b-001b2d01.pphosted.com with ESMTP id 26augbescq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 26 Oct 2016 09:20:35 -0400 Received: from localhost by e24smtp02.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Oct 2016 11:19:16 -0200 Received: from d24dlp02.br.ibm.com (9.18.248.206) by e24smtp02.br.ibm.com (10.172.0.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 26 Oct 2016 11:19:13 -0200 Received: from d24relay04.br.ibm.com (d24relay04.br.ibm.com [9.18.232.146]) by d24dlp02.br.ibm.com (Postfix) with ESMTP id 21E6B1DC006F; Wed, 26 Oct 2016 09:19:13 -0400 (EDT) Received: from d24av05.br.ibm.com (d24av05.br.ibm.com [9.18.232.44]) by d24relay04.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u9QDJDMJ35979396; Wed, 26 Oct 2016 11:19:13 -0200 Received: from d24av05.br.ibm.com (localhost [127.0.0.1]) by d24av05.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u9QDJCFm010257; Wed, 26 Oct 2016 11:19:12 -0200 Received: from pacoca.ibm.com ([9.85.132.139]) by d24av05.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u9QDIxHS009740; Wed, 26 Oct 2016 11:19:10 -0200 From: Jose Ricardo Ziviani To: qemu-ppc@nongnu.org Date: Wed, 26 Oct 2016 11:18:57 -0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477487938-23921-1-git-send-email-joserz@linux.vnet.ibm.com> References: <1477487938-23921-1-git-send-email-joserz@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16102613-0020-0000-0000-00000256A79D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16102613-0021-0000-0000-00003061D333 Message-Id: <1477487938-23921-4-git-send-email-joserz@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-26_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610260229 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH] 3/4] target-ppc: Implement bcdcfz. instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bharata@linux.vnet.ibm.com, qemu-devel@nongnu.org, nikunj@linux.vnet.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP bcdcfz. converts from Zoned numeric format to BCD. Zoned format uses a byte to represent a digit where the most significant nibble is 0x3 or 0xf, depending on the preferred signal. Signed-off-by: Jose Ricardo Ziviani --- target-ppc/helper.h | 1 + target-ppc/int_helper.c | 55 +++++++++++++++++++++++++++++++++++++ target-ppc/translate/vmx-impl.inc.c | 7 +++-- 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 92eaaf0..f460635 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -371,6 +371,7 @@ DEF_HELPER_4(bcdadd, i32, avr, avr, avr, i32) DEF_HELPER_4(bcdsub, i32, avr, avr, avr, i32) DEF_HELPER_3(bcdcfn, i32, avr, avr, i32) DEF_HELPER_2(bcdctn, i32, avr, avr) +DEF_HELPER_3(bcdcfz, i32, avr, avr, i32) DEF_HELPER_2(xsadddp, void, env, i32) DEF_HELPER_2(xssubdp, void, env, i32) diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c index cffe82c..8cbbdfc 100644 --- a/target-ppc/int_helper.c +++ b/target-ppc/int_helper.c @@ -2459,6 +2459,17 @@ static int bcd_preferred_sgn(int sgn, int ps) } } +static uint8_t get_nibble(ppc_avr_t *bcd, int n) +{ + uint8_t result; + if (!(n & 1)) { + result = bcd->u8[BCD_DIG_BYTE(n)] & 0xF; + } else { + result = bcd->u8[BCD_DIG_BYTE(n)] >> 4; + } + return result; +} + static uint8_t bcd_get_digit(ppc_avr_t *bcd, int n, int *invalid) { uint8_t result; @@ -2713,6 +2724,50 @@ uint32_t helper_bcdctn(ppc_avr_t *r, ppc_avr_t *b) return cr; } +uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps) +{ + int i; + int j = 0; + int cr = 0; + int invalid = 0; + int eq_flag = 0; + int zone_digit = 0; + ppc_avr_t ret = { .u64 = { 0, 0 } }; + int sgnb = get_nibble(b, 1); + + if (unlikely(((sgnb < 0xA) && ps) || + ((get_nibble(b, 0) > 0x9) && !ps))) { + invalid = 1; + } + + for (i = 31, j = 16; i > 1; i -= 2, j--) { + zone_digit = get_nibble(b, i); + if (unlikely((ps && zone_digit != 0xF) || + (!ps && zone_digit != 0x3))) { + invalid = 1; + } + + eq_flag += zone_digit; + bcd_put_digit(&ret, get_nibble(b, i - 1), j); + } + bcd_put_digit(&ret, get_nibble(b, 0), 1); + + if ((ps && (sgnb == 0xB || sgnb == 0xD)) || + (!ps && (sgnb & 0x4))) { + bcd_put_digit(&ret, BCD_NEG_PREF, 0); + cr = (!eq_flag) ? 1 << CRF_LT : 1 << CRF_EQ; + } else { + bcd_put_digit(&ret, BCD_PLUS_PREF_1, 0); + cr = (!eq_flag) ? 1 << CRF_GT : 1 << CRF_EQ; + } + + if (unlikely(invalid)) { + cr = 1 << CRF_SO; + } + + *r = ret; + return cr; +} void helper_vsbox(ppc_avr_t *r, ppc_avr_t *a) { int i; diff --git a/target-ppc/translate/vmx-impl.inc.c b/target-ppc/translate/vmx-impl.inc.c index 4364881..9192f8f 100644 --- a/target-ppc/translate/vmx-impl.inc.c +++ b/target-ppc/translate/vmx-impl.inc.c @@ -917,6 +917,7 @@ GEN_BCD(bcdadd) GEN_BCD(bcdsub) GEN_BCD2(bcdcfn) GEN_BCD3(bcdctn) +GEN_BCD2(bcdcfz) static void gen_xpnd04_1(DisasContext *ctx) { @@ -931,7 +932,8 @@ static void gen_xpnd04_1(DisasContext *ctx) gen_bcdctn(ctx); break; case 6: - break; /* bcdcfz. */ + gen_bcdcfz(ctx); + break; case 7: gen_bcdcfn(ctx); break; @@ -952,7 +954,8 @@ static void gen_xpnd04_2(DisasContext *ctx) case 4: break; /* bcdctz. */ case 6: - break; /* bcdcfz. */ + gen_bcdcfz(ctx); + break; case 7: gen_bcdcfn(ctx); break;