From: Bobby Bingham Date: Sun, 24 Nov 2013 20:03:05 +0000 (-0600) Subject: target-sh4: move features flag after CPU_COMMON X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~386^2~42^2~278 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21c046118e740704d0ba81f6281dc95905bc30a8;p=sdk%2Femulator%2Fqemu.git target-sh4: move features flag after CPU_COMMON Everything before CPU_COMMON in the structure is cleared as part of a CPU reset. This included the features flag, which indicates whether SH4A instructions are supported or not. As a result, a CPU reset downgraded the CPU from an SH4A to an SH4. Signed-off-by: Bobby Bingham Reviewed-by: Richard Henderson Signed-off-by: Aurelien Jarno --- diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 276d2955c3..c181ddacf5 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -157,9 +157,6 @@ typedef struct CPUSH4State { /* float point status register */ float_status fp_status; - /* The features that we should emulate. See sh_features above. */ - uint32_t features; - /* Those belong to the specific unit (SH7750) but are handled here */ uint32_t mmucr; /* MMU control register */ uint32_t pteh; /* page table entry high register */ @@ -180,6 +177,9 @@ typedef struct CPUSH4State { int id; /* CPU model */ + /* The features that we should emulate. See sh_features above. */ + uint32_t features; + void *intc_handle; int in_sleep; /* SR_BL ignored during sleep */ memory_content *movcal_backup;