summaryrefslogtreecommitdiffstats
path: root/target-sparc
diff options
context:
space:
mode:
authorMark Cave-Ayland2015-11-08 13:27:38 +0100
committerMark Cave-Ayland2016-01-07 13:20:53 +0100
commite913cac71bac85438b7199711ac3290cb593701a (patch)
tree48b88571f6358b9dfc27def286e1d95411e58827 /target-sparc
parentMerge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20160105-1' in... (diff)
downloadqemu-e913cac71bac85438b7199711ac3290cb593701a.tar.gz
qemu-e913cac71bac85438b7199711ac3290cb593701a.tar.xz
qemu-e913cac71bac85438b7199711ac3290cb593701a.zip
sun4u: split out NPT and INT_DIS into separate CPUTimer fields
Currently there is confusion between use of these bits for the timer and timer compare registers (while they both have the same value, the behaviour is different). Split into two separate CPUTimer fields so we can always reference the correct value. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-By: Artyom Tarasenko <atar4qemu@gmail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'target-sparc')
-rw-r--r--target-sparc/cpu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 9fa770b144..4aa689ed0b 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -366,6 +366,8 @@ struct CPUTimer
uint32_t frequency;
uint32_t disabled;
uint64_t disabled_mask;
+ uint32_t npt;
+ uint64_t npt_mask;
int64_t clock_offset;
QEMUTimer *qtimer;
};