Boris Shingarov has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40899 )
Change subject: arch-power: Fix arithmetic instructions
......................................................................
arch-power: Fix arithmetic instructions
The latest Power ISA introduces two new bits that record
carry and overflow out of bit 31 of the result, namely
CA32 and OV32 respectively, thereby changing the behaviour
of the add and subtract instructions that set them. Also,
now that 64-bit registers are being used, the nature of
the result, i.e. less than, greater than or equal to zero,
must be set by a 64-bit signed comparison of the result
to zero. This fixes the following instructions.
* Add Immediate (addi)
* Add Immediate Shifted (addis)
* Add (add[o][.])
* Subtract From (subf[o][.])
* Add Immediate Carrying (addic)
* Add Immediate Carrying and Record (addic.)
* Subtract From Immediate Carrying (subfic)
* Add Carrying (addc[o][.])
* Subtract From Carrying (subfc[o][.])
* Add Extended (adde[o][.])
* Subtract From Extended (subfe[o][.])
* Add to Zero Extended (addze[o][.])
* Subtract From Zero Extended (subfze[o][.])
* Negate (neg[o][.])
* Multiply Low Immediate (mulli)
* Multiply Low Word (mullw[o][.])
* Multiply High Word (mulhw[.])
* Multiply High Word Unsigned (mulhwu[.])
* Divide Word (divw[o][.])
* Divide Word Unsigned (divwu[o][.])
Change-Id: I8c79f1dca8b19010ed7b734d7ec9bb598df428c3
Signed-off-by: Sandipan Das <sandi...@linux.ibm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40899
Reviewed-by: Boris Shingarov <shinga...@labware.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/power/isa/decoder.isa
M src/arch/power/isa/formats/integer.isa
M src/arch/power/regs/misc.hh
3 files changed, 33 insertions(+), 17 deletions(-)
Approvals:
Boris Shingarov: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/power/isa/decoder.isa b/src/arch/power/isa/decoder.isa
index e993a7b..cc3b9f4 100644
--- a/src/arch/power/isa/decoder.isa
+++ b/src/arch/power/isa/decoder.isa
@@ -38,9 +38,8 @@
format IntImmArithOp {
7: mulli({{
- int32_t src = Ra_sw;
- int64_t prod = src * si;
- Rt = (uint32_t)prod;
+ int64_t res = Ra_sd * si;
+ Rt = res;
}});
8: subfic({{
@@ -486,15 +485,17 @@
}
11: IntArithCheckRcOp::mulhwu({{
- uint64_t prod = Ra_ud * Rb_ud;
- Rt = prod >> 32;
+ uint64_t res = (uint64_t)Ra_uw * Rb_uw;
+ res = res >> 32;
+ Rt = res;
}});
40: IntSumOp::subf({{ ~Ra }}, {{ Rb }}, {{ 1 }});
75: IntArithCheckRcOp::mulhw({{
- int64_t prod = Ra_sd * Rb_sd;
- Rt = prod >> 32;
+ uint64_t res = (int64_t)Ra_sw * Rb_sw;
+ res = res >> 32;
+ Rt = res;
}});
format IntSumOp {
@@ -508,19 +509,19 @@
}
235: IntArithCheckRcOp::mullw({{
- int64_t prod = Ra_sd * Rb_sd;
- Rt = prod;
- if (prod != (int32_t)prod) {
+ int64_t res = (int64_t)Ra_sw * Rb_sw;
+ if (res != (int32_t)res) {
setOV = true;
}
+ Rt = res;
}}, true);
266: IntSumOp::add({{ Ra }}, {{ Rb }});
format IntArithCheckRcOp {
459: divwu({{
- uint32_t src1 = Ra_sw;
- uint32_t src2 = Rb_sw;
+ uint32_t src1 = Ra_uw;
+ uint32_t src2 = Rb_uw;
if (src2 != 0) {
Rt = src1 / src2;
} else {
@@ -532,9 +533,8 @@
491: divw({{
int32_t src1 = Ra_sw;
int32_t src2 = Rb_sw;
- if ((src1 != 0x80000000 || src2 != 0xffffffff)
- && src2 != 0) {
- Rt = src1 / src2;
+ if ((src1 != INT32_MIN || src2 != -1) && src2 != 0) {
+ Rt = (uint32_t)(src1 / src2);
} else {
Rt = 0;
setOV = true;
diff --git a/src/arch/power/isa/formats/integer.isa
b/src/arch/power/isa/formats/integer.isa
index b0840ce..8583ba0 100644
--- a/src/arch/power/isa/formats/integer.isa
+++ b/src/arch/power/isa/formats/integer.isa
@@ -44,28 +44,42 @@
'''
computeCACode = '''
- if (findCarry(32, %(result)s, %(inputa)s, %(inputb)s)) {
+ if (findCarry(64, %(result)s, %(inputa)s, %(inputb)s)) {
xer.ca = 1;
} else {
xer.ca = 0;
}
+
+ if (findCarry(32, %(result)s, %(inputa)s, %(inputb)s)) {
+ xer.ca32 = 1;
+ } else {
+ xer.ca32 = 0;
+ }
'''
computeOVCode = '''
- if (findOverflow(32, %(result)s, %(inputa)s, %(inputb)s)) {
+ if (findOverflow(64, %(result)s, %(inputa)s, %(inputb)s)) {
xer.ov = 1;
xer.so = 1;
} else {
xer.ov = 0;
}
+
+ if (findOverflow(32, %(result)s, %(inputa)s, %(inputb)s)) {
+ xer.ov32 = 1;
+ } else {
+ xer.ov32 = 0;
+ }
'''
setOVCode = '''
if (setOV) {
xer.ov = 1;
+ xer.ov32 = 1;
xer.so = 1;
} else {
xer.ov = 0;
+ xer.ov32 = 0;
}
'''
diff --git a/src/arch/power/regs/misc.hh b/src/arch/power/regs/misc.hh
index 6a99816..1665e28 100644
--- a/src/arch/power/regs/misc.hh
+++ b/src/arch/power/regs/misc.hh
@@ -56,6 +56,8 @@
Bitfield<31> so;
Bitfield<30> ov;
Bitfield<29> ca;
+ Bitfield<19> ov32;
+ Bitfield<18> ca32;
EndBitUnion(Xer)
BitUnion32(Fpscr)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40899
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I8c79f1dca8b19010ed7b734d7ec9bb598df428c3
Gerrit-Change-Number: 40899
Gerrit-PatchSet: 7
Gerrit-Owner: Sandipan Das <sandi...@linux.ibm.com>
Gerrit-Reviewer: Boris Shingarov <shinga...@labware.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
