[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/63] target/nios2: Replace DISAS_TB_JUMP with DISAS_NORETURN
From: |
Richard Henderson |
Subject: |
[PULL 01/63] target/nios2: Replace DISAS_TB_JUMP with DISAS_NORETURN |
Date: |
Tue, 29 Jun 2021 11:53:53 -0700 |
The only semantic of DISAS_TB_JUMP is that we've done goto_tb,
which is the same as DISAS_NORETURN -- we've exited the tb.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/nios2/translate.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 399f22d938..388fae93a2 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -37,7 +37,6 @@
/* is_jmp field values */
#define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */
#define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */
-#define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */
#define INSTRUCTION_FLG(func, flags) { (func), (flags) }
#define INSTRUCTION(func) \
@@ -209,7 +208,7 @@ static void jmpi(DisasContext *dc, uint32_t code, uint32_t
flags)
{
J_TYPE(instr, code);
gen_goto_tb(dc, 0, (dc->pc & 0xF0000000) | (instr.imm26 << 2));
- dc->is_jmp = DISAS_TB_JUMP;
+ dc->is_jmp = DISAS_NORETURN;
}
static void call(DisasContext *dc, uint32_t code, uint32_t flags)
@@ -269,7 +268,7 @@ static void br(DisasContext *dc, uint32_t code, uint32_t
flags)
I_TYPE(instr, code);
gen_goto_tb(dc, 0, dc->pc + 4 + (instr.imm16.s & -4));
- dc->is_jmp = DISAS_TB_JUMP;
+ dc->is_jmp = DISAS_NORETURN;
}
static void gen_bxx(DisasContext *dc, uint32_t code, uint32_t flags)
@@ -281,7 +280,7 @@ static void gen_bxx(DisasContext *dc, uint32_t code,
uint32_t flags)
gen_goto_tb(dc, 0, dc->pc + 4);
gen_set_label(l1);
gen_goto_tb(dc, 1, dc->pc + 4 + (instr.imm16.s & -4));
- dc->is_jmp = DISAS_TB_JUMP;
+ dc->is_jmp = DISAS_NORETURN;
}
/* Comparison instructions */
@@ -883,7 +882,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock
*tb, int max_insns)
break;
case DISAS_NORETURN:
- case DISAS_TB_JUMP:
/* nothing more to generate */
break;
}
--
2.25.1
- [PULL 00/63] tcg patch queue, Richard Henderson, 2021/06/29
- [PULL 01/63] target/nios2: Replace DISAS_TB_JUMP with DISAS_NORETURN,
Richard Henderson <=
- [PULL 02/63] target/nios2: Use global cpu_env, Richard Henderson, 2021/06/29
- [PULL 03/63] target/nios2: Use global cpu_R, Richard Henderson, 2021/06/29
- [PULL 06/63] target/nios2: Remove assignment to env in handle_instruction, Richard Henderson, 2021/06/29
- [PULL 04/63] target/nios2: Add DisasContextBase to DisasContext, Richard Henderson, 2021/06/29
- [PULL 05/63] target/nios2: Convert to TranslatorOps, Richard Henderson, 2021/06/29
- [PULL 07/63] target/nios2: Clean up goto in handle_instruction, Richard Henderson, 2021/06/29
- [PULL 08/63] target/nios2: Inline handle_instruction, Richard Henderson, 2021/06/29
- [PULL 12/63] target/avr: Convert to TranslatorOps, Richard Henderson, 2021/06/29
- [PULL 09/63] target/nios2: Use pc_next for pc + 4, Richard Henderson, 2021/06/29
- [PULL 17/63] target/cris: Fix use_goto_tb, Richard Henderson, 2021/06/29