target/ppc: Move most of 'cpu-qom.h' definitions to 'cpu.h'

[PATCH 5/7] target/ppc: Move powerpc_excp_t definition to 'cpu.h'

Posted by Philippe Mathieu-Daudé 2 years, 4 months ago

The powerpc_excp_t definition is only used by target/ppc/, no need
to expose it. Restrict it by moving it to "target/ppc/cpu.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/ppc/cpu-qom.h | 29 -----------------------------
 target/ppc/cpu.h     | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h
index 41e97a0ea1..b2e42c2996 100644
--- a/target/ppc/cpu-qom.h
+++ b/target/ppc/cpu-qom.h
@@ -79,35 +79,6 @@ static inline bool mmu_is_64bit(powerpc_mmu_t mmu_model)
     return mmu_model & POWERPC_MMU_64;
 }
 
-/*****************************************************************************/
-/* Exception model                                                           */
-typedef enum powerpc_excp_t powerpc_excp_t;
-enum powerpc_excp_t {
-    POWERPC_EXCP_UNKNOWN   = 0,
-    /* Standard PowerPC exception model */
-    POWERPC_EXCP_STD,
-    /* PowerPC 40x exception model      */
-    POWERPC_EXCP_40x,
-    /* PowerPC 603/604/G2 exception model */
-    POWERPC_EXCP_6xx,
-    /* PowerPC 7xx exception model      */
-    POWERPC_EXCP_7xx,
-    /* PowerPC 74xx exception model     */
-    POWERPC_EXCP_74xx,
-    /* BookE exception model            */
-    POWERPC_EXCP_BOOKE,
-    /* PowerPC 970 exception model      */
-    POWERPC_EXCP_970,
-    /* POWER7 exception model           */
-    POWERPC_EXCP_POWER7,
-    /* POWER8 exception model           */
-    POWERPC_EXCP_POWER8,
-    /* POWER9 exception model           */
-    POWERPC_EXCP_POWER9,
-    /* POWER10 exception model           */
-    POWERPC_EXCP_POWER10,
-};
-
 /*****************************************************************************/
 /* Input pins model                                                          */
 typedef enum powerpc_input_t powerpc_input_t;
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index d521ee97bb..d8cf4c03bf 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -190,6 +190,33 @@ enum {
     POWERPC_EXCP_TRAP          = 0x40,
 };
 
+/* Exception model                                                           */
+typedef enum powerpc_excp_t {
+    POWERPC_EXCP_UNKNOWN   = 0,
+    /* Standard PowerPC exception model */
+    POWERPC_EXCP_STD,
+    /* PowerPC 40x exception model      */
+    POWERPC_EXCP_40x,
+    /* PowerPC 603/604/G2 exception model */
+    POWERPC_EXCP_6xx,
+    /* PowerPC 7xx exception model      */
+    POWERPC_EXCP_7xx,
+    /* PowerPC 74xx exception model     */
+    POWERPC_EXCP_74xx,
+    /* BookE exception model            */
+    POWERPC_EXCP_BOOKE,
+    /* PowerPC 970 exception model      */
+    POWERPC_EXCP_970,
+    /* POWER7 exception model           */
+    POWERPC_EXCP_POWER7,
+    /* POWER8 exception model           */
+    POWERPC_EXCP_POWER8,
+    /* POWER9 exception model           */
+    POWERPC_EXCP_POWER9,
+    /* POWER10 exception model           */
+    POWERPC_EXCP_POWER10,
+} powerpc_excp_t;
+
 #define PPC_INPUT(env) ((env)->bus_model)
 
 /*****************************************************************************/
-- 
2.41.0

Re: [PATCH 5/7] target/ppc: Move powerpc_excp_t definition to 'cpu.h'

Posted by Cédric Le Goater 2 years, 4 months ago

On 10/13/23 14:56, Philippe Mathieu-Daudé wrote:
> The powerpc_excp_t definition is only used by target/ppc/, no need
> to expose it. Restrict it by moving it to "target/ppc/cpu.h".
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.


