From: Andrew Bennett <[email protected]> For the MIPS N64 ABI when QEMU reads the break/trap instruction so that it can inspect the break/trap code it reads 8 rather than 4 bytes which means it finds the code field from the instruction after the break/trap instruction. This then causes the break/trap handling code to fail because it does not understand the code number.
The fix forces QEMU to always read 4 bytes of instruction data rather than deciding how much to read based on the ABI. Signed-off-by: Andrew Bennett <[email protected]> --- linux-user/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index c855bcc..2f8f3e6 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2578,7 +2578,7 @@ done_syscall: code = (trap_instr >> 6) & 0x3f; } } else { - ret = get_user_ual(trap_instr, env->active_tc.PC); + ret = get_user_u32(trap_instr, env->active_tc.PC); if (ret != 0) { goto error; } @@ -2612,7 +2612,7 @@ done_syscall: trap_instr = (instr[0] << 16) | instr[1]; } else { - ret = get_user_ual(trap_instr, env->active_tc.PC); + ret = get_user_u32(trap_instr, env->active_tc.PC); } if (ret != 0) { -- 1.7.1
