From ce1831bfb4858c78b7f54fee7c6c1e96c4052048 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Tue, 20 Mar 2018 06:57:26 -0400 Subject: [PATCH] target-*: Don't redefine cpu_exec() This function needs to be converted to QOM hook and virtualised for multi-arch. This rename interferes, as cpu-qom will not have access to the renaming causing name divergence. This rename doesn't really do anything anyway so just delete it. Backports commit 8642c1b81e0418df066a7960a7426d85a923a253 from qemu --- qemu/aarch64.h | 2 +- qemu/aarch64eb.h | 2 +- qemu/arm.h | 2 +- qemu/armeb.h | 2 +- qemu/header_gen.py | 3 +-- qemu/include/exec/cpu-all.h | 2 ++ qemu/m68k.h | 2 +- qemu/mips.h | 3 +-- qemu/mips64.h | 3 +-- qemu/mips64el.h | 3 +-- qemu/mipsel.h | 3 +-- qemu/powerpc.h | 2 +- qemu/sparc.h | 2 +- qemu/sparc64.h | 2 +- qemu/target/arm/cpu.h | 2 -- qemu/target/i386/cpu.h | 2 -- qemu/target/m68k/cpu.h | 2 -- qemu/target/mips/cpu.h | 2 -- qemu/target/sparc/cpu.h | 4 ---- qemu/x86_64.h | 2 +- 20 files changed, 16 insertions(+), 31 deletions(-) diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 75f750a4..4e59518b 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_aarch64 #define cpu_abort cpu_abort_aarch64 #define cpu_address_space_init cpu_address_space_init_aarch64 -#define cpu_arm_exec cpu_arm_exec_aarch64 #define cpu_arm_init cpu_arm_init_aarch64 #define cpu_breakpoint_insert cpu_breakpoint_insert_aarch64 #define cpu_breakpoint_remove cpu_breakpoint_remove_aarch64 @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_aarch64 #define cpu_common_reset cpu_common_reset_aarch64 #define cpu_dump_statistics cpu_dump_statistics_aarch64 +#define cpu_exec cpu_exec_aarch64 #define cpu_exec_init cpu_exec_init_aarch64 #define cpu_exec_init_all cpu_exec_init_all_aarch64 #define cpu_exec_step_atomic cpu_exec_step_atomic_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index bfc98339..9d5941b0 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_aarch64eb #define cpu_abort cpu_abort_aarch64eb #define cpu_address_space_init cpu_address_space_init_aarch64eb -#define cpu_arm_exec cpu_arm_exec_aarch64eb #define cpu_arm_init cpu_arm_init_aarch64eb #define cpu_breakpoint_insert cpu_breakpoint_insert_aarch64eb #define cpu_breakpoint_remove cpu_breakpoint_remove_aarch64eb @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_aarch64eb #define cpu_common_reset cpu_common_reset_aarch64eb #define cpu_dump_statistics cpu_dump_statistics_aarch64eb +#define cpu_exec cpu_exec_aarch64eb #define cpu_exec_init cpu_exec_init_aarch64eb #define cpu_exec_init_all cpu_exec_init_all_aarch64eb #define cpu_exec_step_atomic cpu_exec_step_atomic_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index d7392f19..6e227f09 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_arm #define cpu_abort cpu_abort_arm #define cpu_address_space_init cpu_address_space_init_arm -#define cpu_arm_exec cpu_arm_exec_arm #define cpu_arm_init cpu_arm_init_arm #define cpu_breakpoint_insert cpu_breakpoint_insert_arm #define cpu_breakpoint_remove cpu_breakpoint_remove_arm @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_arm #define cpu_common_reset cpu_common_reset_arm #define cpu_dump_statistics cpu_dump_statistics_arm +#define cpu_exec cpu_exec_arm #define cpu_exec_init cpu_exec_init_arm #define cpu_exec_init_all cpu_exec_init_all_arm #define cpu_exec_step_atomic cpu_exec_step_atomic_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index ff5d1990..f5572710 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_armeb #define cpu_abort cpu_abort_armeb #define cpu_address_space_init cpu_address_space_init_armeb -#define cpu_arm_exec cpu_arm_exec_armeb #define cpu_arm_init cpu_arm_init_armeb #define cpu_breakpoint_insert cpu_breakpoint_insert_armeb #define cpu_breakpoint_remove cpu_breakpoint_remove_armeb @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_armeb #define cpu_common_reset cpu_common_reset_armeb #define cpu_dump_statistics cpu_dump_statistics_armeb +#define cpu_exec cpu_exec_armeb #define cpu_exec_init cpu_exec_init_armeb #define cpu_exec_init_all cpu_exec_init_all_armeb #define cpu_exec_step_atomic cpu_exec_step_atomic_armeb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 957d4857..744a3f2b 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -262,7 +262,6 @@ symbols = ( 'cptype_valid', 'cpu_abort', 'cpu_address_space_init', - 'cpu_arm_exec', 'cpu_arm_init', 'cpu_breakpoint_insert', 'cpu_breakpoint_remove', @@ -283,6 +282,7 @@ symbols = ( 'cpu_common_realizefn', 'cpu_common_reset', 'cpu_dump_statistics', + 'cpu_exec', 'cpu_exec_init', 'cpu_exec_init_all', 'cpu_exec_step_atomic', @@ -3157,7 +3157,6 @@ aarch64_symbols = ( mips_symbols = ( 'MIPS64_REGS_STORAGE_SIZE', 'MIPS_REGS_STORAGE_SIZE', - 'cpu_mips_exec', 'cpu_mips_get_count', 'cpu_mips_get_random', 'cpu_mips_kseg0_to_phys', diff --git a/qemu/include/exec/cpu-all.h b/qemu/include/exec/cpu-all.h index c95cb704..7f640727 100644 --- a/qemu/include/exec/cpu-all.h +++ b/qemu/include/exec/cpu-all.h @@ -373,4 +373,6 @@ void qemu_mutex_unlock_ramlist(struct uc_struct *uc); int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, uint8_t *buf, int len, int is_write); +int cpu_exec(struct uc_struct *uc, CPUState *cpu); + #endif /* CPU_ALL_H */ diff --git a/qemu/m68k.h b/qemu/m68k.h index 078af1ab..658451d9 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_m68k #define cpu_abort cpu_abort_m68k #define cpu_address_space_init cpu_address_space_init_m68k -#define cpu_arm_exec cpu_arm_exec_m68k #define cpu_arm_init cpu_arm_init_m68k #define cpu_breakpoint_insert cpu_breakpoint_insert_m68k #define cpu_breakpoint_remove cpu_breakpoint_remove_m68k @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_m68k #define cpu_common_reset cpu_common_reset_m68k #define cpu_dump_statistics cpu_dump_statistics_m68k +#define cpu_exec cpu_exec_m68k #define cpu_exec_init cpu_exec_init_m68k #define cpu_exec_init_all cpu_exec_init_all_m68k #define cpu_exec_step_atomic cpu_exec_step_atomic_m68k diff --git a/qemu/mips.h b/qemu/mips.h index be6b21fc..da9371c2 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_mips #define cpu_abort cpu_abort_mips #define cpu_address_space_init cpu_address_space_init_mips -#define cpu_arm_exec cpu_arm_exec_mips #define cpu_arm_init cpu_arm_init_mips #define cpu_breakpoint_insert cpu_breakpoint_insert_mips #define cpu_breakpoint_remove cpu_breakpoint_remove_mips @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_mips #define cpu_common_reset cpu_common_reset_mips #define cpu_dump_statistics cpu_dump_statistics_mips +#define cpu_exec cpu_exec_mips #define cpu_exec_init cpu_exec_init_mips #define cpu_exec_init_all cpu_exec_init_all_mips #define cpu_exec_step_atomic cpu_exec_step_atomic_mips @@ -3058,7 +3058,6 @@ #define xscale_cpar_write xscale_cpar_write_mips #define MIPS64_REGS_STORAGE_SIZE MIPS64_REGS_STORAGE_SIZE_mips #define MIPS_REGS_STORAGE_SIZE MIPS_REGS_STORAGE_SIZE_mips -#define cpu_mips_exec cpu_mips_exec_mips #define cpu_mips_get_count cpu_mips_get_count_mips #define cpu_mips_get_random cpu_mips_get_random_mips #define cpu_mips_kseg0_to_phys cpu_mips_kseg0_to_phys_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index 399e54e4..0fb07a72 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_mips64 #define cpu_abort cpu_abort_mips64 #define cpu_address_space_init cpu_address_space_init_mips64 -#define cpu_arm_exec cpu_arm_exec_mips64 #define cpu_arm_init cpu_arm_init_mips64 #define cpu_breakpoint_insert cpu_breakpoint_insert_mips64 #define cpu_breakpoint_remove cpu_breakpoint_remove_mips64 @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_mips64 #define cpu_common_reset cpu_common_reset_mips64 #define cpu_dump_statistics cpu_dump_statistics_mips64 +#define cpu_exec cpu_exec_mips64 #define cpu_exec_init cpu_exec_init_mips64 #define cpu_exec_init_all cpu_exec_init_all_mips64 #define cpu_exec_step_atomic cpu_exec_step_atomic_mips64 @@ -3058,7 +3058,6 @@ #define xscale_cpar_write xscale_cpar_write_mips64 #define MIPS64_REGS_STORAGE_SIZE MIPS64_REGS_STORAGE_SIZE_mips64 #define MIPS_REGS_STORAGE_SIZE MIPS_REGS_STORAGE_SIZE_mips64 -#define cpu_mips_exec cpu_mips_exec_mips64 #define cpu_mips_get_count cpu_mips_get_count_mips64 #define cpu_mips_get_random cpu_mips_get_random_mips64 #define cpu_mips_kseg0_to_phys cpu_mips_kseg0_to_phys_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index 434cb6dd..4f80c415 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_mips64el #define cpu_abort cpu_abort_mips64el #define cpu_address_space_init cpu_address_space_init_mips64el -#define cpu_arm_exec cpu_arm_exec_mips64el #define cpu_arm_init cpu_arm_init_mips64el #define cpu_breakpoint_insert cpu_breakpoint_insert_mips64el #define cpu_breakpoint_remove cpu_breakpoint_remove_mips64el @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_mips64el #define cpu_common_reset cpu_common_reset_mips64el #define cpu_dump_statistics cpu_dump_statistics_mips64el +#define cpu_exec cpu_exec_mips64el #define cpu_exec_init cpu_exec_init_mips64el #define cpu_exec_init_all cpu_exec_init_all_mips64el #define cpu_exec_step_atomic cpu_exec_step_atomic_mips64el @@ -3058,7 +3058,6 @@ #define xscale_cpar_write xscale_cpar_write_mips64el #define MIPS64_REGS_STORAGE_SIZE MIPS64_REGS_STORAGE_SIZE_mips64el #define MIPS_REGS_STORAGE_SIZE MIPS_REGS_STORAGE_SIZE_mips64el -#define cpu_mips_exec cpu_mips_exec_mips64el #define cpu_mips_get_count cpu_mips_get_count_mips64el #define cpu_mips_get_random cpu_mips_get_random_mips64el #define cpu_mips_kseg0_to_phys cpu_mips_kseg0_to_phys_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index 66c82783..6cf26d43 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_mipsel #define cpu_abort cpu_abort_mipsel #define cpu_address_space_init cpu_address_space_init_mipsel -#define cpu_arm_exec cpu_arm_exec_mipsel #define cpu_arm_init cpu_arm_init_mipsel #define cpu_breakpoint_insert cpu_breakpoint_insert_mipsel #define cpu_breakpoint_remove cpu_breakpoint_remove_mipsel @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_mipsel #define cpu_common_reset cpu_common_reset_mipsel #define cpu_dump_statistics cpu_dump_statistics_mipsel +#define cpu_exec cpu_exec_mipsel #define cpu_exec_init cpu_exec_init_mipsel #define cpu_exec_init_all cpu_exec_init_all_mipsel #define cpu_exec_step_atomic cpu_exec_step_atomic_mipsel @@ -3058,7 +3058,6 @@ #define xscale_cpar_write xscale_cpar_write_mipsel #define MIPS64_REGS_STORAGE_SIZE MIPS64_REGS_STORAGE_SIZE_mipsel #define MIPS_REGS_STORAGE_SIZE MIPS_REGS_STORAGE_SIZE_mipsel -#define cpu_mips_exec cpu_mips_exec_mipsel #define cpu_mips_get_count cpu_mips_get_count_mipsel #define cpu_mips_get_random cpu_mips_get_random_mipsel #define cpu_mips_kseg0_to_phys cpu_mips_kseg0_to_phys_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index 9e02ce72..2ad22b97 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_powerpc #define cpu_abort cpu_abort_powerpc #define cpu_address_space_init cpu_address_space_init_powerpc -#define cpu_arm_exec cpu_arm_exec_powerpc #define cpu_arm_init cpu_arm_init_powerpc #define cpu_breakpoint_insert cpu_breakpoint_insert_powerpc #define cpu_breakpoint_remove cpu_breakpoint_remove_powerpc @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_powerpc #define cpu_common_reset cpu_common_reset_powerpc #define cpu_dump_statistics cpu_dump_statistics_powerpc +#define cpu_exec cpu_exec_powerpc #define cpu_exec_init cpu_exec_init_powerpc #define cpu_exec_init_all cpu_exec_init_all_powerpc #define cpu_exec_step_atomic cpu_exec_step_atomic_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index 6a997d0a..356a308f 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_sparc #define cpu_abort cpu_abort_sparc #define cpu_address_space_init cpu_address_space_init_sparc -#define cpu_arm_exec cpu_arm_exec_sparc #define cpu_arm_init cpu_arm_init_sparc #define cpu_breakpoint_insert cpu_breakpoint_insert_sparc #define cpu_breakpoint_remove cpu_breakpoint_remove_sparc @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_sparc #define cpu_common_reset cpu_common_reset_sparc #define cpu_dump_statistics cpu_dump_statistics_sparc +#define cpu_exec cpu_exec_sparc #define cpu_exec_init cpu_exec_init_sparc #define cpu_exec_init_all cpu_exec_init_all_sparc #define cpu_exec_step_atomic cpu_exec_step_atomic_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index 82010fcc..742f070d 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_sparc64 #define cpu_abort cpu_abort_sparc64 #define cpu_address_space_init cpu_address_space_init_sparc64 -#define cpu_arm_exec cpu_arm_exec_sparc64 #define cpu_arm_init cpu_arm_init_sparc64 #define cpu_breakpoint_insert cpu_breakpoint_insert_sparc64 #define cpu_breakpoint_remove cpu_breakpoint_remove_sparc64 @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_sparc64 #define cpu_common_reset cpu_common_reset_sparc64 #define cpu_dump_statistics cpu_dump_statistics_sparc64 +#define cpu_exec cpu_exec_sparc64 #define cpu_exec_init cpu_exec_init_sparc64 #define cpu_exec_init_all cpu_exec_init_all_sparc64 #define cpu_exec_step_atomic cpu_exec_step_atomic_sparc64 diff --git a/qemu/target/arm/cpu.h b/qemu/target/arm/cpu.h index e96ec2ba..876bb66f 100644 --- a/qemu/target/arm/cpu.h +++ b/qemu/target/arm/cpu.h @@ -841,7 +841,6 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr, MemTxAttrs *attrs); ARMCPU *cpu_arm_init(struct uc_struct *uc, const char *cpu_model); -int cpu_arm_exec(struct uc_struct *uc, CPUState *cpu); target_ulong do_arm_semihosting(CPUARMState *env); void aarch64_sync_32_to_64(CPUARMState *env); void aarch64_sync_64_to_32(CPUARMState *env); @@ -2280,7 +2279,6 @@ static inline CPUARMState *cpu_init(struct uc_struct *uc, const char *cpu_model) } #ifdef TARGET_ARM -#define cpu_exec cpu_arm_exec #define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU #define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX) diff --git a/qemu/target/i386/cpu.h b/qemu/target/i386/cpu.h index cef2b845..c2380297 100644 --- a/qemu/target/i386/cpu.h +++ b/qemu/target/i386/cpu.h @@ -1343,7 +1343,6 @@ void x86_cpu_exec_enter(CPUState *cpu); void x86_cpu_exec_exit(CPUState *cpu); X86CPU *cpu_x86_create(struct uc_struct *uc, const char *cpu_model, Error **errp); -int cpu_x86_exec(struct uc_struct *uc, CPUState *cpu); int cpu_x86_support_mca_broadcast(CPUX86State *env); int cpu_get_pic_interrupt(CPUX86State *s); @@ -1525,7 +1524,6 @@ CPUX86State *cpu_x86_init_user(struct uc_struct *uc, const char *cpu_model); #define cpu_init cpu_x86_init_user #ifdef TARGET_I386 -#define cpu_exec cpu_x86_exec #define cpu_signal_handler cpu_x86_signal_handler #endif diff --git a/qemu/target/m68k/cpu.h b/qemu/target/m68k/cpu.h index 59c6d00d..d3ccb858 100644 --- a/qemu/target/m68k/cpu.h +++ b/qemu/target/m68k/cpu.h @@ -192,7 +192,6 @@ int m68k_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void m68k_tcg_init(struct uc_struct *uc); M68kCPU *cpu_m68k_init(struct uc_struct *uc, const char *cpu_model); -int cpu_m68k_exec(struct uc_struct *uc, CPUState *cpu); /* 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. */ @@ -532,7 +531,6 @@ static inline CPUM68KState *cpu_init(struct uc_struct *uc, const char *cpu_model return &cpu->env; } -#define cpu_exec cpu_m68k_exec #define cpu_signal_handler cpu_m68k_signal_handler #define cpu_list m68k_cpu_list diff --git a/qemu/target/mips/cpu.h b/qemu/target/mips/cpu.h index 5ff6d50d..c93f9cff 100644 --- a/qemu/target/mips/cpu.h +++ b/qemu/target/mips/cpu.h @@ -641,7 +641,6 @@ static inline MIPSCPU *mips_env_get_cpu(CPUMIPSState *env) void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf); -#define cpu_exec cpu_mips_exec #define cpu_signal_handler cpu_mips_signal_handler #define cpu_list mips_cpu_list @@ -745,7 +744,6 @@ enum { #define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0 #define cpu_init(uc, cpu_model) cpu_generic_init(uc, TYPE_MIPS_CPU, cpu_model) -int cpu_mips_exec(struct uc_struct *uc, CPUState *cpu); int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc); bool cpu_supports_isa(struct uc_struct *uc, const char *cpu_model, unsigned int isa); bool cpu_supports_cps_smp(struct uc_struct *uc, const char *cpu_type); diff --git a/qemu/target/sparc/cpu.h b/qemu/target/sparc/cpu.h index 40e73eef..68bde6ea 100644 --- a/qemu/target/sparc/cpu.h +++ b/qemu/target/sparc/cpu.h @@ -586,9 +586,6 @@ int sparc_cpu_memory_rw_debug(CPUState *cpu, vaddr addr, /* translate.c */ void sparc_tcg_init(struct uc_struct *uc); -/* cpu-exec.c */ -int cpu_sparc_exec(struct uc_struct *uc, CPUState *cpu); - /* win_helper.c */ target_ulong cpu_get_psr(CPUSPARCState *env1); void cpu_put_psr(CPUSPARCState *env1, target_ulong val); @@ -656,7 +653,6 @@ static inline CPUSPARCState *cpu_init(struct uc_struct *uc, const char *cpu_mode } #endif -#define cpu_exec cpu_sparc_exec #define cpu_signal_handler cpu_sparc_signal_handler #define cpu_list sparc_cpu_list diff --git a/qemu/x86_64.h b/qemu/x86_64.h index d1ce4d95..65cd96e4 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -256,7 +256,6 @@ #define cptype_valid cptype_valid_x86_64 #define cpu_abort cpu_abort_x86_64 #define cpu_address_space_init cpu_address_space_init_x86_64 -#define cpu_arm_exec cpu_arm_exec_x86_64 #define cpu_arm_init cpu_arm_init_x86_64 #define cpu_breakpoint_insert cpu_breakpoint_insert_x86_64 #define cpu_breakpoint_remove cpu_breakpoint_remove_x86_64 @@ -277,6 +276,7 @@ #define cpu_common_realizefn cpu_common_realizefn_x86_64 #define cpu_common_reset cpu_common_reset_x86_64 #define cpu_dump_statistics cpu_dump_statistics_x86_64 +#define cpu_exec cpu_exec_x86_64 #define cpu_exec_init cpu_exec_init_x86_64 #define cpu_exec_init_all cpu_exec_init_all_x86_64 #define cpu_exec_step_atomic cpu_exec_step_atomic_x86_64