diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-06 15:27:38 +0000 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2020-12-18 11:23:29 +0100 |
| commit | 7a5805a08f942325b373643099f784cdac65c9ea (patch) | |
| tree | 2fc3e3537c8b428adeb457bc13f7170ec35d1e92 /target/sparc/int64_helper.c | |
| parent | 0ad20314f1e11acaeedcb14135b178a5711766f5 (diff) | |
| download | focaccia-qemu-7a5805a08f942325b373643099f784cdac65c9ea.tar.gz focaccia-qemu-7a5805a08f942325b373643099f784cdac65c9ea.zip | |
linux-user/sparc: Handle tstate in sparc64_get/set_context()
Correctly implement save/restore of the tstate field in sparc64_get_context() and sparc64_set_context(): * Don't use the CWP value from the guest in set_context * Construct and save a tstate value rather than leaving it as zero in get_context To do this we factor out the "calculate TSTATE value from CPU state" code from sparc_cpu_do_interrupt() into its own sparc64_tstate() function; that in turn requires us to move some of the function prototypes out from inside a CPU_NO_IO_DEFS ifdef guard. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20201106152738.26026-5-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'target/sparc/int64_helper.c')
| -rw-r--r-- | target/sparc/int64_helper.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/target/sparc/int64_helper.c b/target/sparc/int64_helper.c index ba95bf228c..7fb8ab211c 100644 --- a/target/sparc/int64_helper.c +++ b/target/sparc/int64_helper.c @@ -131,9 +131,7 @@ void sparc_cpu_do_interrupt(CPUState *cs) } tsptr = cpu_tsptr(env); - tsptr->tstate = (cpu_get_ccr(env) << 32) | - ((env->asi & 0xff) << 24) | ((env->pstate & 0xf3f) << 8) | - cpu_get_cwp64(env); + tsptr->tstate = sparc64_tstate(env); tsptr->tpc = env->pc; tsptr->tnpc = env->npc; tsptr->tt = intno; @@ -148,7 +146,6 @@ void sparc_cpu_do_interrupt(CPUState *cs) } if (env->def.features & CPU_FEATURE_GL) { - tsptr->tstate |= (env->gl & 7ULL) << 40; cpu_gl_switch_gregs(env, env->gl + 1); env->gl++; } |