[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 3/9] target/ppc: Fix instruction loading endianness in alignme
From: |
Nicholas Piggin |
Subject: |
[PATCH v3 3/9] target/ppc: Fix instruction loading endianness in alignment interrupt |
Date: |
Mon, 15 May 2023 19:26:49 +1000 |
powerpc ifetch endianness depends on MSR[LE] so it has to byteswap
after cpu_ldl_code(). This corrects DSISR bits in alignment
interrupts when running in little endian mode.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
Since v2: no change.
target/ppc/excp_helper.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 199328f4b6..bc2be4a726 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -133,6 +133,24 @@ static void dump_hcall(CPUPPCState *env)
env->nip);
}
+/* Return true iff byteswap is needed in a scalar memop */
+static inline bool need_byteswap(CPUArchState *env)
+{
+ /* SOFTMMU builds TARGET_BIG_ENDIAN. Need to swap when MSR[LE] is set */
+ return !!(env->msr & ((target_ulong)1 << MSR_LE));
+}
+
+static uint32_t ppc_ldl_code(CPUArchState *env, abi_ptr addr)
+{
+ uint32_t insn = cpu_ldl_code(env, addr);
+
+ if (need_byteswap(env)) {
+ insn = bswap32(insn);
+ }
+
+ return insn;
+}
+
static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp)
{
const char *es;
@@ -3097,7 +3115,7 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr
vaddr,
/* Restore state and reload the insn we executed, for filling in DSISR. */
cpu_restore_state(cs, retaddr);
- insn = cpu_ldl_code(env, env->nip);
+ insn = ppc_ldl_code(env, env->nip);
switch (env->mmu_model) {
case POWERPC_MMU_SOFT_4xx:
--
2.40.1
- Re: [PATCH v3 1/9] target/ppc: Fix width of some 32-bit SPRs, (continued)
[PATCH v3 2/9] target/ppc: Fix PMU MMCR0[PMCjCE] bit in hflags calculation, Nicholas Piggin, 2023/05/15
[PATCH v3 3/9] target/ppc: Fix instruction loading endianness in alignment interrupt,
Nicholas Piggin <=
[PATCH v3 4/9] target/ppc: Alignment faults do not set DSISR in ISA v3.0 onward, Nicholas Piggin, 2023/05/15
[PATCH v3 5/9] target/ppc: Change partition-scope translate interface, Nicholas Piggin, 2023/05/15
[PATCH v3 7/9] target/ppc: Implement HEIR SPR, Nicholas Piggin, 2023/05/15
[PATCH v3 8/9] target/ppc: Add ISA v3.1 LEV indication in SRR1 for system call interrupts, Nicholas Piggin, 2023/05/15
[PATCH v3 6/9] target/ppc: Add SRR1 prefix indication to interrupt handlers, Nicholas Piggin, 2023/05/15
[PATCH v3 9/9] target/ppc: Better CTRL SPR implementation, Nicholas Piggin, 2023/05/15
Re: [PATCH v3 0/9] target/ppc: Assorted ppc target fixes, Daniel Henrique Barboza, 2023/05/27