> ---
>   target/ppc/cpu-qom.h | 29 -----------------------------
>   target/ppc/cpu.h     | 27 +++++++++++++++++++++++++++
>   2 files changed, 27 insertions(+), 29 deletions(-)
> 
> diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h
> index 41e97a0ea1..b2e42c2996 100644
> --- a/target/ppc/cpu-qom.h
> +++ b/target/ppc/cpu-qom.h
> @@ -79,35 +79,6 @@ static inline bool mmu_is_64bit(powerpc_mmu_t mmu_model)
>       return mmu_model & POWERPC_MMU_64;
>   }
>   
> -/*****************************************************************************/
> -/* Exception model                                                           */
> -typedef enum powerpc_excp_t powerpc_excp_t;
> -enum powerpc_excp_t {
> -    POWERPC_EXCP_UNKNOWN   = 0,
> -    /* Standard PowerPC exception model */
> -    POWERPC_EXCP_STD,
> -    /* PowerPC 40x exception model      */
> -    POWERPC_EXCP_40x,
> -    /* PowerPC 603/604/G2 exception model */
> -    POWERPC_EXCP_6xx,
> -    /* PowerPC 7xx exception model      */
> -    POWERPC_EXCP_7xx,
> -    /* PowerPC 74xx exception model     */
> -    POWERPC_EXCP_74xx,
> -    /* BookE exception model            */
> -    POWERPC_EXCP_BOOKE,
> -    /* PowerPC 970 exception model      */
> -    POWERPC_EXCP_970,
> -    /* POWER7 exception model           */
> -    POWERPC_EXCP_POWER7,
> -    /* POWER8 exception model           */
> -    POWERPC_EXCP_POWER8,
> -    /* POWER9 exception model           */
> -    POWERPC_EXCP_POWER9,
> -    /* POWER10 exception model           */
> -    POWERPC_EXCP_POWER10,
> -};
> -
>   /*****************************************************************************/
>   /* Input pins model                                                          */
>   typedef enum powerpc_input_t powerpc_input_t;
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index d521ee97bb..d8cf4c03bf 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -190,6 +190,33 @@ enum {
>       POWERPC_EXCP_TRAP          = 0x40,
>   };
>   
> +/* Exception model                                                           */
> +typedef enum powerpc_excp_t {
> +    POWERPC_EXCP_UNKNOWN   = 0,
> +    /* Standard PowerPC exception model */
> +    POWERPC_EXCP_STD,
> +    /* PowerPC 40x exception model      */
> +    POWERPC_EXCP_40x,
> +    /* PowerPC 603/604/G2 exception model */
> +    POWERPC_EXCP_6xx,
> +    /* PowerPC 7xx exception model      */
> +    POWERPC_EXCP_7xx,
> +    /* PowerPC 74xx exception model     */
> +    POWERPC_EXCP_74xx,
> +    /* BookE exception model            */
> +    POWERPC_EXCP_BOOKE,
> +    /* PowerPC 970 exception model      */
> +    POWERPC_EXCP_970,
> +    /* POWER7 exception model           */
> +    POWERPC_EXCP_POWER7,
> +    /* POWER8 exception model           */
> +    POWERPC_EXCP_POWER8,
> +    /* POWER9 exception model           */
> +    POWERPC_EXCP_POWER9,
> +    /* POWER10 exception model           */
> +    POWERPC_EXCP_POWER10,
> +} powerpc_excp_t;
> +
>   #define PPC_INPUT(env) ((env)->bus_model)
>   
>   /*****************************************************************************/

Re: [PATCH 5/7] target/ppc: Move powerpc_excp_t definition to 'cpu.h'

Posted by Richard Henderson 2 years, 4 months ago

On 10/13/23 05:56, Philippe Mathieu-Daudé wrote:
> The powerpc_excp_t definition is only used by target/ppc/, no need
> to expose it. Restrict it by moving it to "target/ppc/cpu.h".
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/ppc/cpu-qom.h | 29 -----------------------------
>   target/ppc/cpu.h     | 27 +++++++++++++++++++++++++++
>   2 files changed, 27 insertions(+), 29 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

[PATCH 1/7] hw/ppc/spapr: Restrict PPCTimebase structure declaration to sPAPR
[PATCH 2/7] target/ppc: Define powerpc_pm_insn_t in 'internal.h'
[PATCH 3/7] target/ppc: Move ppc_cpu_class_by_name() declaration to 'cpu.h'
[PATCH 4/7] target/ppc: Move PowerPCCPUClass definition to 'cpu.h'
[PATCH 5/7] target/ppc: Move powerpc_excp_t definition to 'cpu.h'
[PATCH 6/7] target/ppc: Move powerpc_mmu_t definition to 'cpu.h'
[PATCH 7/7] target/ppc: Move powerpc_input_t definition to 'cpu.h'