diff options
| author |   Lars Munch <lars@segv.dk> | 2010-05-08 22:42:43 +0200 |
|---|---|---|
| committer |   Aurelien Jarno <aurelien@aurel32.net> | 2010-05-28 21:25:16 +0200 |
| commit | 9ba8c3f41d47f2051ea4bdb7156978f941ea7324 (patch) | |
| tree | 5574f5cda1941e17353a58bbf6d1344215edbe39 /target-arm | |
| parent | tcg: Use INDEX_op_qemu_ld32 for 32-bit results. (diff) | |
| download | qemu-kvm-9ba8c3f41d47f2051ea4bdb7156978f941ea7324.tar.gz qemu-kvm-9ba8c3f41d47f2051ea4bdb7156978f941ea7324.tar.bz2 qemu-kvm-9ba8c3f41d47f2051ea4bdb7156978f941ea7324.zip | |
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.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 1e3454173..f3d138de6 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; |