From: Yasmin Beatriz <yasmins@linux.ibm.com>
To: qemu-ppc@nongnu.org
Cc: qemu-devel@nongnu.org, david@gibson.dropbear.id.au, rth@twiddle.net
Subject: [Qemu-devel] [PATCH] target/ppc: simplify bcdadd/sub functions
Date: Tue, 24 Jul 2018 12:13:04 +0000 [thread overview]
Message-ID: <1532434384-12355-1-git-send-email-yasmins@linux.ibm.com> (raw)
After solving a corner case in bcdsub, this patch simplifies the logic
of both bcdadd/sub instructions by removing some unnecessary local flags.
Signed-off-by: Yasmin Beatriz <yasmins@linux.ibm.com>
---
target/ppc/int_helper.c | 33 +++++++++------------------------
1 file changed, 9 insertions(+), 24 deletions(-)
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c
index fa18e6e..b8ac4bb 100644
--- a/target/ppc/int_helper.c
+++ b/target/ppc/int_helper.c
@@ -2671,16 +2671,14 @@ static int bcd_cmp_mag(ppc_avr_t *a, ppc_avr_t *b)
return 0;
}
-static int bcd_add_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid,
+static void bcd_add_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid,
int *overflow)
{
int carry = 0;
int i;
- int is_zero = 1;
for (i = 1; i <= 31; i++) {
uint8_t digit = bcd_get_digit(a, i, invalid) +
bcd_get_digit(b, i, invalid) + carry;
- is_zero &= (digit == 0);
if (digit > 9) {
carry = 1;
digit -= 10;
@@ -2689,26 +2687,20 @@ static int bcd_add_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid,
}
bcd_put_digit(t, digit, i);
-
- if (unlikely(*invalid)) {
- return -1;
- }
}
*overflow = carry;
- return is_zero;
}
-static int bcd_sub_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid,
+static void bcd_sub_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid,
int *overflow)
{
int carry = 0;
int i;
- int is_zero = 1;
+
for (i = 1; i <= 31; i++) {
uint8_t digit = bcd_get_digit(a, i, invalid) -
bcd_get_digit(b, i, invalid) + carry;
- is_zero &= (digit == 0);
if (digit & 0x80) {
carry = -1;
digit += 10;
@@ -2717,14 +2709,9 @@ static int bcd_sub_mag(ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, int *invalid,
}
bcd_put_digit(t, digit, i);
-
- if (unlikely(*invalid)) {
- return -1;
- }
}
*overflow = carry;
- return is_zero;
}
uint32_t helper_bcdadd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)
@@ -2734,25 +2721,25 @@ uint32_t helper_bcdadd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)
int sgnb = bcd_get_sgn(b);
int invalid = (sgna == 0) || (sgnb == 0);
int overflow = 0;
- int zero = 0;
uint32_t cr = 0;
ppc_avr_t result = { .u64 = { 0, 0 } };
if (!invalid) {
if (sgna == sgnb) {
result.u8[BCD_DIG_BYTE(0)] = bcd_preferred_sgn(sgna, ps);
- zero = bcd_add_mag(&result, a, b, &invalid, &overflow);
- cr = (sgna > 0) ? CRF_GT : CRF_LT;
+ bcd_add_mag(&result, a, b, &invalid, &overflow);
+ cr = bcd_cmp_zero(&result);
} else if (bcd_cmp_mag(a, b) > 0) {
result.u8[BCD_DIG_BYTE(0)] = bcd_preferred_sgn(sgna, ps);
- zero = bcd_sub_mag(&result, a, b, &invalid, &overflow);
+ bcd_sub_mag(&result, a, b, &invalid, &overflow);
cr = (sgna > 0) ? CRF_GT : CRF_LT;
} else if (bcd_cmp_mag(a, b) == 0) {
result.u8[BCD_DIG_BYTE(0)] = bcd_preferred_sgn(0, ps);
- zero = bcd_sub_mag(&result, b, a, &invalid, &overflow);
+ bcd_sub_mag(&result, b, a, &invalid, &overflow);
+ cr = CRF_EQ;
} else {
result.u8[BCD_DIG_BYTE(0)] = bcd_preferred_sgn(sgnb, ps);
- zero = bcd_sub_mag(&result, b, a, &invalid, &overflow);
+ bcd_sub_mag(&result, b, a, &invalid, &overflow);
cr = (sgnb > 0) ? CRF_GT : CRF_LT;
}
}
@@ -2762,8 +2749,6 @@ uint32_t helper_bcdadd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, uint32_t ps)
cr = CRF_SO;
} else if (overflow) {
cr |= CRF_SO;
- } else if (zero) {
- cr = CRF_EQ;
}
*r = result;
--
1.8.3.1
next reply other threads:[~2018-07-24 12:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-24 12:13 Yasmin Beatriz [this message]
2018-07-26 1:40 ` [Qemu-devel] [PATCH] target/ppc: simplify bcdadd/sub functions David Gibson
2018-07-26 19:44 ` Yasmin Beatriz
2018-07-27 0:48 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1532434384-12355-1-git-send-email-yasmins@linux.ibm.com \
--to=yasmins@linux.ibm.com \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).