diff options
| author | Andrew Bennett <andrew.bennett@imgtec.com> | 2015-06-29 10:20:07 +0000 |
|---|---|---|
| committer | Leon Alrae <leon.alrae@imgtec.com> | 2015-07-15 14:07:25 +0100 |
| commit | f01a361bfcce4bd0c439b0e051ef2a1e56727a44 (patch) | |
| tree | ea3b3a551636e892f6b837887a449aa994d1ea53 /linux-user | |
| parent | 26e7e982b267e71d40cd20e9e234fedef6770a90 (diff) | |
| download | qemu-f01a361bfcce4bd0c439b0e051ef2a1e56727a44.zip qemu-f01a361bfcce4bd0c439b0e051ef2a1e56727a44.tar.gz qemu-f01a361bfcce4bd0c439b0e051ef2a1e56727a44.tar.bz2 | |
linux-user: Fix MIPS N64 trap and break instruction bug
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 <andrew.bennett@imgtec.com>
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | 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 05914b1..fdee981 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2577,7 +2577,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; } @@ -2611,7 +2611,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) { |