Richard Henderson writes: > We have generated an exception, so use DISAS_NORETURN.
Shouldn't this be folded into patch 4? Thanks, Lluis > Signed-off-by: Richard Henderson <r...@twiddle.net> > --- > target/arm/translate-a64.c | 1 + > target/arm/translate.c | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) > diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c > index 342ff7c..657684b 100644 > --- a/target/arm/translate-a64.c > +++ b/target/arm/translate-a64.c > @@ -11285,6 +11285,7 @@ void gen_intermediate_code_a64(CPUState *cs, > TranslationBlock *tb) dc-> is_jmp = DISAS_UPDATE; > } else { > gen_exception_internal_insn(dc, 0, EXCP_DEBUG); > + dc->is_jmp = DISAS_NORETURN; > /* The address covered by the breakpoint must be > included in [tb->pc, tb->pc + tb->size) in order > to for it to be properly cleared -- thus we > diff --git a/target/arm/translate.c b/target/arm/translate.c > index 2ae68ce..83e5491 100644 > --- a/target/arm/translate.c > +++ b/target/arm/translate.c > @@ -11942,6 +11942,7 @@ void gen_intermediate_code(CPUState *cs, > TranslationBlock *tb) dc-> is_jmp = DISAS_UPDATE; > } else { > gen_exception_internal_insn(dc, 0, EXCP_DEBUG); > + dc->is_jmp = DISAS_NORETURN; > /* The address covered by the breakpoint must be > included in [tb->pc, tb->pc + tb->size) in order > to for it to be properly cleared -- thus we > @@ -11986,7 +11987,8 @@ void gen_intermediate_code(CPUState *cs, > TranslationBlock *tb) > assert(num_insns == 1); > gen_exception(EXCP_UDEF, syn_swstep(dc->ss_same_el, 0, 0), > default_exception_el(dc)); > - goto done_generating; > + dc->is_jmp = DISAS_NORETURN; > + break; > } > if (dc->thumb) { > -- > 2.9.4