[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/31] target/sh4: fix FPSCR cause vs flag inversion
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PULL 03/31] target/sh4: fix FPSCR cause vs flag inversion |
Date: |
Tue, 18 Jul 2017 23:50:22 +0200 |
The floating-point status/control register contains cause and flag
bits. The cause bits are set to 0 before executing the instruction,
while the flag bits hold the status of the exception generated after
the field was last cleared.
Message-Id: <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
---
target/sh4/op_helper.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c
index f228daf125..f2e39c5ca6 100644
--- a/target/sh4/op_helper.c
+++ b/target/sh4/op_helper.c
@@ -219,29 +219,29 @@ static void update_fpscr(CPUSH4State *env, uintptr_t
retaddr)
xcpt = get_float_exception_flags(&env->fp_status);
- /* Clear the flag entries */
- env->fpscr &= ~FPSCR_FLAG_MASK;
+ /* Clear the cause entries */
+ env->fpscr &= ~FPSCR_CAUSE_MASK;
if (unlikely(xcpt)) {
if (xcpt & float_flag_invalid) {
- env->fpscr |= FPSCR_FLAG_V;
+ env->fpscr |= FPSCR_CAUSE_V;
}
if (xcpt & float_flag_divbyzero) {
- env->fpscr |= FPSCR_FLAG_Z;
+ env->fpscr |= FPSCR_CAUSE_Z;
}
if (xcpt & float_flag_overflow) {
- env->fpscr |= FPSCR_FLAG_O;
+ env->fpscr |= FPSCR_CAUSE_O;
}
if (xcpt & float_flag_underflow) {
- env->fpscr |= FPSCR_FLAG_U;
+ env->fpscr |= FPSCR_CAUSE_U;
}
if (xcpt & float_flag_inexact) {
- env->fpscr |= FPSCR_FLAG_I;
+ env->fpscr |= FPSCR_CAUSE_I;
}
- /* Accumulate in cause entries */
- env->fpscr |= (env->fpscr & FPSCR_FLAG_MASK)
- << (FPSCR_CAUSE_SHIFT - FPSCR_FLAG_SHIFT);
+ /* Accumulate in flag entries */
+ env->fpscr |= (env->fpscr & FPSCR_CAUSE_MASK)
+ >> (FPSCR_CAUSE_SHIFT - FPSCR_FLAG_SHIFT);
/* Generate an exception if enabled */
cause = (env->fpscr & FPSCR_CAUSE_MASK) >> FPSCR_CAUSE_SHIFT;
--
2.11.0
- [Qemu-devel] [PULL 17/31] target/sh4: Hoist fp register bank selection, (continued)
- [Qemu-devel] [PULL 17/31] target/sh4: Hoist fp register bank selection, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 25/31] target/sh4: Tidy misc illegal insn checks, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 05/31] target/sh4: return result of fcmp using TCG, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 31/31] target/sh4: Use tcg_gen_lookup_and_goto_ptr, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 29/31] target/sh4: Add missing FPSCR.PR == 0 checks, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 20/31] target/sh4: Load/store Dr as 64-bit quantities, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 10/31] target/sh4: Handle user-space atomics, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 28/31] target/sh4: Implement fpchg, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 04/31] target/sh4: do not use a helper to implement fneg, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 22/31] target/sh4: Unify code for CHECK_NOT_DELAY_SLOT, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 03/31] target/sh4: fix FPSCR cause vs flag inversion,
Aurelien Jarno <=
- [Qemu-devel] [PULL 27/31] target/sh4: Introduce CHECK_SH4A, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 11/31] target/sh4: Recognize common gUSA sequences, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 08/31] target/sh4: Keep env->flags clean, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 23/31] target/sh4: Unify code for CHECK_PRIVILEGED, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 12/31] linux-user/sh4: Notice gUSA regions during signal delivery, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 16/31] target/sh4: Pass DisasContext to fpr64 routines, Aurelien Jarno, 2017/07/18
- [Qemu-devel] [PULL 15/31] target/sh4: Unify cpu_fregs into FREG, Aurelien Jarno, 2017/07/18
- Re: [Qemu-devel] [PULL 00/31] target/sh4 queue, no-reply, 2017/07/18
- Re: [Qemu-devel] [PULL 00/31] target/sh4 queue, no-reply, 2017/07/18