aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-04-17 09:51:29 -0700
committerRichard Henderson <richard.henderson@linaro.org>2022-04-21 10:04:33 -0700
commitd3562fe2588d3e0a15f3785d86792800d717984c (patch)
treef8962ce727805e9116cf2983001fc67880b929fe
parent3626a3fe37e993a86dc7cc4a0d3fb0d6a92c667d (diff)
downloadqemu-d3562fe2588d3e0a15f3785d86792800d717984c.zip
qemu-d3562fe2588d3e0a15f3785d86792800d717984c.tar.gz
qemu-d3562fe2588d3e0a15f3785d86792800d717984c.tar.bz2
target/rx: Move DISAS_UPDATE check for write to PSW
Have one check in move_to_cr instead of one in each function that calls move_to_cr. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp> Message-Id: <20220417165130.695085-4-richard.henderson@linaro.org>
-rw-r--r--target/rx/translate.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/target/rx/translate.c b/target/rx/translate.c
index df7a8e5..bd4d110 100644
--- a/target/rx/translate.c
+++ b/target/rx/translate.c
@@ -368,6 +368,10 @@ static void move_to_cr(DisasContext *ctx, TCGv val, int cr)
switch (cr) {
case 0: /* PSW */
gen_helper_set_psw(cpu_env, val);
+ if (is_privileged(ctx, 0)) {
+ /* PSW.{I,U} may be updated here. exit TB. */
+ ctx->base.is_jmp = DISAS_UPDATE;
+ }
break;
/* case 1: to PC not supported */
case 2: /* USP */
@@ -631,10 +635,6 @@ static bool trans_POPC(DisasContext *ctx, arg_POPC *a)
val = tcg_temp_new();
pop(val);
move_to_cr(ctx, val, a->cr);
- if (a->cr == 0 && is_privileged(ctx, 0)) {
- /* PSW.I may be updated here. exit TB. */
- ctx->base.is_jmp = DISAS_UPDATE;
- }
tcg_temp_free(val);
return true;
}
@@ -2205,9 +2205,6 @@ static bool trans_MVTC_i(DisasContext *ctx, arg_MVTC_i *a)
imm = tcg_const_i32(a->imm);
move_to_cr(ctx, imm, a->cr);
- if (a->cr == 0 && is_privileged(ctx, 0)) {
- ctx->base.is_jmp = DISAS_UPDATE;
- }
tcg_temp_free(imm);
return true;
}
@@ -2216,9 +2213,6 @@ static bool trans_MVTC_i(DisasContext *ctx, arg_MVTC_i *a)
static bool trans_MVTC_r(DisasContext *ctx, arg_MVTC_r *a)
{
move_to_cr(ctx, cpu_regs[a->rs], a->cr);
- if (a->cr == 0 && is_privileged(ctx, 0)) {
- ctx->base.is_jmp = DISAS_UPDATE;
- }
return true;
}