target/m68k: add vmstate structure to migrate M68kCPU

[PATCH 1/2] target/m68k: remove useless qregs array

Posted by Laurent Vivier 5 years, 3 months ago

They are unused since the target has been converted to TCG.

Fixes: e1f3808e03f7 ("Convert m68k target to TCG.")
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 target/m68k/cpu.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 521ac67cdd04..9a6f0400fcfe 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -33,8 +33,6 @@
 #define OS_PACKED   6
 #define OS_UNSIZED  7
 
-#define MAX_QREGS 32
-
 #define EXCP_ACCESS         2   /* Access (MMU) error.  */
 #define EXCP_ADDRESS        3   /* Address error.  */
 #define EXCP_ILLEGAL        4   /* Illegal instruction.  */
@@ -139,8 +137,6 @@ typedef struct CPUM68KState {
     int pending_vector;
     int pending_level;
 
-    uint32_t qregs[MAX_QREGS];
-
     /* Fields up to this point are cleared by a CPU reset */
     struct {} end_reset_fields;
 
-- 
2.26.2

Re: [PATCH 1/2] target/m68k: remove useless qregs array

Posted by Philippe Mathieu-Daudé 5 years, 3 months ago

On 10/22/20 10:29 PM, Laurent Vivier wrote:
> They are unused since the target has been converted to TCG.
> 
> Fixes: e1f3808e03f7 ("Convert m68k target to TCG.")
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>   target/m68k/cpu.h | 4 ----
>   1 file changed, 4 deletions(-)
> 
> diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
> index 521ac67cdd04..9a6f0400fcfe 100644
> --- a/target/m68k/cpu.h
> +++ b/target/m68k/cpu.h
> @@ -33,8 +33,6 @@
>   #define OS_PACKED   6
>   #define OS_UNSIZED  7
>   
> -#define MAX_QREGS 32
> -
>   #define EXCP_ACCESS         2   /* Access (MMU) error.  */
>   #define EXCP_ADDRESS        3   /* Address error.  */
>   #define EXCP_ILLEGAL        4   /* Illegal instruction.  */
> @@ -139,8 +137,6 @@ typedef struct CPUM68KState {
>       int pending_vector;
>       int pending_level;
>   
> -    uint32_t qregs[MAX_QREGS];
> -
>       /* Fields up to this point are cleared by a CPU reset */
>       struct {} end_reset_fields;
>   
>

Re: [PATCH 1/2] target/m68k: remove useless qregs array

Posted by Thomas Huth 5 years, 3 months ago

On 22/10/2020 22.29, Laurent Vivier wrote:
> They are unused since the target has been converted to TCG.
> 
> Fixes: e1f3808e03f7 ("Convert m68k target to TCG.")
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  target/m68k/cpu.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
> index 521ac67cdd04..9a6f0400fcfe 100644
> --- a/target/m68k/cpu.h
> +++ b/target/m68k/cpu.h
> @@ -33,8 +33,6 @@
>  #define OS_PACKED   6
>  #define OS_UNSIZED  7
>  
> -#define MAX_QREGS 32
> -
>  #define EXCP_ACCESS         2   /* Access (MMU) error.  */
>  #define EXCP_ADDRESS        3   /* Address error.  */
>  #define EXCP_ILLEGAL        4   /* Illegal instruction.  */
> @@ -139,8 +137,6 @@ typedef struct CPUM68KState {
>      int pending_vector;
>      int pending_level;
>  
> -    uint32_t qregs[MAX_QREGS];
> -
>      /* Fields up to this point are cleared by a CPU reset */
>      struct {} end_reset_fields;

Reviewed-by: Thomas Huth <thuth@redhat.com>

There are still some references to the term qreg in translate.c:

target/m68k/translate.c:#include "qregs.def"
target/m68k/translate.c:#include "qregs.def"
target/m68k/translate.c:/* Generate a jump to the address in qreg DEST.  */

Should these get renamed?

 Thomas

Re: [PATCH 1/2] target/m68k: remove useless qregs array

Posted by Laurent Vivier 5 years, 3 months ago

Le 23/10/2020 à 09:27, Thomas Huth a écrit :
> On 22/10/2020 22.29, Laurent Vivier wrote:
>> They are unused since the target has been converted to TCG.
>>
>> Fixes: e1f3808e03f7 ("Convert m68k target to TCG.")
>> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
>> ---
>>  target/m68k/cpu.h | 4 ----
>>  1 file changed, 4 deletions(-)
>>
>> diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
>> index 521ac67cdd04..9a6f0400fcfe 100644
>> --- a/target/m68k/cpu.h
>> +++ b/target/m68k/cpu.h
>> @@ -33,8 +33,6 @@
>>  #define OS_PACKED   6
>>  #define OS_UNSIZED  7
>>  
>> -#define MAX_QREGS 32
>> -
>>  #define EXCP_ACCESS         2   /* Access (MMU) error.  */
>>  #define EXCP_ADDRESS        3   /* Address error.  */
>>  #define EXCP_ILLEGAL        4   /* Illegal instruction.  */
>> @@ -139,8 +137,6 @@ typedef struct CPUM68KState {
>>      int pending_vector;
>>      int pending_level;
>>  
>> -    uint32_t qregs[MAX_QREGS];
>> -
>>      /* Fields up to this point are cleared by a CPU reset */
>>      struct {} end_reset_fields;
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 
> There are still some references to the term qreg in translate.c:
> 
> target/m68k/translate.c:#include "qregs.def"
> target/m68k/translate.c:#include "qregs.def"
> target/m68k/translate.c:/* Generate a jump to the address in qreg DEST.  */
> 
> Should these get renamed?
We always have something like qregs but they are implemented differently.
I don't know if it is worth renaming.

Thanks,
Laurent