ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/s390x: Remove DISAS_PC_STALE 

There is nothing to distinguish this from DISAS_TOO_MANY.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220702060228.420454-3-richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Richard Henderson 2022-07-02 11:32:26 +05:30 committed by Thomas Huth
parent b67b6c7ce4
commit 8ec2edac5f
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/s390x/tcg/translate.c
View File

@ -1126,10 +1126,6 @@ typedef struct {
/* We have updated the PC and CC values. */ /* We have updated the PC and CC values. */
#define DISAS_PC_CC_UPDATED DISAS_TARGET_2 #define DISAS_PC_CC_UPDATED DISAS_TARGET_2
/* We are exiting the TB, but have neither emitted a goto_tb, nor
updated the PC for the next instruction to be executed. */
#define DISAS_PC_STALE DISAS_TARGET_3
/* We are exiting the TB to the main loop. */ /* We are exiting the TB to the main loop. */
#define DISAS_PC_STALE_NOCHAIN DISAS_TARGET_4 #define DISAS_PC_STALE_NOCHAIN DISAS_TARGET_4
@ -3993,7 +3989,7 @@ static DisasJumpType op_sacf(DisasContext *s, DisasOps *o)
{ {
gen_helper_sacf(cpu_env, o->in2); gen_helper_sacf(cpu_env, o->in2);
/* Addressing mode has changed, so end the block. */ /* Addressing mode has changed, so end the block. */
return DISAS_PC_STALE; return DISAS_TOO_MANY;
} }
#endif #endif
@ -4029,7 +4025,7 @@ static DisasJumpType op_sam(DisasContext *s, DisasOps *o)
tcg_temp_free_i64(tsam); tcg_temp_free_i64(tsam);
/* Always exit the TB, since we (may have) changed execution mode. */ /* Always exit the TB, since we (may have) changed execution mode. */
return DISAS_PC_STALE; return DISAS_TOO_MANY;
} }
static DisasJumpType op_sar(DisasContext *s, DisasOps *o) static DisasJumpType op_sar(DisasContext *s, DisasOps *o)
@ -6562,13 +6558,13 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
/* io should be the last instruction in tb when icount is enabled */ /* io should be the last instruction in tb when icount is enabled */
if (unlikely(icount && ret == DISAS_NEXT)) { if (unlikely(icount && ret == DISAS_NEXT)) {
ret = DISAS_PC_STALE; ret = DISAS_TOO_MANY;
} }
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
if (s->base.tb->flags & FLAG_MASK_PER) { if (s->base.tb->flags & FLAG_MASK_PER) {
/* An exception might be triggered, save PSW if not already done. */ /* An exception might be triggered, save PSW if not already done. */
if (ret == DISAS_NEXT || ret == DISAS_PC_STALE) { if (ret == DISAS_NEXT || ret == DISAS_TOO_MANY) {
tcg_gen_movi_i64(psw_addr, s->pc_tmp); tcg_gen_movi_i64(psw_addr, s->pc_tmp);
} }
@ -6634,7 +6630,6 @@ static void s390x_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
case DISAS_NORETURN: case DISAS_NORETURN:
break; break;
case DISAS_TOO_MANY: case DISAS_TOO_MANY:
case DISAS_PC_STALE:
case DISAS_PC_STALE_NOCHAIN: case DISAS_PC_STALE_NOCHAIN:
update_psw_addr(dc); update_psw_addr(dc);
/* FALLTHRU */ /* FALLTHRU */