From 55b19c099ef35d219b4972b949faa205ca342c0b Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 5 Mar 2018 14:20:28 -0500 Subject: [PATCH] target/i386: Fix compiler warnings These gcc warnings are fixed: target/i386/translate.c:4461:12: warning: variable 'prefixes' might be clobbered by 'longjmp' or 'vfork' [-Wclobbered] target/i386/translate.c:4466:9: warning: variable 'rex_w' might be clobbered by 'longjmp' or 'vfork' [-Wclobbered] target/i386/translate.c:4466:16: warning: variable 'rex_r' might be clobbered by 'longjmp' or 'vfork' [-Wclobbered] Tested with x86_64-w64-mingw32-gcc from Debian stretch. Backports commit a4926d99129a1d8072fc4681cd4efdb214f65ed4 from qemu --- qemu/target/i386/translate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qemu/target/i386/translate.c b/qemu/target/i386/translate.c index ec585075..2ac55a69 100644 --- a/qemu/target/i386/translate.c +++ b/qemu/target/i386/translate.c @@ -5098,10 +5098,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) check_exit_request(tcg_ctx); } - prefixes = 0; s->override = -1; - rex_w = -1; - rex_r = 0; #ifdef TARGET_X86_64 s->rex_x = 0; s->rex_b = 0; @@ -5116,6 +5113,10 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) return s->pc; } + prefixes = 0; + rex_w = -1; + rex_r = 0; + next_byte: b = x86_ldub_code(env, s); /* Collect prefixes. */