openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/arm/translate: ensure gen_goto_tb sets exit flags 

As the gen_goto_tb function can do both static and dynamic jumps it
should also set the is_jmp field. This matches the behaviour of the
a64 code.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Message-id: 20170713141928.25419-5-alex.bennee@linaro.org
[tweak to multiline comment formatting]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Alex Bennée 2017-07-17 13:36:07 +01:00 committed by Peter Maydell
parent abd1fb0ee2
commit 4cae8f56fb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/arm/translate.c
View File

@ -4158,6 +4158,10 @@ static void gen_goto_ptr(void)
tcg_temp_free(addr); tcg_temp_free(addr);
} }
/* This will end the TB but doesn't guarantee we'll return to
* cpu_loop_exec. Any live exit_requests will be processed as we
* enter the next TB.
*/
static void gen_goto_tb(DisasContext *s, int n, target_ulong dest) static void gen_goto_tb(DisasContext *s, int n, target_ulong dest)
{ {
if (use_goto_tb(s, dest)) { if (use_goto_tb(s, dest)) {
@ -4168,6 +4172,7 @@ static void gen_goto_tb(DisasContext *s, int n, target_ulong dest)
gen_set_pc_im(s, dest); gen_set_pc_im(s, dest);
gen_goto_ptr(); gen_goto_ptr();
} }
s->is_jmp = DISAS_TB_JUMP;
} }
static inline void gen_jmp (DisasContext *s, uint32_t dest) static inline void gen_jmp (DisasContext *s, uint32_t dest)
@ -4179,7 +4184,6 @@ static inline void gen_jmp (DisasContext *s, uint32_t dest)
gen_bx_im(s, dest); gen_bx_im(s, dest);
} else { } else {
gen_goto_tb(s, 0, dest); gen_goto_tb(s, 0, dest);
s->is_jmp = DISAS_TB_JUMP;
} }
} }