qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 3/5] Rename xxx_cpu_list() to cpu_xxx_list()


From: Mark McLoughlin
Subject: [Qemu-devel] [PATCH 3/5] Rename xxx_cpu_list() to cpu_xxx_list()
Date: Thu, 13 Nov 2008 16:46:01 +0000

This naming seems more consistent with the rest of the code.

Signed-off-by: Mark McLoughlin <address@hidden>
---
 target-arm/cpu.h             |    5 ++---
 target-arm/helper.c          |    2 +-
 target-i386/cpu.h            |    5 ++---
 target-i386/helper.c         |    2 +-
 target-mips/cpu.h            |    4 ++--
 target-mips/translate_init.c |    2 +-
 target-ppc/cpu.h             |    5 ++---
 target-ppc/translate_init.c  |    2 +-
 target-sh4/cpu.h             |    4 ++--
 target-sh4/translate.c       |    2 +-
 target-sparc/cpu.h           |    5 ++---
 target-sparc/helper.c        |    2 +-
 12 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index c182245..e40eb72 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -201,6 +201,7 @@ CPUARMState *cpu_arm_init(const char *cpu_model);
 void arm_translate_init(void);
 int cpu_arm_exec(CPUARMState *s);
 void cpu_arm_close(CPUARMState *s);
+void cpu_arm_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 void do_interrupt(CPUARMState *);
 void switch_mode(CPUARMState *, int);
 uint32_t do_arm_semihosting(CPUARMState *env);
@@ -337,8 +338,6 @@ static inline int arm_feature(CPUARMState *env, int feature)
     return (env->features & (1u << feature)) != 0;
 }
 
-void arm_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
-
 /* Interface between CPU and Interrupt controller.  */
 void armv7m_nvic_set_pending(void *opaque, int irq);
 int armv7m_nvic_acknowledge_irq(void *opaque);
@@ -393,7 +392,7 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum,
 #define cpu_exec cpu_arm_exec
 #define cpu_gen_code cpu_arm_gen_code
 #define cpu_signal_handler cpu_arm_signal_handler
-#define cpu_list arm_cpu_list
+#define cpu_list cpu_arm_list
 
 #define CPU_SAVE_VERSION 1
 
diff --git a/target-arm/helper.c b/target-arm/helper.c
index a9b31e5..8b2b12d 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -291,7 +291,7 @@ static const struct arm_cpu_t arm_cpu_names[] = {
     { 0, NULL}
 };
 
-void arm_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
+void cpu_arm_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
 {
     int i;
 
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 167bae2..601f4ee 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -631,8 +631,7 @@ typedef struct CPUX86State {
 CPUX86State *cpu_x86_init(const char *cpu_model);
 int cpu_x86_exec(CPUX86State *s);
 void cpu_x86_close(CPUX86State *s);
-void x86_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt,
-                                                 ...));
+void cpu_x86_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 int cpu_get_pic_interrupt(CPUX86State *s);
 /* MSDOS compatibility mode FPU exception support */
 void cpu_set_ferr(CPUX86State *s);
@@ -760,7 +759,7 @@ static inline int cpu_get_time_fast(void)
 #define cpu_exec cpu_x86_exec
 #define cpu_gen_code cpu_x86_gen_code
 #define cpu_signal_handler cpu_x86_signal_handler
-#define cpu_list x86_cpu_list
+#define cpu_list cpu_x86_list
 
 #define CPU_SAVE_VERSION 7
 
diff --git a/target-i386/helper.c b/target-i386/helper.c
index c8b8be9..bed01d5 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -392,7 +392,7 @@ error:
     return -1;
 }
 
-void x86_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
+void cpu_x86_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
 {
     unsigned int i;
 
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index d686f8e..d32393c 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -468,7 +468,6 @@ void r4k_do_tlbwi (void);
 void r4k_do_tlbwr (void);
 void r4k_do_tlbp (void);
 void r4k_do_tlbr (void);
-void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, 
...));
 
 void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
                           int unused, int size);
