From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: edgar.iglesias@gmail.com
Subject: [PATCH v2 03/11] target/cris: Mark exceptions as DISAS_NORETURN
Date: Sun, 20 Jun 2021 14:32:41 -0700 [thread overview]
Message-ID: <20210620213249.1494274-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210620213249.1494274-1-richard.henderson@linaro.org>
After we've raised the exception, we have left the TB.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/cris/translate.c | 5 +++--
target/cris/translate_v10.c.inc | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/target/cris/translate.c b/target/cris/translate.c
index 2ff4319dd1..f8b574b0b6 100644
--- a/target/cris/translate.c
+++ b/target/cris/translate.c
@@ -2874,6 +2874,7 @@ static int dec_rfe_etc(CPUCRISState *env, DisasContext *dc)
-offsetof(CRISCPU, env) + offsetof(CPUState, halted));
tcg_gen_movi_tl(env_pc, dc->pc + 2);
t_gen_raise_exception(EXCP_HLT);
+ dc->base.is_jmp = DISAS_NORETURN;
return 2;
}
@@ -2901,7 +2902,7 @@ static int dec_rfe_etc(CPUCRISState *env, DisasContext *dc)
/* Breaks start at 16 in the exception vector. */
t_gen_movi_env_TN(trap_vector, dc->op1 + 16);
t_gen_raise_exception(EXCP_BREAK);
- dc->base.is_jmp = DISAS_UPDATE;
+ dc->base.is_jmp = DISAS_NORETURN;
break;
default:
printf("op2=%x\n", dc->op2);
@@ -3189,7 +3190,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
cris_evaluate_flags(dc);
tcg_gen_movi_tl(env_pc, dc->pc);
t_gen_raise_exception(EXCP_DEBUG);
- dc->base.is_jmp = DISAS_UPDATE;
+ dc->base.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 increment the PC here so that
diff --git a/target/cris/translate_v10.c.inc b/target/cris/translate_v10.c.inc
index dd44a7eb97..0ba2aca96f 100644
--- a/target/cris/translate_v10.c.inc
+++ b/target/cris/translate_v10.c.inc
@@ -61,6 +61,7 @@ static inline void cris_illegal_insn(DisasContext *dc)
{
qemu_log_mask(LOG_GUEST_ERROR, "illegal insn at pc=%x\n", dc->pc);
t_gen_raise_exception(EXCP_BREAK);
+ dc->base.is_jmp = DISAS_NORETURN;
}
static void gen_store_v10_conditional(DisasContext *dc, TCGv addr, TCGv val,
@@ -1169,7 +1170,7 @@ static unsigned int dec10_ind(CPUCRISState *env, DisasContext *dc)
t_gen_mov_env_TN(trap_vector, c);
tcg_temp_free(c);
t_gen_raise_exception(EXCP_BREAK);
- dc->base.is_jmp = DISAS_UPDATE;
+ dc->base.is_jmp = DISAS_NORETURN;
return insn_len;
}
LOG_DIS("%d: jump.%d %d r%d r%d\n", __LINE__, size,
--
2.25.1
next prev parent reply other threads:[~2021-06-20 21:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-20 21:32 [PATCH v2 00/11] target/cris: Convert to TranslatorOps Richard Henderson
2021-06-20 21:32 ` [PATCH v2 01/11] target/cris: Add DisasContextBase to DisasContext Richard Henderson
2021-06-20 21:32 ` [PATCH v2 02/11] target/cris: Replace DISAS_TB_JUMP with DISAS_NORETURN Richard Henderson
2021-06-21 20:01 ` Philippe Mathieu-Daudé
2021-06-21 23:32 ` Richard Henderson
2021-06-20 21:32 ` Richard Henderson [this message]
2021-06-20 21:32 ` [PATCH v2 04/11] target/cris: Remove DISAS_SWI Richard Henderson
2021-06-20 21:32 ` [PATCH v2 05/11] target/cris: Fix use_goto_tb Richard Henderson
2021-06-20 21:32 ` [PATCH v2 06/11] target/cris: Convert to TranslatorOps Richard Henderson
2021-06-20 21:32 ` [PATCH v2 07/11] target/cris: Mark helper_raise_exception noreturn Richard Henderson
2021-06-20 21:32 ` [PATCH v2 08/11] target/cris: Mark static arrays const Richard Henderson
2021-06-21 20:04 ` Philippe Mathieu-Daudé
2021-06-20 21:32 ` [PATCH v2 09/11] target/cris: Move delayed branch handling to tb_stop Richard Henderson
2021-06-21 17:15 ` Edgar E. Iglesias
2021-06-21 17:35 ` Richard Henderson
2021-06-20 21:32 ` [PATCH v2 10/11] target/cris: Use tcg_gen_lookup_and_goto_ptr Richard Henderson
2021-06-20 21:32 ` [PATCH v2 11/11] target/cris: Improve JMP_INDIRECT Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210620213249.1494274-4-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=edgar.iglesias@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).