Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
target/ppc: Fix instruction loading endianness in alignment interrupt
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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
  • Loading branch information
npiggin authored and legoater committed Jun 25, 2023
1 parent 6b8a053 commit 888050c
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion target/ppc/excp_helper.c
Expand Up @@ -133,6 +133,26 @@ static void dump_hcall(CPUPPCState *env)
env->nip);
}

#ifdef CONFIG_TCG
/* Return true iff byteswap is needed to load instruction */
static inline bool insn_need_byteswap(CPUArchState *env)
{
/* SYSTEM 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, hwaddr addr)
{
uint32_t insn = cpu_ldl_code(env, addr);

if (insn_need_byteswap(env)) {
insn = bswap32(insn);
}

return insn;
}
#endif

static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp)
{
const char *es;
Expand Down Expand Up @@ -3104,7 +3124,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:
Expand Down

0 comments on commit 888050c

Please sign in to comment.