SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386: Use translator_ldub for everything

Browse Source 
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-04 23:01:59 -10:00
parent 1561fee691
commit dfc7228be3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/i386/tcg/translate.c
View File

@ -23,7 +23,6 @@
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "tcg/tcg-op.h" #include "tcg/tcg-op.h"
#include "tcg/tcg-op-gvec.h" #include "tcg/tcg-op-gvec.h"
#include "exec/cpu_ldst.h"
#include "exec/translator.h" #include "exec/translator.h"
#include "fpu/softfloat.h" #include "fpu/softfloat.h"
@ -1579,9 +1578,8 @@ static uint64_t advance_pc(CPUX86State *env, DisasContext *s, int num_bytes)
* This can happen even if the operand is only one byte long! * This can happen even if the operand is only one byte long!
*/ */
if (((s->pc - 1) ^ (pc - 1)) & TARGET_PAGE_MASK) { if (((s->pc - 1) ^ (pc - 1)) & TARGET_PAGE_MASK) {
volatile uint8_t unused = (void)translator_ldub(env, &s->base,
cpu_ldub_code(env, (s->pc - 1) & TARGET_PAGE_MASK); (s->pc - 1) & TARGET_PAGE_MASK);
(void) unused;
} }
siglongjmp(s->jmpbuf, 1); siglongjmp(s->jmpbuf, 1);
} }
@ -2177,7 +2175,7 @@ static void gen_unknown_opcode(CPUX86State *env, DisasContext *s)
fprintf(logfile, "ILLOPC: " TARGET_FMT_lx ":", pc); fprintf(logfile, "ILLOPC: " TARGET_FMT_lx ":", pc);
for (; pc < end; ++pc) { for (; pc < end; ++pc) {
fprintf(logfile, " %02x", cpu_ldub_code(env, pc)); fprintf(logfile, " %02x", translator_ldub(env, &s->base, pc));
} }
fprintf(logfile, "\n"); fprintf(logfile, "\n");
qemu_log_unlock(logfile); qemu_log_unlock(logfile);