Patchwork remove TARGET_* defines from translate-all.c

login
register
mail settings
Submitter Paolo Bonzini
Date March 31, 2010, 2:54 p.m.
Message ID <1270047251-12485-1-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/49151/
State New
Headers show

Comments

Paolo Bonzini - March 31, 2010, 2:54 p.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 exec-all.h               |    4 ----
 target-i386/translate.c  |    2 ++
 target-mips/translate.c  |    2 ++
 target-sh4/translate.c   |    2 ++
 target-sparc/translate.c |    3 +++
 translate-all.c          |    8 --------
 6 files changed, 9 insertions(+), 12 deletions(-)
Aurelien Jarno - April 8, 2010, 7:34 p.m.
Thanks, applied.

On Wed, Mar 31, 2010 at 04:54:11PM +0200, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  exec-all.h               |    4 ----
>  target-i386/translate.c  |    2 ++
>  target-mips/translate.c  |    2 ++
>  target-sh4/translate.c   |    2 ++
>  target-sparc/translate.c |    3 +++
>  translate-all.c          |    8 --------
>  6 files changed, 9 insertions(+), 12 deletions(-)
> 
> diff --git a/exec-all.h b/exec-all.h
> index ff3b240..b9e7e18 100644
> --- a/exec-all.h
> +++ b/exec-all.h
> @@ -58,12 +58,8 @@ typedef struct TranslationBlock TranslationBlock;
>  #define OPPARAM_BUF_SIZE (OPC_BUF_SIZE * MAX_OPC_PARAM)
>  
>  extern target_ulong gen_opc_pc[OPC_BUF_SIZE];
> -extern target_ulong gen_opc_npc[OPC_BUF_SIZE];
> -extern uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
>  extern uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
>  extern uint16_t gen_opc_icount[OPC_BUF_SIZE];
> -extern target_ulong gen_opc_jump_pc[2];
> -extern uint32_t gen_opc_hflags[OPC_BUF_SIZE];
>  
>  #include "qemu-log.h"
>  
> diff --git a/target-i386/translate.c b/target-i386/translate.c
> index 28d9940..307aabd 100644
> --- a/target-i386/translate.c
> +++ b/target-i386/translate.c
> @@ -72,6 +72,8 @@ static TCGv_i32 cpu_tmp2_i32, cpu_tmp3_i32;
>  static TCGv_i64 cpu_tmp1_i64;
>  static TCGv cpu_tmp5;
>  
> +static uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
> +
>  #include "gen-icount.h"
>  
>  #ifdef TARGET_X86_64
> diff --git a/target-mips/translate.c b/target-mips/translate.c
> index 0ade3bd..3f05437 100644
> --- a/target-mips/translate.c
> +++ b/target-mips/translate.c
> @@ -442,6 +442,8 @@ static TCGv cpu_dspctrl, btarget, bcond;
>  static TCGv_i32 hflags;
>  static TCGv_i32 fpu_fcr0, fpu_fcr31;
>  
> +static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
> +
>  #include "gen-icount.h"
>  
>  #define gen_helper_0i(name, arg) do {                             \
> diff --git a/target-sh4/translate.c b/target-sh4/translate.c
> index bff3188..3537f8c 100644
> --- a/target-sh4/translate.c
> +++ b/target-sh4/translate.c
> @@ -77,6 +77,8 @@ static TCGv cpu_fregs[32];
>  /* internal register indexes */
>  static TCGv cpu_flags, cpu_delayed_pc;
>  
> +static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
> +
>  #include "gen-icount.h"
>  
>  static void sh4_translate_init(void)
> diff --git a/target-sparc/translate.c b/target-sparc/translate.c
> index 1164feb..8b988fb 100644
> --- a/target-sparc/translate.c
> +++ b/target-sparc/translate.c
> @@ -66,6 +66,9 @@ static TCGv_i64 cpu_tmp64;
>  /* Floating point registers */
>  static TCGv_i32 cpu_fpr[TARGET_FPREGS];
>  
> +static target_ulong gen_opc_npc[OPC_BUF_SIZE];
> +static target_ulong gen_opc_jump_pc[2];
> +
>  #include "gen-icount.h"
>  
>  typedef struct DisasContext {
> diff --git a/translate-all.c b/translate-all.c
> index 6f8136b..cd9c5c0 100644
> --- a/translate-all.c
> +++ b/translate-all.c
> @@ -40,14 +40,6 @@ TCGArg gen_opparam_buf[OPPARAM_BUF_SIZE];
>  target_ulong gen_opc_pc[OPC_BUF_SIZE];
>  uint16_t gen_opc_icount[OPC_BUF_SIZE];
>  uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
> -#if defined(TARGET_I386)
> -uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
> -#elif defined(TARGET_SPARC)
> -target_ulong gen_opc_npc[OPC_BUF_SIZE];
> -target_ulong gen_opc_jump_pc[2];
> -#elif defined(TARGET_MIPS) || defined(TARGET_SH4)
> -uint32_t gen_opc_hflags[OPC_BUF_SIZE];
> -#endif
>  
>  /* XXX: suppress that */
>  unsigned long code_gen_max_block_size(void)
> -- 
> 1.6.6.1
> 
> 
> 
>

Patch

diff --git a/exec-all.h b/exec-all.h
index ff3b240..b9e7e18 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -58,12 +58,8 @@  typedef struct TranslationBlock TranslationBlock;
 #define OPPARAM_BUF_SIZE (OPC_BUF_SIZE * MAX_OPC_PARAM)
 
 extern target_ulong gen_opc_pc[OPC_BUF_SIZE];
-extern target_ulong gen_opc_npc[OPC_BUF_SIZE];
-extern uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
 extern uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
 extern uint16_t gen_opc_icount[OPC_BUF_SIZE];
-extern target_ulong gen_opc_jump_pc[2];
-extern uint32_t gen_opc_hflags[OPC_BUF_SIZE];
 
 #include "qemu-log.h"
 
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 28d9940..307aabd 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -72,6 +72,8 @@  static TCGv_i32 cpu_tmp2_i32, cpu_tmp3_i32;
 static TCGv_i64 cpu_tmp1_i64;
 static TCGv cpu_tmp5;
 
+static uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
+
 #include "gen-icount.h"
 
 #ifdef TARGET_X86_64
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 0ade3bd..3f05437 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -442,6 +442,8 @@  static TCGv cpu_dspctrl, btarget, bcond;
 static TCGv_i32 hflags;
 static TCGv_i32 fpu_fcr0, fpu_fcr31;
 
+static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
+
 #include "gen-icount.h"
 
 #define gen_helper_0i(name, arg) do {                             \
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index bff3188..3537f8c 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -77,6 +77,8 @@  static TCGv cpu_fregs[32];
 /* internal register indexes */
 static TCGv cpu_flags, cpu_delayed_pc;
 
+static uint32_t gen_opc_hflags[OPC_BUF_SIZE];
+
 #include "gen-icount.h"
 
 static void sh4_translate_init(void)
diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index 1164feb..8b988fb 100644
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -66,6 +66,9 @@  static TCGv_i64 cpu_tmp64;
 /* Floating point registers */
 static TCGv_i32 cpu_fpr[TARGET_FPREGS];
 
+static target_ulong gen_opc_npc[OPC_BUF_SIZE];
+static target_ulong gen_opc_jump_pc[2];
+
 #include "gen-icount.h"
 
 typedef struct DisasContext {
diff --git a/translate-all.c b/translate-all.c
index 6f8136b..cd9c5c0 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -40,14 +40,6 @@  TCGArg gen_opparam_buf[OPPARAM_BUF_SIZE];
 target_ulong gen_opc_pc[OPC_BUF_SIZE];
 uint16_t gen_opc_icount[OPC_BUF_SIZE];
 uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
-#if defined(TARGET_I386)
-uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
-#elif defined(TARGET_SPARC)
-target_ulong gen_opc_npc[OPC_BUF_SIZE];
-target_ulong gen_opc_jump_pc[2];
-#elif defined(TARGET_MIPS) || defined(TARGET_SH4)
-uint32_t gen_opc_hflags[OPC_BUF_SIZE];
-#endif
 
 /* XXX: suppress that */
 unsigned long code_gen_max_block_size(void)