[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 48/64] target/nios2: Create gen_jumpr
From: |
Richard Henderson |
Subject: |
[PATCH v7 48/64] target/nios2: Create gen_jumpr |
Date: |
Thu, 21 Apr 2022 08:17:19 -0700 |
Split out a function to perform an indirect branch.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/nios2/translate.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 98efb4e10a..e39e349389 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -36,7 +36,6 @@
#include "semihosting/semihost.h"
/* 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 INSTRUCTION_FLG(func, flags) { (func), (flags) }
@@ -189,6 +188,16 @@ static void gen_goto_tb(DisasContext *dc, int n, uint32_t
dest)
}
}
+static void gen_jumpr(DisasContext *dc, int regno, bool is_call)
+{
+ tcg_gen_mov_tl(cpu_pc, load_gpr(dc, regno));
+ if (is_call) {
+ tcg_gen_movi_tl(dest_gpr(dc, R_RA), dc->base.pc_next);
+ }
+ tcg_gen_exit_tb(NULL, 0);
+ dc->base.is_jmp = DISAS_NORETURN;
+}
+
static void gen_excp(DisasContext *dc, uint32_t code, uint32_t flags)
{
t_gen_helper_raise_exception(dc, flags);
@@ -432,8 +441,7 @@ static void eret(DisasContext *dc, uint32_t code, uint32_t
flags)
/* PC <- ra */
static void ret(DisasContext *dc, uint32_t code, uint32_t flags)
{
- tcg_gen_mov_tl(cpu_pc, load_gpr(dc, R_RA));
- dc->base.is_jmp = DISAS_JUMP;
+ gen_jumpr(dc, R_RA, false);
}
/*
@@ -463,8 +471,7 @@ static void jmp(DisasContext *dc, uint32_t code, uint32_t
flags)
{
R_TYPE(instr, code);
- tcg_gen_mov_tl(cpu_pc, load_gpr(dc, instr.a));
- dc->base.is_jmp = DISAS_JUMP;
+ gen_jumpr(dc, instr.a, false);
}
/* rC <- PC + 4 */
@@ -483,10 +490,7 @@ static void callr(DisasContext *dc, uint32_t code,
uint32_t flags)
{
R_TYPE(instr, code);
- tcg_gen_mov_tl(cpu_pc, load_gpr(dc, instr.a));
- tcg_gen_movi_tl(dest_gpr(dc, R_RA), dc->base.pc_next);
-
- dc->base.is_jmp = DISAS_JUMP;
+ gen_jumpr(dc, instr.a, true);
}
/* rC <- ctlN */
@@ -908,11 +912,6 @@ static void nios2_tr_tb_stop(DisasContextBase *dcbase,
CPUState *cs)
tcg_gen_exit_tb(NULL, 0);
break;
- case DISAS_JUMP:
- /* The jump will already have updated the PC register */
- tcg_gen_exit_tb(NULL, 0);
- break;
-
case DISAS_NORETURN:
/* nothing more to generate */
break;
--
2.34.1
- [PATCH v7 36/64] target/nios2: Clean up handling of tlbmisc in do_exception, (continued)
- [PATCH v7 36/64] target/nios2: Clean up handling of tlbmisc in do_exception, Richard Henderson, 2022/04/21
- [PATCH v7 37/64] target/nios2: Prevent writes to read-only or reserved control fields, Richard Henderson, 2022/04/21
- [PATCH v7 38/64] target/nios2: Implement cpuid, Richard Henderson, 2022/04/21
- [PATCH v7 39/64] target/nios2: Implement CR_STATUS.RSIE, Richard Henderson, 2022/04/21
- [PATCH v7 42/64] target/nios2: Use tcg_constant_tl, Richard Henderson, 2022/04/21
- [PATCH v7 41/64] target/nios2: Support division error exception, Richard Henderson, 2022/04/21
- [PATCH v7 44/64] target/nios2: Split out helpers for gen_* translate macros, Richard Henderson, 2022/04/21
- [PATCH v7 43/64] target/nios2: Split out named structs for [IRJ]_TYPE, Richard Henderson, 2022/04/21
- [PATCH v7 48/64] target/nios2: Create gen_jumpr,
Richard Henderson <=
- [PATCH v7 40/64] target/nios2: Remove CPU_INTERRUPT_NMI, Richard Henderson, 2022/04/21
- [PATCH v7 51/64] target/nios2: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2022/04/21
- [PATCH v7 45/64] target/nios2: Introduce dest_gpr, Richard Henderson, 2022/04/21
- [PATCH v7 47/64] target/nios2: Enable unaligned traps for system mode, Richard Henderson, 2022/04/21
- [PATCH v7 46/64] target/nios2: Drop CR_STATUS_EH from tb->flags, Richard Henderson, 2022/04/21
- [PATCH v7 49/64] target/nios2: Hoist set of is_jmp into gen_goto_tb, Richard Henderson, 2022/04/21
- [PATCH v7 50/64] target/nios2: Use gen_goto_tb for DISAS_TOO_MANY, Richard Henderson, 2022/04/21
- [PATCH v7 52/64] target/nios2: Implement Misaligned destination exception, Richard Henderson, 2022/04/21
- [PATCH v7 58/64] linux-user/nios2: Handle various SIGILL exceptions, Richard Henderson, 2022/04/21
- [PATCH v7 61/64] hw/nios2: Move memory regions into Nios2Machine, Richard Henderson, 2022/04/21