From: "Emilio G. Cota" <cota@braap.org>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
Aurelien Jarno <aurelien@aurel32.net>,
Yongbok Kim <yongbok.kim@mips.com>
Subject: [Qemu-devel] [PATCH 07/18] target/mips: convert to DisasJumpType
Date: Fri, 20 Apr 2018 14:55:06 -0400 [thread overview]
Message-ID: <1524250517-28032-8-git-send-email-cota@braap.org> (raw)
In-Reply-To: <1524250517-28032-1-git-send-email-cota@braap.org>
Notes:
- BS_EXCP in generate_exception_err becomes DISAS_NORETURN,
because we do not return after raising an exception.
- Some uses of BS_EXCP are misleading in that they're used
only as a "not BS_STOP" exit condition, i.e. they have nothing
to do with an actual exception. For those cases, define
and use DISAS_EXIT, which is clearer.
- fix a comment typo (s/intetrupt/interrupt/).
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Yongbok Kim <yongbok.kim@mips.com>
Signed-off-by: Emilio G. Cota <cota@braap.org>
---
target/mips/translate.c | 188 ++++++++++++++++++++++++------------------------
1 file changed, 93 insertions(+), 95 deletions(-)
diff --git a/target/mips/translate.c b/target/mips/translate.c
index 69137d0..11725d0 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -36,6 +36,7 @@
#include "target/mips/trace.h"
#include "trace-tcg.h"
+#include "exec/translator.h"
#include "exec/log.h"
#define MIPS_DEBUG_DISAS 0
@@ -1439,7 +1440,7 @@ typedef struct DisasContext {
int mem_idx;
TCGMemOp default_tcg_memop_mask;
uint32_t hflags, saved_hflags;
- int bstate;
+ DisasJumpType is_jmp;
target_ulong btarget;
bool ulri;
int kscrexist;
@@ -1460,13 +1461,9 @@ typedef struct DisasContext {
bool abs2008;
} DisasContext;
-enum {
- BS_NONE = 0, /* We go out of the TB without reaching a branch or an
- * exception condition */
- BS_STOP = 1, /* We want to stop translation for any reason */
- BS_BRANCH = 2, /* We reached a branch condition */
- BS_EXCP = 3, /* We reached an exception condition */
-};
+#define DISAS_STOP DISAS_TARGET_0
+#define DISAS_EXCP DISAS_TARGET_1
+#define DISAS_EXIT DISAS_TARGET_2
static const char * const regnames[] = {
"r0", "at", "v0", "v1", "a0", "a1", "a2", "a3",
@@ -1639,7 +1636,7 @@ static inline void generate_exception_err(DisasContext *ctx, int excp, int err)
gen_helper_raise_exception_err(cpu_env, texcp, terr);
tcg_temp_free_i32(terr);
tcg_temp_free_i32(texcp);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_NORETURN;
}
static inline void generate_exception(DisasContext *ctx, int excp)
@@ -5334,10 +5331,10 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
gen_io_end();
}
/* Break the TB to be able to take timer interrupts immediately
- after reading count. BS_STOP isn't sufficient, we need to ensure
- we break completely out of translated code. */
+ after reading count. DISAS_STOP isn't sufficient, we need to
+ ensure we break completely out of translated code. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Count";
break;
/* 6,7 are implementation dependent */
@@ -5905,7 +5902,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
check_insn(ctx, ISA_MIPS32R2);
gen_helper_mtc0_pagegrain(cpu_env, arg);
rn = "PageGrain";
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 2:
CP0_CHECK(ctx->sc);
@@ -5966,7 +5963,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
case 0:
check_insn(ctx, ISA_MIPS32R2);
gen_helper_mtc0_hwrena(cpu_env, arg);
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "HWREna";
break;
default:
@@ -6028,30 +6025,30 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
case 0:
save_cpu_state(ctx, 1);
gen_helper_mtc0_status(cpu_env, arg);
- /* BS_STOP isn't good enough here, hflags may have changed. */
+ /* DISAS_STOP isn't good enough here, hflags may have changed. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Status";
break;
case 1:
check_insn(ctx, ISA_MIPS32R2);
gen_helper_mtc0_intctl(cpu_env, arg);
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "IntCtl";
break;
case 2:
check_insn(ctx, ISA_MIPS32R2);
gen_helper_mtc0_srsctl(cpu_env, arg);
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "SRSCtl";
break;
case 3:
check_insn(ctx, ISA_MIPS32R2);
gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_SRSMap));
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "SRSMap";
break;
default:
@@ -6063,11 +6060,11 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
case 0:
save_cpu_state(ctx, 1);
gen_helper_mtc0_cause(cpu_env, arg);
- /* Stop translation as we may have triggered an interrupt. BS_STOP
- * isn't sufficient, we need to ensure we break out of translated
- * code to check for pending interrupts. */
+ /* Stop translation as we may have triggered an interrupt.
+ * DISAS_STOP isn't sufficient, we need to ensure we break out of
+ * translated code to check for pending interrupts. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Cause";
break;
default:
@@ -6105,7 +6102,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
gen_helper_mtc0_config0(cpu_env, arg);
rn = "Config";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 1:
/* ignored, read only */
@@ -6115,24 +6112,24 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
gen_helper_mtc0_config2(cpu_env, arg);
rn = "Config2";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 3:
gen_helper_mtc0_config3(cpu_env, arg);
rn = "Config3";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 4:
gen_helper_mtc0_config4(cpu_env, arg);
rn = "Config4";
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 5:
gen_helper_mtc0_config5(cpu_env, arg);
rn = "Config5";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
/* 6,7 are implementation dependent */
case 6:
@@ -6221,35 +6218,35 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
switch (sel) {
case 0:
gen_helper_mtc0_debug(cpu_env, arg); /* EJTAG support */
- /* BS_STOP isn't good enough here, hflags may have changed. */
+ /* DISAS_STOP isn't good enough here, hflags may have changed. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Debug";
break;
case 1:
// gen_helper_mtc0_tracecontrol(cpu_env, arg); /* PDtrace support */
rn = "TraceControl";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
goto cp0_unimplemented;
case 2:
// gen_helper_mtc0_tracecontrol2(cpu_env, arg); /* PDtrace support */
rn = "TraceControl2";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
goto cp0_unimplemented;
case 3:
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
// gen_helper_mtc0_usertracedata(cpu_env, arg); /* PDtrace support */
rn = "UserTraceData";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
goto cp0_unimplemented;
case 4:
// gen_helper_mtc0_tracebpc(cpu_env, arg); /* PDtrace support */
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "TraceBPC";
goto cp0_unimplemented;
default:
@@ -6309,7 +6306,7 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
switch (sel) {
case 0:
gen_helper_mtc0_errctl(cpu_env, arg);
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "ErrCtl";
break;
default:
@@ -6402,10 +6399,10 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
/* For simplicity assume that all writes can cause interrupts. */
if (tb_cflags(ctx->tb) & CF_USE_ICOUNT) {
gen_io_end();
- /* BS_STOP isn't sufficient, we need to ensure we break out of
+ /* DISAS_STOP isn't sufficient, we need to ensure we break out of
* translated code to check for pending interrupts. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
}
return;
@@ -6686,10 +6683,10 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
gen_io_end();
}
/* Break the TB to be able to take timer interrupts immediately
- after reading count. BS_STOP isn't sufficient, we need to ensure
- we break completely out of translated code. */
+ after reading count. DISAS_STOP isn't sufficient, we need to
+ ensure we break completely out of translated code. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Count";
break;
/* 6,7 are implementation dependent */
@@ -7301,7 +7298,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
case 0:
check_insn(ctx, ISA_MIPS32R2);
gen_helper_mtc0_hwrena(cpu_env, arg);
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "HWREna";
break;
default:
@@ -7337,7 +7334,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
goto cp0_unimplemented;
}
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 10:
switch (sel) {
@@ -7360,37 +7357,37 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
goto cp0_unimplemented;
}
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 12:
switch (sel) {
case 0:
save_cpu_state(ctx, 1);
gen_helper_mtc0_status(cpu_env, arg);
- /* BS_STOP isn't good enough here, hflags may have changed. */
+ /* DISAS_STOP isn't good enough here, hflags may have changed. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Status";
break;
case 1:
check_insn(ctx, ISA_MIPS32R2);
gen_helper_mtc0_intctl(cpu_env, arg);
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "IntCtl";
break;
case 2:
check_insn(ctx, ISA_MIPS32R2);
gen_helper_mtc0_srsctl(cpu_env, arg);
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "SRSCtl";
break;
case 3:
check_insn(ctx, ISA_MIPS32R2);
gen_mtc0_store32(arg, offsetof(CPUMIPSState, CP0_SRSMap));
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "SRSMap";
break;
default:
@@ -7402,11 +7399,11 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
case 0:
save_cpu_state(ctx, 1);
gen_helper_mtc0_cause(cpu_env, arg);
- /* Stop translation as we may have triggered an intetrupt. BS_STOP
- * isn't sufficient, we need to ensure we break out of translated
- * code to check for pending interrupts. */
+ /* Stop translation as we may have triggered an interrupt.
+ * DISAS_STOP isn't sufficient, we need to ensure we break out of
+ * translated code to check for pending interrupts. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Cause";
break;
default:
@@ -7444,7 +7441,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
gen_helper_mtc0_config0(cpu_env, arg);
rn = "Config";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 1:
/* ignored, read only */
@@ -7454,13 +7451,13 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
gen_helper_mtc0_config2(cpu_env, arg);
rn = "Config2";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 3:
gen_helper_mtc0_config3(cpu_env, arg);
rn = "Config3";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case 4:
/* currently ignored */
@@ -7470,7 +7467,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
gen_helper_mtc0_config5(cpu_env, arg);
rn = "Config5";
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
/* 6,7 are implementation dependent */
default:
@@ -7549,33 +7546,33 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
switch (sel) {
case 0:
gen_helper_mtc0_debug(cpu_env, arg); /* EJTAG support */
- /* BS_STOP isn't good enough here, hflags may have changed. */
+ /* DISAS_STOP isn't good enough here, hflags may have changed. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
rn = "Debug";
break;
case 1:
// gen_helper_mtc0_tracecontrol(cpu_env, arg); /* PDtrace support */
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "TraceControl";
goto cp0_unimplemented;
case 2:
// gen_helper_mtc0_tracecontrol2(cpu_env, arg); /* PDtrace support */
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "TraceControl2";
goto cp0_unimplemented;
case 3:
// gen_helper_mtc0_usertracedata(cpu_env, arg); /* PDtrace support */
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "UserTraceData";
goto cp0_unimplemented;
case 4:
// gen_helper_mtc0_tracebpc(cpu_env, arg); /* PDtrace support */
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "TraceBPC";
goto cp0_unimplemented;
default:
@@ -7635,7 +7632,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
switch (sel) {
case 0:
gen_helper_mtc0_errctl(cpu_env, arg);
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
rn = "ErrCtl";
break;
default:
@@ -7728,10 +7725,10 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
/* For simplicity assume that all writes can cause interrupts. */
if (tb_cflags(ctx->tb) & CF_USE_ICOUNT) {
gen_io_end();
- /* BS_STOP isn't sufficient, we need to ensure we break out of
+ /* DISAS_STOP isn't sufficient, we need to ensure we break out of
* translated code to check for pending interrupts. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
}
return;
@@ -8142,7 +8139,7 @@ static void gen_mttr(CPUMIPSState *env, DisasContext *ctx, int rd, int rt,
tcg_temp_free_i32(fs_tmp);
}
/* Stop translation as we may have changed hflags */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
/* COP2: Not implemented. */
case 4:
@@ -8301,7 +8298,7 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt,
check_insn(ctx, ISA_MIPS2);
gen_helper_eret(cpu_env);
}
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXCP;
}
break;
case OPC_DERET:
@@ -8316,7 +8313,7 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt,
generate_exception_end(ctx, EXCP_RI);
} else {
gen_helper_deret(cpu_env);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXCP;
}
break;
case OPC_WAIT:
@@ -8331,7 +8328,7 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt,
save_cpu_state(ctx, 1);
ctx->pc -= 4;
gen_helper_wait(cpu_env);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXCP;
break;
default:
die:
@@ -8756,7 +8753,7 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)
tcg_temp_free_i32(fs_tmp);
}
/* Stop translation as we may have changed hflags */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
#if defined(TARGET_MIPS64)
case OPC_DMFC1:
@@ -10764,10 +10761,10 @@ static void gen_rdhwr(DisasContext *ctx, int rt, int rd, int sel)
}
gen_store_gpr(t0, rt);
/* Break the TB to be able to take timer interrupts immediately
- after reading count. BS_STOP isn't sufficient, we need to ensure
+ after reading count. DISAS_STOP isn't sufficient, we need to ensure
we break completely out of translated code. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
break;
case 3:
gen_helper_rdhwr_ccres(t0, cpu_env);
@@ -10817,7 +10814,7 @@ static void gen_rdhwr(DisasContext *ctx, int rt, int rd, int sel)
static inline void clear_branch_hflags(DisasContext *ctx)
{
ctx->hflags &= ~MIPS_HFLAG_BMASK;
- if (ctx->bstate == BS_NONE) {
+ if (ctx->is_jmp == DISAS_NEXT) {
save_cpu_state(ctx, 0);
} else {
/* it is not safe to save ctx->hflags as hflags may be changed
@@ -10832,7 +10829,7 @@ static void gen_branch(DisasContext *ctx, int insn_bytes)
int proc_hflags = ctx->hflags & MIPS_HFLAG_BMASK;
/* Branches completion */
clear_branch_hflags(ctx);
- ctx->bstate = BS_BRANCH;
+ ctx->is_jmp = DISAS_NORETURN;
/* FIXME: Need to clear can_do_io. */
switch (proc_hflags & MIPS_HFLAG_BMASK_BASE) {
case MIPS_HFLAG_FBNSLOT:
@@ -13574,7 +13571,7 @@ static void gen_pool32axf (CPUMIPSState *env, DisasContext *ctx, int rt, int rs)
gen_helper_di(t0, cpu_env);
gen_store_gpr(t0, rs);
/* Stop translation as we may have switched the execution mode */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
tcg_temp_free(t0);
}
break;
@@ -13586,10 +13583,10 @@ static void gen_pool32axf (CPUMIPSState *env, DisasContext *ctx, int rt, int rs)
save_cpu_state(ctx, 1);
gen_helper_ei(t0, cpu_env);
gen_store_gpr(t0, rs);
- /* BS_STOP isn't sufficient, we need to ensure we break out
+ /* DISAS_STOP isn't sufficient, we need to ensure we break out
of translated code to check for pending interrupts. */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
tcg_temp_free(t0);
}
break;
@@ -14745,7 +14742,7 @@ static void decode_micromips32_opc(CPUMIPSState *env, DisasContext *ctx)
/* SYNCI */
/* Break the TB to be able to sync copied instructions
immediately */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
} else {
/* TNEI */
mips32_op = OPC_TNEI;
@@ -14776,7 +14773,7 @@ static void decode_micromips32_opc(CPUMIPSState *env, DisasContext *ctx)
check_insn_opc_removed(ctx, ISA_MIPS32R6);
/* Break the TB to be able to sync copied instructions
immediately */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case BC2F:
case BC2T:
@@ -19601,7 +19598,7 @@ static void decode_opc(CPUMIPSState *env, DisasContext *ctx)
check_insn(ctx, ISA_MIPS32R2);
/* Break the TB to be able to sync copied instructions
immediately */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case OPC_BPOSGE32: /* MIPS DSP branch */
#if defined(TARGET_MIPS64)
@@ -19704,17 +19701,17 @@ static void decode_opc(CPUMIPSState *env, DisasContext *ctx)
gen_store_gpr(t0, rt);
/* Stop translation as we may have switched
the execution mode. */
- ctx->bstate = BS_STOP;
+ ctx->is_jmp = DISAS_STOP;
break;
case OPC_EI:
check_insn(ctx, ISA_MIPS32R2);
save_cpu_state(ctx, 1);
gen_helper_ei(t0, cpu_env);
gen_store_gpr(t0, rt);
- /* BS_STOP isn't sufficient, we need to ensure we break out
- of translated code to check for pending interrupts. */
+ /* DISAS_STOP isn't sufficient, we need to ensure we break
+ out of translated code to check for pending interrupts */
gen_save_pc(ctx->pc + 4);
- ctx->bstate = BS_EXCP;
+ ctx->is_jmp = DISAS_EXIT;
break;
default: /* Invalid */
MIPS_INVAL("mfmc0");
@@ -20216,7 +20213,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
ctx.insn_flags = env->insn_flags;
ctx.CP0_Config1 = env->CP0_Config1;
ctx.tb = tb;
- ctx.bstate = BS_NONE;
+ ctx.is_jmp = DISAS_NEXT;
ctx.btarget = 0;
ctx.kscrexist = (env->CP0_Config4 >> CP0C4_KScrExist) & 0xff;
ctx.rxi = (env->CP0_Config3 >> CP0C3_RXI) & 1;
@@ -20257,13 +20254,13 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
LOG_DISAS("\ntb %p idx %d hflags %04x\n", tb, ctx.mem_idx, ctx.hflags);
gen_tb_start(tb);
- while (ctx.bstate == BS_NONE) {
+ while (ctx.is_jmp == DISAS_NEXT) {
tcg_gen_insn_start(ctx.pc, ctx.hflags & MIPS_HFLAG_BMASK, ctx.btarget);
num_insns++;
if (unlikely(cpu_breakpoint_test(cs, ctx.pc, BP_ANY))) {
save_cpu_state(&ctx, 1);
- ctx.bstate = BS_BRANCH;
+ ctx.is_jmp = DISAS_NORETURN;
gen_helper_raise_exception_debug(cpu_env);
/* The address covered by the breakpoint must be included in
[tb->pc, tb->pc + tb->size) in order to for it to be
@@ -20337,23 +20334,24 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
if (tb_cflags(tb) & CF_LAST_IO) {
gen_io_end();
}
- if (cs->singlestep_enabled && ctx.bstate != BS_BRANCH) {
- save_cpu_state(&ctx, ctx.bstate != BS_EXCP);
+ if (cs->singlestep_enabled && ctx.is_jmp != DISAS_NORETURN) {
+ save_cpu_state(&ctx, ctx.is_jmp != DISAS_EXCP);
gen_helper_raise_exception_debug(cpu_env);
} else {
- switch (ctx.bstate) {
- case BS_STOP:
+ switch (ctx.is_jmp) {
+ case DISAS_STOP:
gen_save_pc(ctx.pc);
tcg_gen_lookup_and_goto_ptr();
break;
- case BS_NONE:
+ case DISAS_NEXT:
save_cpu_state(&ctx, 0);
gen_goto_tb(&ctx, 0, ctx.pc);
break;
- case BS_EXCP:
+ case DISAS_EXCP:
+ case DISAS_EXIT:
tcg_gen_exit_tb(0);
break;
- case BS_BRANCH:
+ case DISAS_NORETURN:
default:
break;
}
--
2.7.4
next prev parent reply other threads:[~2018-04-20 18:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-20 18:54 [Qemu-devel] [PATCH v3 00/18] Translation loop conversion for sh4/sparc/mips/s390x/openrisc/riscv targets Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 01/18] translator: merge max_insns into DisasContextBase Emilio G. Cota
2018-05-09 10:04 ` Michael Clark
2018-04-20 18:55 ` [Qemu-devel] [PATCH 02/18] target/sh4: convert to TranslatorOps Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 03/18] target/sparc: convert to DisasJumpType Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 04/18] target/sparc: convert to DisasContextBase Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 05/18] target/sparc: convert to TranslatorOps Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 06/18] target/mips: use lookup_and_goto_ptr on BS_STOP Emilio G. Cota
2018-04-22 19:37 ` Richard Henderson
2018-04-20 18:55 ` Emilio G. Cota [this message]
2018-04-22 19:52 ` [Qemu-devel] [PATCH 07/18] target/mips: convert to DisasJumpType Richard Henderson
2018-04-23 16:54 ` Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 08/18] target/mips: convert to DisasContextBase Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 09/18] target/mips: use *ctx for DisasContext Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 10/18] target/mips: convert to TranslatorOps Emilio G. Cota
2018-04-22 19:54 ` Richard Henderson
2018-04-20 18:55 ` [Qemu-devel] [PATCH 11/18] target/s390x: convert to DisasJumpType Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 12/18] target/s390x: convert to DisasContextBase Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 13/18] target/s390x: convert to TranslatorOps Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 14/18] target/openrisc: convert to DisasContextBase Emilio G. Cota
2018-04-20 19:44 ` Philippe Mathieu-Daudé
2018-04-20 18:55 ` [Qemu-devel] [PATCH 15/18] target/openrisc: convert to TranslatorOps Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 16/18] target/riscv: convert to DisasJumpType Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 17/18] target/riscv: convert to DisasContextBase Emilio G. Cota
2018-04-20 18:55 ` [Qemu-devel] [PATCH 18/18] target/riscv: convert to TranslatorOps Emilio G. Cota
2018-05-09 10:11 ` Michael Clark
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=1524250517-28032-8-git-send-email-cota@braap.org \
--to=cota@braap.org \
--cc=aurelien@aurel32.net \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=yongbok.kim@mips.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.