[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 23/64] ppc: Make float_invalid_op_excp() pass the retur
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 23/64] ppc: Make float_invalid_op_excp() pass the return address |
Date: |
Wed, 7 Sep 2016 20:29:02 +1000 |
From: Benjamin Herrenschmidt <address@hidden>
Instead of relying on NIP having been updated already
Signed-off-by: Benjamin Herrenschmidt <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
target-ppc/fpu_helper.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c
index e1f600a..8d881fc 100644
--- a/target-ppc/fpu_helper.c
+++ b/target-ppc/fpu_helper.c
@@ -19,6 +19,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
+#include "exec/exec-all.h"
#define float64_snan_to_qnan(x) ((x) | 0x0008000000000000ULL)
#define float32_snan_to_qnan(x) ((x) | 0x00400000)
@@ -200,8 +201,9 @@ static inline uint64_t float_invalid_op_excp(CPUPPCState
*env, int op,
/* Update the floating-point enabled exception summary */
env->fpscr |= 1 << FPSCR_FEX;
if (msr_fe0 != 0 || msr_fe1 != 0) {
- helper_raise_exception_err(env, POWERPC_EXCP_PROGRAM,
- POWERPC_EXCP_FP | op);
+ /* GETPC() works here because this is inline */
+ raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM,
+ POWERPC_EXCP_FP | op, GETPC());
}
}
return ret;
--
2.7.4
- [Qemu-ppc] [PULL 30/64] ppc: Fix source NIP on SLB related interrupts, (continued)
- [Qemu-ppc] [PULL 30/64] ppc: Fix source NIP on SLB related interrupts, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 36/64] ppc: Don't update NIP in dcbz and lscbx, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 53/64] hw/ppc: use error_report instead of fprintf, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 61/64] ppc: Improve a few more helper flags, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 29/64] ppc: Make tlb_fill() use new exception helper, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 46/64] target-ppc: add dtstsfi[q] instructions, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 57/64] ppc: Stop dumping state on all exceptions in linux-user, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 64/64] tests: Check serial output of firmware boot of some machines, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 09/64] target-ppc: add cnttzd[.] instruction, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 14/64] target-ppc: add maddhd and maddhdu instruction, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 23/64] ppc: Make float_invalid_op_excp() pass the return address,
David Gibson <=
- [Qemu-ppc] [PULL 06/64] target-ppc: add cmprb instruction, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 25/64] ppc: Don't update the NIP in floating point generated code, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 35/64] ppc: Don't update NIP if not taking alignment exceptions, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 56/64] ppc: Fix catching some segfaults in user mode, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 42/64] ppc: Use a helper to generate "LE unsupported" alignment interrupts, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 51/64] target-ppc: add extswsli[.] instruction, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 43/64] ppc: load/store multiple and string insns don't do LE, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 49/64] target-ppc: add vslv instruction, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 24/64] ppc: Make float_check_status() pass the return address, David Gibson, 2016/09/07
- [Qemu-ppc] [PULL 28/64] ppc: Don't update NIP in lmw/stmw/icbi, David Gibson, 2016/09/07