diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-11 12:40:24 +0000 |
---|---|---|
committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2016-01-16 12:01:23 +0000 |
commit | 4552a09dd4055c806b7df8c595dc0fb8951834be (patch) | |
tree | ae7e3bb8cc9064843c9aaf2c01c2500147d3a3cf /target-sparc/cpu.h | |
parent | 365162f7c09a428f16d2278e025328e73539ae8b (diff) | |
download | qemu-4552a09dd4055c806b7df8c595dc0fb8951834be.zip qemu-4552a09dd4055c806b7df8c595dc0fb8951834be.tar.gz qemu-4552a09dd4055c806b7df8c595dc0fb8951834be.tar.bz2 |
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: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'target-sparc/cpu.h')
-rw-r--r-- | target-sparc/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 4aa689e..d963507 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -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); |