From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c6ToJ-0003By-Oj for qemu-devel@nongnu.org; Mon, 14 Nov 2016 21:49:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c6ToH-0000C2-Vm for qemu-devel@nongnu.org; Mon, 14 Nov 2016 21:49:23 -0500 From: David Gibson Date: Tue, 15 Nov 2016 13:48:55 +1100 Message-Id: <1479178144-28153-11-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1479178144-28153-1-git-send-email-david@gibson.dropbear.id.au> References: <1479178144-28153-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PULL 10/19] target-ppc: Implement bcdcfz. instruction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: agraf@suse.de, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, clg@kaod.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Jose Ricardo Ziviani , David Gibson From: Jose Ricardo Ziviani 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 Signed-off-by: David Gibson --- target-ppc/helper.h | 1 + target-ppc/int_helper.c | 44 +++++++++++++++++++++++++++++++++++++ target-ppc/translate/vmx-impl.inc.c | 7 ++++++ 3 files changed, 52 insertions(+) diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 180c5d0..b083c08 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -380,6 +380,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_3(bcdctn, i32, avr, avr, i32) +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 d4106a9..2aacc94 100644 --- a/target-ppc/int_helper.c +++ b/target-ppc/int_helper.c @@ -2787,6 +2787,50 @@ uint32_t helper_bcdctn(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps) return cr; } +uint32_t helper_bcdcfz(ppc_avr_t *r, ppc_avr_t *b, uint32_t ps) +{ + int i; + int cr = 0; + int invalid = 0; + int zone_digit = 0; + int zone_lead = ps ? 0xF : 0x3; + int digit = 0; + ppc_avr_t ret = { .u64 = { 0, 0 } }; + int sgnb = b->u8[BCD_DIG_BYTE(0)] >> 4; + + if (unlikely((sgnb < 0xA) && ps)) { + invalid = 1; + } + + for (i = 0; i < 16; i++) { + zone_digit = (i * 2) ? b->u8[BCD_DIG_BYTE(i * 2)] >> 4 : zone_lead; + digit = b->u8[BCD_DIG_BYTE(i * 2)] & 0xF; + if (unlikely(zone_digit != zone_lead || digit > 0x9)) { + invalid = 1; + break; + } + + bcd_put_digit(&ret, digit, i + 1); + } + + if ((ps && (sgnb == 0xB || sgnb == 0xD)) || + (!ps && (sgnb & 0x4))) { + bcd_put_digit(&ret, BCD_NEG_PREF, 0); + } else { + bcd_put_digit(&ret, BCD_PLUS_PREF_1, 0); + } + + cr = bcd_cmp_zero(&ret); + + 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 795e55c..d9e3eb6 100644 --- a/target-ppc/translate/vmx-impl.inc.c +++ b/target-ppc/translate/vmx-impl.inc.c @@ -987,6 +987,7 @@ GEN_BCD(bcdadd) GEN_BCD(bcdsub) GEN_BCD2(bcdcfn) GEN_BCD2(bcdctn) +GEN_BCD2(bcdcfz) static void gen_xpnd04_1(DisasContext *ctx) { @@ -994,6 +995,9 @@ static void gen_xpnd04_1(DisasContext *ctx) case 5: gen_bcdctn(ctx); break; + case 6: + gen_bcdcfz(ctx); + break; case 7: gen_bcdcfn(ctx); break; @@ -1006,6 +1010,9 @@ static void gen_xpnd04_1(DisasContext *ctx) static void gen_xpnd04_2(DisasContext *ctx) { switch (opc4(ctx->opcode)) { + case 6: + gen_bcdcfz(ctx); + break; case 7: gen_bcdcfn(ctx); break; -- 2.7.4