@@ -478,7 +477,7 @@ void do_unassigned_access(target_phys_addr_t addr, int 
is_write, int is_exec,
 #define cpu_exec cpu_mips_exec
 #define cpu_gen_code cpu_mips_gen_code
 #define cpu_signal_handler cpu_mips_signal_handler
-#define cpu_list mips_cpu_list
+#define cpu_list cpu_mips_list
 
 #define CPU_SAVE_VERSION 3
 
@@ -560,6 +559,7 @@ enum {
 
 int cpu_mips_exec(CPUMIPSState *s);
 CPUMIPSState *cpu_mips_init(const char *cpu_model);
+void cpu_mips_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 uint32_t cpu_mips_get_clock (void);
 int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);
 
diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c
index 0026cd0..def0a04 100644
--- a/target-mips/translate_init.c
+++ b/target-mips/translate_init.c
@@ -429,7 +429,7 @@ static const mips_def_t *cpu_mips_find_by_name (const char 
*name)
     return NULL;
 }
 
-void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
+void cpu_mips_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
 {
     int i;
 
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 00eac07..7b466a5 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -692,6 +692,7 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model);
 void ppc_translate_init(void);
 int cpu_ppc_exec (CPUPPCState *s);
 void cpu_ppc_close (CPUPPCState *s);
+void cpu_ppc_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 /* you can call this signal handler from your SIGBUS and SIGSEGV
    signal handlers to inform the virtual CPU of exceptions. non zero
    is returned if the signal was handled by the virtual CPU.  */
@@ -732,8 +733,6 @@ void ppc_store_msr (CPUPPCState *env, target_ulong value);
 
 void cpu_ppc_reset (void *opaque);
 
-void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
-
 const ppc_def_t *cpu_ppc_find_by_name (const char *name);
 int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def);
 
@@ -801,7 +800,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, 
target_ulong val);
 #define cpu_exec cpu_ppc_exec
 #define cpu_gen_code cpu_ppc_gen_code
 #define cpu_signal_handler cpu_ppc_signal_handler
-#define cpu_list ppc_cpu_list
+#define cpu_list cpu_ppc_list
 
 #define CPU_SAVE_VERSION 3
 
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 02590ae..5702a67 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -9476,7 +9476,7 @@ const ppc_def_t *cpu_ppc_find_by_name (const char *name)
     return ret;
 }
 
-void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
+void cpu_ppc_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
 {
     int i, max;
 
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index 2f42e60..4bf30cc 100644
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -137,7 +137,7 @@ CPUSH4State *cpu_sh4_init(const char *cpu_model);
 int cpu_sh4_exec(CPUSH4State * s);
 int cpu_sh4_signal_handler(int host_signum, void *pinfo,
                            void *puc);
-void sh4_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
+void cpu_sh4_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 void cpu_sh4_write_mmaped_utlb_addr(CPUSH4State *s, target_phys_addr_t addr,
                                    uint32_t mem_value);
 
@@ -153,7 +153,7 @@ static inline void cpu_set_tls(CPUSH4State *env, 
target_ulong newtls)
 #define cpu_exec cpu_sh4_exec
 #define cpu_gen_code cpu_sh4_gen_code
 #define cpu_signal_handler cpu_sh4_signal_handler
-#define cpu_list sh4_cpu_list
+#define cpu_list cpu_sh4_list
 
 /* MMU modes definitions */
 #define MMU_MODE0_SUFFIX _kernel
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 0f22f19..43aef0c 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -220,7 +220,7 @@ static const sh4_def_t *cpu_sh4_find_by_name(const char 
*name)
     return NULL;
 }
 
-void sh4_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
+void cpu_sh4_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
 {
     int i;
 
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index c13926d..81896ee 100644
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -338,8 +338,7 @@ typedef struct CPUSPARCState {
 /* helper.c */
 CPUSPARCState *cpu_sparc_init(const char *cpu_model);
 void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu);
-void sparc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt,
-                                                 ...));
+void cpu_sparc_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, 
...));
 void cpu_lock(void);
 void cpu_unlock(void);
 int cpu_sparc_handle_mmu_fault(CPUSPARCState *env1, target_ulong address, int 
rw,
@@ -438,7 +437,7 @@ int cpu_sparc_signal_handler(int host_signum, void *pinfo, 
void *puc);
 #define cpu_exec cpu_sparc_exec
 #define cpu_gen_code cpu_sparc_gen_code
 #define cpu_signal_handler cpu_sparc_signal_handler
-#define cpu_list sparc_cpu_list
+#define cpu_list cpu_sparc_list
 
 #define CPU_SAVE_VERSION 5
 
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index f222e3a..10e47db 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -1332,7 +1332,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, 
const char *cpu_model)
     return -1;
 }
 
-void sparc_cpu_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
+void cpu_sparc_list(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
 {
     unsigned int i;
 
-- 
1.5.4.3





reply via email to

[Prev in Thread] Current Thread [Next in Thread]