mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-24 08:48:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

target/m68k: Use DISAS_NORETURN for exceptions

Browse source 
The raise_exception helper does not return. Do not generate
any code following that.

Backports commit cb4add334a5a8db263c20c33c5365be3868f8967 from qemu
This commit is contained in:
Richard Henderson 2018-06-15 10:43:55 -04:00 committed by Lioncash
parent 145174a359
commit 3c01ea765d
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qemu/target/m68k/translate.c
View file

@ -293,19 +293,20 @@ static void gen_jmp(DisasContext *s, TCGv dest)
s->is_jmp = DISAS_JUMP; s->is_jmp = DISAS_JUMP;
} }
static void gen_raise_exception(DisasContext *s, int nr) static void gen_exception(DisasContext *s, uint32_t dest, int nr)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv_i32 tmp = tcg_const_i32(tcg_ctx, nr); TCGv_i32 tmp;
update_cc_op(s);
tcg_gen_movi_i32(tcg_ctx, tcg_ctx->QREG_PC, dest);
tmp = tcg_const_i32(tcg_ctx, nr);
gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, tmp); gen_helper_raise_exception(tcg_ctx, tcg_ctx->cpu_env, tmp);
tcg_temp_free_i32(tcg_ctx, tmp); tcg_temp_free_i32(tcg_ctx, tmp);
}
static void gen_exception(DisasContext *s, uint32_t where, int nr) s->is_jmp = DISAS_NORETURN;
{
gen_jmp_im(s, where);
gen_raise_exception(s, nr);
} }
static inline void gen_addr_fault(DisasContext *s) static inline void gen_addr_fault(DisasContext *s)
@ -6369,7 +6370,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) {
gen_exception(dc, dc->pc, EXCP_DEBUG); gen_exception(dc, dc->pc, EXCP_DEBUG);
dc->is_jmp = DISAS_JUMP;
/* The address covered by the breakpoint must be included in /* The address covered by the breakpoint must be included in
[tb->pc, tb->pc + tb->size) in order to for it to be [tb->pc, tb->pc + tb->size) in order to for it to be
properly cleared -- thus we increment the PC here so that properly cleared -- thus we increment the PC here so that
@ -6419,6 +6419,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
tcg_gen_exit_tb(tcg_ctx, NULL, 0); tcg_gen_exit_tb(tcg_ctx, NULL, 0);
break; break;
case DISAS_TB_JUMP: case DISAS_TB_JUMP:
case DISAS_NORETURN:
/* nothing more to generate */ /* nothing more to generate */
break; break;
} }