@@ -336,9 +336,9 @@ static void return_low128(TCGv_i64 dest)
tcg_gen_ld_i64(dest, cpu_env, offsetof(CPUS390XState, retxl));
}
-static void update_psw_addr(DisasContext *s)
+static void update_psw_addr_disp(DisasContext *s, int64_t disp)
{
- gen_psw_addr_disp(s, psw_addr, 0);
+ gen_psw_addr_disp(s, psw_addr, disp);
}
static void per_branch(DisasContext *s, bool to_next)
@@ -444,7 +444,7 @@ static void gen_program_exception(DisasContext *s, int code)
offsetof(CPUS390XState, int_pgm_ilen));
/* update the psw */
- update_psw_addr(s);
+ update_psw_addr_disp(s, 0);
/* Save off cc. */
update_cc_op(s);
@@ -1168,11 +1168,11 @@ static DisasJumpType help_goto_direct(DisasContext *s, int64_t disp)
update_cc_op(s);
per_breaking_event(s);
tcg_gen_goto_tb(0);
- gen_psw_addr_disp(s, psw_addr, disp);
+ update_psw_addr_disp(s, disp);
tcg_gen_exit_tb(s->base.tb, 0);
return DISAS_NORETURN;
} else {
- gen_psw_addr_disp(s, psw_addr, disp);
+ update_psw_addr_disp(s, disp);
per_branch(s, false);
return DISAS_PC_UPDATED;
}
@@ -2448,7 +2448,7 @@ static DisasJumpType op_ex(DisasContext *s, DisasOps *o)
return DISAS_NORETURN;
}
- update_psw_addr(s);
+ update_psw_addr_disp(s, 0);
update_cc_op(s);
if (r1 == 0) {
@@ -3175,7 +3175,7 @@ static DisasJumpType op_lpd(DisasContext *s, DisasOps *o)
/* In a parallel context, stop the world and single step. */
if (tb_cflags(s->base.tb) & CF_PARALLEL) {
- update_psw_addr(s);
+ update_psw_addr_disp(s, 0);
update_cc_op(s);
gen_exception(EXCP_ATOMIC);
return DISAS_NORETURN;
@@ -4490,7 +4490,7 @@ static DisasJumpType op_stura(DisasContext *s, DisasOps *o)
tcg_gen_qemu_st_tl(o->in1, o->in2, MMU_REAL_IDX, s->insn->data);
if (s->base.tb->flags & FLAG_MASK_PER) {
- update_psw_addr(s);
+ update_psw_addr_disp(s, 0);
gen_helper_per_store_real(cpu_env);
}
return DISAS_NEXT;
@@ -4728,7 +4728,7 @@ static DisasJumpType op_svc(DisasContext *s, DisasOps *o)
{
TCGv_i32 t;
- update_psw_addr(s);
+ update_psw_addr_disp(s, 0);
update_cc_op(s);
t = tcg_constant_i32(get_field(s, i1) & 0xff);
@@ -6467,7 +6467,7 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
if (s->base.tb->flags & FLAG_MASK_PER) {
/* An exception might be triggered, save PSW if not already done. */
if (ret == DISAS_NEXT || ret == DISAS_TOO_MANY) {
- gen_psw_addr_disp(s, psw_addr, s->ilen);
+ update_psw_addr_disp(s, s->ilen);
}
/* Call the helper to check for a possible PER exception. */
@@ -6534,7 +6534,7 @@ static void s390x_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
case DISAS_NORETURN:
break;
case DISAS_TOO_MANY:
- update_psw_addr(dc);
+ update_psw_addr_disp(dc, 0);
/* FALLTHRU */
case DISAS_PC_UPDATED:
/* Next TB starts off with CC_OP_DYNAMIC, so make sure the
Rename to update_psw_addr_disp at the same time. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/s390x/tcg/translate.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)