Name guest trap numbers RX_EXCP_* in cpu.h. TCG loop codes such as EXCP_INTERRUPT start at 0x10000. Translate privilege, illegal, BRK, and INT through gen_helper_raise_excp. Prefix leftover TCG wait as rx_wait, and drop unused raise_access_fault and the one-line raise_exception wrapper. FPSW still exits with RX_EXCP_ACCESS.
Signed-off-by: Yonggang Luo <[email protected]> --- target/rx/cpu.h | 13 ++++++++++++ target/rx/helper.c | 16 +++++++-------- target/rx/helper.h | 7 +------ target/rx/op_helper.c | 46 +++---------------------------------------- target/rx/translate.c | 19 ++++++++++-------- 5 files changed, 36 insertions(+), 65 deletions(-) diff --git a/target/rx/cpu.h b/target/rx/cpu.h index 64ba48a7329..233615c32dc 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -71,6 +71,19 @@ enum { NUM_REGS = 16, }; +/* + * Guest trap numbers in cs->exception_index. TCG loop codes such as + * EXCP_INTERRUPT start at 0x10000 in cpu-common.h and do not overlap these. + */ +enum { + RX_EXCP_PRIVILEGE_VIOLATION = 20, + RX_EXCP_ACCESS = 21, + RX_EXCP_ILLEGAL_INSTRUCTION = 23, + RX_EXCP_FPU = 25, + RX_EXCP_NMI = 30, + RX_EXCP_INT = 0x100, +}; + typedef struct CPUArchState { /* CPU registers */ uint32_t regs[NUM_REGS]; /* general registers */ diff --git a/target/rx/helper.c b/target/rx/helper.c index 0f99279bbaa..2ebda733489 100644 --- a/target/rx/helper.c +++ b/target/rx/helper.c @@ -86,13 +86,13 @@ void rx_cpu_do_interrupt(CPUState *cs) env->isp -= 4; cpu_stl_le_data(env, env->isp, env->pc); - if (vec < 0x100) { + if (vec < RX_EXCP_INT) { env->pc = cpu_ldl_le_data(env, 0xffffff80 + vec * 4); } else { env->pc = cpu_ldl_le_data(env, env->intb + (vec & 0xff) * 4); } - if (vec == 30) { + if (vec == RX_EXCP_NMI) { /* Non-maskable interrupt */ qemu_plugin_vcpu_interrupt_cb(cs, last_pc); } else { @@ -100,22 +100,22 @@ void rx_cpu_do_interrupt(CPUState *cs) } switch (vec) { - case 20: + case RX_EXCP_PRIVILEGE_VIOLATION: expname = "privilege violation"; break; - case 21: + case RX_EXCP_ACCESS: expname = "access exception"; break; - case 23: + case RX_EXCP_ILLEGAL_INSTRUCTION: expname = "illegal instruction"; break; - case 25: + case RX_EXCP_FPU: expname = "fpu exception"; break; - case 30: + case RX_EXCP_NMI: expname = "non-maskable interrupt"; break; - case 0x100 ... 0x1ff: + case RX_EXCP_INT ... RX_EXCP_INT + 0xff: expname = "unconditional trap"; } qemu_log_mask(CPU_LOG_INT, "exception 0x%02x [%s] raised\n", diff --git a/target/rx/helper.h b/target/rx/helper.h index 8cc38b0cb71..1c749198b9b 100644 --- a/target/rx/helper.h +++ b/target/rx/helper.h @@ -1,9 +1,4 @@ -DEF_HELPER_1(raise_illegal_instruction, noreturn, env) -DEF_HELPER_1(raise_access_fault, noreturn, env) -DEF_HELPER_1(raise_privilege_violation, noreturn, env) -DEF_HELPER_1(wait, noreturn, env) -DEF_HELPER_2(rxint, noreturn, env, i32) -DEF_HELPER_1(rxbrk, noreturn, env) +DEF_HELPER_1(rx_wait, noreturn, env) DEF_HELPER_3(fadd, f32, env, f32, f32) DEF_HELPER_3(fsub, f32, env, f32, f32) DEF_HELPER_3(fmul, f32, env, f32, f32) diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c index 36df7d377e5..4ff61fb555b 100644 --- a/target/rx/op_helper.c +++ b/target/rx/op_helper.c @@ -25,10 +25,6 @@ #include "fpu/softfloat.h" #include "tcg/debug-assert.h" -static inline G_NORETURN -void raise_exception(CPURXState *env, int index, - uintptr_t retaddr); - static void _set_psw(CPURXState *env, uint32_t psw, uint32_t rte) { uint32_t prev_u; @@ -115,7 +111,7 @@ static void update_fpsw(CPURXState *env, float32 ret, uintptr_t retaddr) enable = FIELD_EX32(env->fpsw, FPSW, ENABLE); enable |= 1 << 5; /* CE always enabled */ if (cause & enable) { - raise_exception(env, 21, retaddr); + cpu_loop_exit_excp(env_cpu(env), RX_EXCP_ACCESS, retaddr); } } } @@ -419,48 +415,12 @@ uint32_t helper_divu(CPURXState *env, uint32_t num, uint32_t den) return ret; } -/* exception */ -static inline G_NORETURN -void raise_exception(CPURXState *env, int index, - uintptr_t retaddr) -{ - CPUState *cs = env_cpu(env); - - cs->exception_index = index; - cpu_loop_exit_restore(cs, retaddr); -} - -G_NORETURN void helper_raise_privilege_violation(CPURXState *env) -{ - raise_exception(env, 20, GETPC()); -} - -G_NORETURN void helper_raise_access_fault(CPURXState *env) -{ - raise_exception(env, 21, GETPC()); -} - -G_NORETURN void helper_raise_illegal_instruction(CPURXState *env) -{ - raise_exception(env, 23, GETPC()); -} - -G_NORETURN void helper_wait(CPURXState *env) +G_NORETURN void helper_rx_wait(CPURXState *env) { CPUState *cs = env_cpu(env); cs->halted = 1; env->in_sleep = 1; env->psw_i = 1; - raise_exception(env, EXCP_HLT, 0); -} - -G_NORETURN void helper_rxint(CPURXState *env, uint32_t vec) -{ - raise_exception(env, 0x100 + vec, 0); -} - -G_NORETURN void helper_rxbrk(CPURXState *env) -{ - raise_exception(env, 0x100, 0); + cpu_loop_exit_excp(cs, EXCP_HLT, 0); } diff --git a/target/rx/translate.c b/target/rx/translate.c index 132d495710c..95c5fd4ac8c 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -245,7 +245,9 @@ static int is_privileged(DisasContext *ctx, int is_exception) { if (FIELD_EX32(ctx->tb_flags, PSW, PM)) { if (is_exception) { - gen_helper_raise_privilege_violation(tcg_env); + gen_helper_raise_excp(tcg_env, + tcg_constant_i32(RX_EXCP_PRIVILEGE_VIOLATION), + tcg_constant_i32(1)); } return 0; } else { @@ -2174,7 +2176,8 @@ static bool trans_RTE(DisasContext *ctx, arg_RTE *a) static bool trans_BRK(DisasContext *ctx, arg_BRK *a) { tcg_gen_movi_i32(cpu_pc, ctx->base.pc_next); - gen_helper_rxbrk(tcg_env); + gen_helper_raise_excp(tcg_env, tcg_constant_i32(RX_EXCP_INT), + tcg_constant_i32(0)); ctx->base.is_jmp = DISAS_NORETURN; return true; } @@ -2182,12 +2185,10 @@ static bool trans_BRK(DisasContext *ctx, arg_BRK *a) /* int #imm */ static bool trans_INT(DisasContext *ctx, arg_INT *a) { - TCGv_i32 vec; - tcg_debug_assert(a->imm < 0x100); - vec = tcg_constant_i32(a->imm); tcg_gen_movi_i32(cpu_pc, ctx->base.pc_next); - gen_helper_rxint(tcg_env, vec); + gen_helper_raise_excp(tcg_env, tcg_constant_i32(RX_EXCP_INT + a->imm), + tcg_constant_i32(0)); ctx->base.is_jmp = DISAS_NORETURN; return true; } @@ -2197,7 +2198,7 @@ static bool trans_WAIT(DisasContext *ctx, arg_WAIT *a) { if (is_privileged(ctx, 1)) { tcg_gen_movi_i32(cpu_pc, ctx->base.pc_next); - gen_helper_wait(tcg_env); + gen_helper_rx_wait(tcg_env); } return true; } @@ -2228,7 +2229,9 @@ static void rx_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) ctx->pc = ctx->base.pc_next; insn = decode_load(ctx); if (!decode(ctx, insn)) { - gen_helper_raise_illegal_instruction(tcg_env); + gen_helper_raise_excp(tcg_env, + tcg_constant_i32(RX_EXCP_ILLEGAL_INSTRUCTION), + tcg_constant_i32(1)); } } -- 2.52.0.windows.1
