[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] target-tricore: calculate av bits before saturat
From: |
Bastian Koppelmann |
Subject: |
[Qemu-devel] [PULL 3/9] target-tricore: calculate av bits before saturation |
Date: |
Mon, 26 Jan 2015 20:03:14 +0000 |
64 bit mac instructions calculated the av bits after the saturation, which
resulted in a wrong PSW. This moves the av bit calculation before the
saturation.
Signed-off-by: Bastian Koppelmann <address@hidden>
---
target-tricore/op_helper.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index ec2a0cc..dcc65b1 100644
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -371,6 +371,10 @@ uint64_t helper_madd64_ssov(CPUTriCoreState *env,
target_ulong r1,
ret = mul + r2;
ovf = (ret ^ mul) & ~(mul ^ r2);
+ t1 = ret >> 32;
+ env->PSW_USB_AV = t1 ^ t1 * 2u;
+ env->PSW_USB_SAV |= env->PSW_USB_AV;
+
if ((int64_t)ovf < 0) {
env->PSW_USB_V = (1 << 31);
env->PSW_USB_SV = (1 << 31);
@@ -384,9 +388,6 @@ uint64_t helper_madd64_ssov(CPUTriCoreState *env,
target_ulong r1,
} else {
env->PSW_USB_V = 0;
}
- t1 = ret >> 32;
- env->PSW_USB_AV = t1 ^ t1 * 2u;
- env->PSW_USB_SAV |= env->PSW_USB_AV;
return ret;
}
@@ -401,6 +402,10 @@ uint64_t helper_madd64_suov(CPUTriCoreState *env,
target_ulong r1,
mul = t1 * t3;
ret = mul + r2;
+ t1 = ret >> 32;
+ env->PSW_USB_AV = t1 ^ t1 * 2u;
+ env->PSW_USB_SAV |= env->PSW_USB_AV;
+
if (ret < r2) {
env->PSW_USB_V = (1 << 31);
env->PSW_USB_SV = (1 << 31);
@@ -409,9 +414,6 @@ uint64_t helper_madd64_suov(CPUTriCoreState *env,
target_ulong r1,
} else {
env->PSW_USB_V = 0;
}
- t1 = ret >> 32;
- env->PSW_USB_AV = t1 ^ t1 * 2u;
- env->PSW_USB_SAV |= env->PSW_USB_AV;
return ret;
}
@@ -451,6 +453,10 @@ uint64_t helper_msub64_ssov(CPUTriCoreState *env,
target_ulong r1,
ret = r2 - mul;
ovf = (ret ^ r2) & (mul ^ r2);
+ t1 = ret >> 32;
+ env->PSW_USB_AV = t1 ^ t1 * 2u;
+ env->PSW_USB_SAV |= env->PSW_USB_AV;
+
if ((int64_t)ovf < 0) {
env->PSW_USB_V = (1 << 31);
env->PSW_USB_SV = (1 << 31);
@@ -464,9 +470,6 @@ uint64_t helper_msub64_ssov(CPUTriCoreState *env,
target_ulong r1,
} else {
env->PSW_USB_V = 0;
}
- t1 = ret >> 32;
- env->PSW_USB_AV = t1 ^ t1 * 2u;
- env->PSW_USB_SAV |= env->PSW_USB_AV;
return ret;
}
@@ -480,6 +483,10 @@ uint64_t helper_msub64_suov(CPUTriCoreState *env,
target_ulong r1,
mul = t1 * t3;
ret = r2 - mul;
+ t1 = ret >> 32;
+ env->PSW_USB_AV = t1 ^ t1 * 2u;
+ env->PSW_USB_SAV |= env->PSW_USB_AV;
+
if (ret > r2) {
env->PSW_USB_V = (1 << 31);
env->PSW_USB_SV = (1 << 31);
@@ -488,9 +495,6 @@ uint64_t helper_msub64_suov(CPUTriCoreState *env,
target_ulong r1,
} else {
env->PSW_USB_V = 0;
}
- t1 = ret >> 32;
- env->PSW_USB_AV = t1 ^ t1 * 2u;
- env->PSW_USB_SAV |= env->PSW_USB_AV;
return ret;
}
--
2.2.2
- [Qemu-devel] [PULL 0/9] tricore patches, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 1/9] target-tricore: Add missing ULL suffix on 64 bit constant, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 6/9] target-tricore: target-tricore: Add instructions of RR1 opcode format, that have 0x93 as first opcode, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 3/9] target-tricore: calculate av bits before saturation,
Bastian Koppelmann <=
- [Qemu-devel] [PULL 5/9] target-tricore: split up suov32 into suov32_pos and suov32_neg, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 7/9] target-tricore: Add instructions of RR2 opcode format, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 4/9] target-tricore: Fix bugs found by coverity, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 8/9] target-tricore: Add instructions of RRPW opcode format, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 9/9] target-tricore: Add instructions of RRR opcode format, Bastian Koppelmann, 2015/01/26
- [Qemu-devel] [PULL 2/9] target-tricore: Several translator and cpu model fixes, Bastian Koppelmann, 2015/01/26
- Re: [Qemu-devel] [PULL 0/9] tricore patches, Peter Maydell, 2015/01/27