aboutsummaryrefslogtreecommitdiff
path: root/target-arm
diff options
context:
space:
mode:
authorLars Munch <lars@segv.dk>2010-05-08 22:42:43 +0200
committerAurelien Jarno <aurelien@aurel32.net>2010-05-28 21:25:16 +0200
commit9ba8c3f41d47f2051ea4bdb7156978f941ea7324 (patch)
tree5574f5cda1941e17353a58bbf6d1344215edbe39 /target-arm
parent3e1dbaddbf199762deaf00e3b3308f7508671e35 (diff)
downloadqemu-9ba8c3f41d47f2051ea4bdb7156978f941ea7324.zip
qemu-9ba8c3f41d47f2051ea4bdb7156978f941ea7324.tar.gz
qemu-9ba8c3f41d47f2051ea4bdb7156978f941ea7324.tar.bz2
arm: prevent coprocessor IO reset
This prevent coprocessor IO structure from being reset on cpu reset. This was a problem for PXA which uses coprocessor 6 and 14. Signed-off-by: Lars Munch <lars@segv.dk> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/cpu.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 1e34541..f3d138d 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -148,13 +148,6 @@ typedef struct CPUARMState {
int pending_exception;
} v7m;
- /* Coprocessor IO used by peripherals */
- struct {
- ARMReadCPFunc *cp_read;
- ARMWriteCPFunc *cp_write;
- void *opaque;
- } cp[15];
-
/* Thumb-2 EE state. */
uint32_t teecr;
uint32_t teehbr;
@@ -204,6 +197,13 @@ typedef struct CPUARMState {
CPU_COMMON
/* These fields after the common ones so they are preserved on reset. */
+
+ /* Coprocessor IO used by peripherals */
+ struct {
+ ARMReadCPFunc *cp_read;
+ ARMWriteCPFunc *cp_write;
+ void *opaque;
+ } cp[15];
void *nvic;
struct arm_boot_info *boot_info;
} CPUARMState;