OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/s390x: Convert to tcg_ops restore_state_to_opc 

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-24 20:56:41 +10:00
parent 5439d7a68c
commit 3479783b39
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/s390x/cpu.c
View File

@ -272,6 +272,7 @@ static void s390_cpu_reset_full(DeviceState *dev)
static const struct TCGCPUOps s390_tcg_ops = { static const struct TCGCPUOps s390_tcg_ops = {
.initialize = s390x_translate_init, .initialize = s390x_translate_init,
.restore_state_to_opc = s390x_restore_state_to_opc,
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
.record_sigsegv = s390_cpu_record_sigsegv, .record_sigsegv = s390_cpu_record_sigsegv,

4
target/s390x/s390x-internal.h
View File

@ -398,7 +398,9 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3,
/* translate.c */ /* translate.c */
void s390x_translate_init(void); void s390x_translate_init(void);
void s390x_restore_state_to_opc(CPUState *cs,
const TranslationBlock *tb,
const uint64_t *data);
/* sigp.c */ /* sigp.c */
int handle_sigp(CPUS390XState *env, uint8_t order, uint64_t r1, uint64_t r3); int handle_sigp(CPUS390XState *env, uint8_t order, uint64_t r1, uint64_t r3);

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

@ -6691,9 +6691,12 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns,
translator_loop(cs, tb, max_insns, pc, host_pc, &s390x_tr_ops, &dc.base); translator_loop(cs, tb, max_insns, pc, host_pc, &s390x_tr_ops, &dc.base);
} }
void restore_state_to_opc(CPUS390XState *env, TranslationBlock *tb, void s390x_restore_state_to_opc(CPUState *cs,
target_ulong *data) const TranslationBlock *tb,
const uint64_t *data)
{ {
S390CPU *cpu = S390_CPU(cs);
CPUS390XState *env = &cpu->env;
int cc_op = data[1]; int cc_op = data[1];
env->psw.addr = data[0]; env->psw.addr = data[0];