[Qemu-devel] [RFC PATCH 25/34] arm: cpu: Move CPU_COMMON to front of env

[Peter Crosthwaite]

To allow pointer casts to the the multi-arch CPUArchState which
contains just the CPU_COMMON components.

Signed-off-by: Peter Crosthwaite <address@hidden>
---
 target-arm/cpu.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index bdcd331..61d0964 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -120,6 +120,7 @@ typedef struct {
 } TCR;
 
 typedef struct CPUARMState {
+    CPU_COMMON
     /* Regs for current mode.  */
     uint32_t regs[16];
 
@@ -472,9 +473,7 @@ typedef struct CPUARMState {
     struct CPUBreakpoint *cpu_breakpoint[16];
     struct CPUWatchpoint *cpu_watchpoint[16];
 
-    CPU_COMMON
-
-    /* These fields after the common ones so they are preserved on reset.  */
+    /* These fields are preserved on reset.  */
 
     /* Internal CPU feature flags.  */
     uint64_t features;
-- 
1.9.1