Commit 4552a09d authored by Peter Maydell's avatar Peter Maydell Committed by Mark Cave-Ayland
Browse files

target-sparc: Split cpu_put_psr into side-effect and no-side-effect parts 



For inbound migration we really want to be able to set the PSR without
having any side effects, but cpu_put_psr() calls cpu_check_irqs() which
might try to deliver CPU interrupts. Split cpu_put_psr() into the
no-side-effect and side-effect parts.

This includes reordering the cpu_check_irqs() to the end of cpu_put_psr(),
because that function may actually end up calling cpu_interrupt(), which
does not seem like a good thing to happen in the middle of updating the PSR.

Suggested-by: default avatarBlue Swirl <blauwirbel@gmail.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
parent 365162f7

target-sparc/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ int cpu_sparc_exec(CPUState *cpu); 
/* win_helper.c */

target_ulong cpu_get_psr(CPUSPARCState *env1);

void cpu_put_psr(CPUSPARCState *env1, target_ulong val);

void cpu_put_psr_raw(CPUSPARCState *env1, target_ulong val);

#ifdef TARGET_SPARC64

target_ulong cpu_get_ccr(CPUSPARCState *env1);

void cpu_put_ccr(CPUSPARCState *env1, target_ulong val);

target-sparc/win_helper.c

+12 −7
Original line number Diff line number Diff line
@@ -64,23 +64,28 @@ target_ulong cpu_get_psr(CPUSPARCState *env) 
#endif

}



void cpu_put_psr(CPUSPARCState *env, target_ulong val)

void cpu_put_psr_raw(CPUSPARCState *env, target_ulong val)

{

    env->psr = val & PSR_ICC;

#if !defined(TARGET_SPARC64)

    env->psref = (val & PSR_EF) ? 1 : 0;

    env->psrpil = (val & PSR_PIL) >> 8;

#endif

#if ((!defined(TARGET_SPARC64)) && !defined(CONFIG_USER_ONLY))

    cpu_check_irqs(env);

#endif

#if !defined(TARGET_SPARC64)

    env->psrs = (val & PSR_S) ? 1 : 0;

    env->psrps = (val & PSR_PS) ? 1 : 0;

    env->psret = (val & PSR_ET) ? 1 : 0;

    cpu_set_cwp(env, val & PSR_CWP);

#endif

    env->cc_op = CC_OP_FLAGS;

#if !defined(TARGET_SPARC64)

    cpu_set_cwp(env, val & PSR_CWP);

#endif

}



void cpu_put_psr(CPUSPARCState *env, target_ulong val)

{

    cpu_put_psr_raw(env, val);

#if ((!defined(TARGET_SPARC64)) && !defined(CONFIG_USER_ONLY))

    cpu_check_irqs(env);

#endif

}



int cpu_cwp_inc(CPUSPARCState *env, int cwp)