Commit 2cbd949d7acc8381a87ba653ad973aa03e55b475
1 parent
0f3955e2
Common cpu_loop_exit prototype
All archs use the same cpu_loop_exit, so move the prototype in a common header. i386 was carrying a __hidden attribute, but that was empty for this arch anyway. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5820 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
10 changed files
with
1 additions
and
15 deletions
exec-all.h
@@ -82,6 +82,7 @@ TranslationBlock *tb_gen_code(CPUState *env, | @@ -82,6 +82,7 @@ TranslationBlock *tb_gen_code(CPUState *env, | ||
82 | target_ulong pc, target_ulong cs_base, int flags, | 82 | target_ulong pc, target_ulong cs_base, int flags, |
83 | int cflags); | 83 | int cflags); |
84 | void cpu_exec_init(CPUState *env); | 84 | void cpu_exec_init(CPUState *env); |
85 | +void cpu_loop_exit(void); | ||
85 | int page_unprotect(target_ulong address, unsigned long pc, void *puc); | 86 | int page_unprotect(target_ulong address, unsigned long pc, void *puc); |
86 | void tb_invalidate_phys_page_range(target_phys_addr_t start, target_phys_addr_t end, | 87 | void tb_invalidate_phys_page_range(target_phys_addr_t start, target_phys_addr_t end, |
87 | int is_cpu_write_access); | 88 | int is_cpu_write_access); |
target-alpha/cpu.h
@@ -409,7 +409,6 @@ int cpu_alpha_signal_handler(int host_signum, void *pinfo, | @@ -409,7 +409,6 @@ int cpu_alpha_signal_handler(int host_signum, void *pinfo, | ||
409 | void *puc); | 409 | void *puc); |
410 | int cpu_alpha_mfpr (CPUState *env, int iprn, uint64_t *valp); | 410 | int cpu_alpha_mfpr (CPUState *env, int iprn, uint64_t *valp); |
411 | int cpu_alpha_mtpr (CPUState *env, int iprn, uint64_t val, uint64_t *oldvalp); | 411 | int cpu_alpha_mtpr (CPUState *env, int iprn, uint64_t val, uint64_t *oldvalp); |
412 | -void cpu_loop_exit (void); | ||
413 | void pal_init (CPUState *env); | 412 | void pal_init (CPUState *env); |
414 | #if !defined (CONFIG_USER_ONLY) | 413 | #if !defined (CONFIG_USER_ONLY) |
415 | void call_pal (CPUState *env); | 414 | void call_pal (CPUState *env); |
target-arm/exec.h
@@ -58,6 +58,4 @@ static inline int cpu_halted(CPUState *env) { | @@ -58,6 +58,4 @@ static inline int cpu_halted(CPUState *env) { | ||
58 | #include "softmmu_exec.h" | 58 | #include "softmmu_exec.h" |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | -void cpu_loop_exit(void); | ||
62 | - | ||
63 | void raise_exception(int); | 61 | void raise_exception(int); |
target-cris/exec.h
@@ -45,8 +45,6 @@ int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | @@ -45,8 +45,6 @@ int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | ||
45 | void cpu_cris_flush_flags(CPUCRISState *env, int cc_op); | 45 | void cpu_cris_flush_flags(CPUCRISState *env, int cc_op); |
46 | void helper_movec(CPUCRISState *env, int reg, uint32_t val); | 46 | void helper_movec(CPUCRISState *env, int reg, uint32_t val); |
47 | 47 | ||
48 | -void cpu_loop_exit(void); | ||
49 | - | ||
50 | static inline int cpu_halted(CPUState *env) { | 48 | static inline int cpu_halted(CPUState *env) { |
51 | if (!env->halted) | 49 | if (!env->halted) |
52 | return 0; | 50 | return 0; |
target-i386/exec.h
@@ -72,7 +72,6 @@ void raise_interrupt(int intno, int is_int, int error_code, | @@ -72,7 +72,6 @@ void raise_interrupt(int intno, int is_int, int error_code, | ||
72 | void raise_exception_err(int exception_index, int error_code); | 72 | void raise_exception_err(int exception_index, int error_code); |
73 | void raise_exception(int exception_index); | 73 | void raise_exception(int exception_index); |
74 | void do_smm_enter(void); | 74 | void do_smm_enter(void); |
75 | -void __hidden cpu_loop_exit(void); | ||
76 | 75 | ||
77 | /* n must be a constant to be efficient */ | 76 | /* n must be a constant to be efficient */ |
78 | static inline target_long lshift(target_long x, int n) | 77 | static inline target_long lshift(target_long x, int n) |
target-m68k/exec.h
@@ -44,8 +44,6 @@ int cpu_m68k_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | @@ -44,8 +44,6 @@ int cpu_m68k_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | ||
44 | #include "softmmu_exec.h" | 44 | #include "softmmu_exec.h" |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | -void cpu_loop_exit(void); | ||
48 | - | ||
49 | static inline int cpu_halted(CPUState *env) { | 47 | static inline int cpu_halted(CPUState *env) { |
50 | if (!env->halted) | 48 | if (!env->halted) |
51 | return 0; | 49 | return 0; |
target-mips/exec.h
@@ -29,7 +29,6 @@ int cpu_mips_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | @@ -29,7 +29,6 @@ int cpu_mips_handle_mmu_fault (CPUState *env, target_ulong address, int rw, | ||
29 | void do_interrupt (CPUState *env); | 29 | void do_interrupt (CPUState *env); |
30 | void r4k_invalidate_tlb (CPUState *env, int idx, int use_extra); | 30 | void r4k_invalidate_tlb (CPUState *env, int idx, int use_extra); |
31 | 31 | ||
32 | -void cpu_loop_exit(void); | ||
33 | void do_raise_exception_err (uint32_t exception, int error_code); | 32 | void do_raise_exception_err (uint32_t exception, int error_code); |
34 | void do_raise_exception (uint32_t exception); | 33 | void do_raise_exception (uint32_t exception); |
35 | 34 |
target-ppc/cpu.h
@@ -689,7 +689,6 @@ int cpu_ppc_signal_handler (int host_signum, void *pinfo, | @@ -689,7 +689,6 @@ int cpu_ppc_signal_handler (int host_signum, void *pinfo, | ||
689 | 689 | ||
690 | void do_interrupt (CPUPPCState *env); | 690 | void do_interrupt (CPUPPCState *env); |
691 | void ppc_hw_interrupt (CPUPPCState *env); | 691 | void ppc_hw_interrupt (CPUPPCState *env); |
692 | -void cpu_loop_exit (void); | ||
693 | 692 | ||
694 | void dump_stack (CPUPPCState *env); | 693 | void dump_stack (CPUPPCState *env); |
695 | 694 |
target-sh4/exec.h
@@ -65,6 +65,4 @@ int find_utlb_entry(CPUState * env, target_ulong address, int use_asid); | @@ -65,6 +65,4 @@ int find_utlb_entry(CPUState * env, target_ulong address, int use_asid); | ||
65 | 65 | ||
66 | void do_interrupt(CPUState * env); | 66 | void do_interrupt(CPUState * env); |
67 | 67 | ||
68 | -void cpu_loop_exit(void); | ||
69 | - | ||
70 | #endif /* _EXEC_SH4_H */ | 68 | #endif /* _EXEC_SH4_H */ |
target-sparc/exec.h
@@ -24,9 +24,6 @@ static inline void regs_to_env(void) | @@ -24,9 +24,6 @@ static inline void regs_to_env(void) | ||
24 | /* op_helper.c */ | 24 | /* op_helper.c */ |
25 | void do_interrupt(CPUState *env); | 25 | void do_interrupt(CPUState *env); |
26 | 26 | ||
27 | -/* cpu-exec.c */ | ||
28 | -void cpu_loop_exit(void); | ||
29 | - | ||
30 | static inline int cpu_halted(CPUState *env1) { | 27 | static inline int cpu_halted(CPUState *env1) { |
31 | if (!env1->halted) | 28 | if (!env1->halted) |
32 | return 0; | 29 | return 0; |