diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-27 15:20:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-27 15:29:08 +0000 |
| commit | 2c4da50d9477fb830d778bb5d6a11215aa359b44 (patch) | |
| tree | 832f7cd8f87d7676d3294abfd3fcc8e1507122cd /target/arm/machine.c | |
| parent | d713ea6c464918f87d1dd480520dd4aedb685d9a (diff) | |
| download | qemu-2c4da50d9477fb830d778bb5d6a11215aa359b44.zip qemu-2c4da50d9477fb830d778bb5d6a11215aa359b44.tar.gz qemu-2c4da50d9477fb830d778bb5d6a11215aa359b44.tar.bz2 | |
armv7m: add state for v7M CCR, CFSR, HFSR, DFSR, MMFAR, BFAR
Add the structure fields, VMState fields, reset code and macros for
the v7M system control registers CCR, CFSR, HFSR, DFSR, MMFAR and
BFAR.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1485285380-10565-4-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'target/arm/machine.c')
| -rw-r--r-- | target/arm/machine.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/target/arm/machine.c b/target/arm/machine.c index 8d93571..fa5ec76 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -99,13 +99,19 @@ static bool m_needed(void *opaque) static const VMStateDescription vmstate_m = { .name = "cpu/m", - .version_id = 2, - .minimum_version_id = 2, + .version_id = 3, + .minimum_version_id = 3, .needed = m_needed, .fields = (VMStateField[]) { VMSTATE_UINT32(env.v7m.vecbase, ARMCPU), VMSTATE_UINT32(env.v7m.basepri, ARMCPU), VMSTATE_UINT32(env.v7m.control, ARMCPU), + VMSTATE_UINT32(env.v7m.ccr, ARMCPU), + VMSTATE_UINT32(env.v7m.cfsr, ARMCPU), + VMSTATE_UINT32(env.v7m.hfsr, ARMCPU), + VMSTATE_UINT32(env.v7m.dfsr, ARMCPU), + VMSTATE_UINT32(env.v7m.mmfar, ARMCPU), + VMSTATE_UINT32(env.v7m.bfar, ARMCPU), VMSTATE_INT32(env.v7m.exception, ARMCPU), VMSTATE_END_OF_LIST() } |