[Qemu-devel] [PATCH] target-sh4: move features flag after CPU_COMMON

[Qemu-devel] [PATCH] target-sh4: move features flag after CPU_COMMON

[Bobby Bingham]

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 <koorogi@koorogi.info>
---
 target-sh4/cpu.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index 276d295..c181dda 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;
-- 
1.8.4.3

Re: [Qemu-devel] [PATCH] target-sh4: move features flag after CPU_COMMON

[Richard Henderson]

On 11/25/2013 06:03 AM, Bobby Bingham wrote:
> 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 <koorogi@koorogi.info>

Reviewed-by: Richard Henderson <rth@twiddle.net>


r~

Re: [Qemu-devel] [PATCH] target-sh4: move features flag after CPU_COMMON

[Aurelien Jarno]

On Sun, Nov 24, 2013 at 02:03:05PM -0600, Bobby Bingham wrote:
> 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 <koorogi@koorogi.info>
> ---
>  target-sh4/cpu.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
> index 276d295..c181dda 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;

Thanks, applied.


-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net