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
This commit is contained in:
		
							parent
							
								
									0f3955e2d2
								
							
						
					
					
						commit
						2cbd949d7a
					
				@ -82,6 +82,7 @@ TranslationBlock *tb_gen_code(CPUState *env,
 | 
				
			|||||||
                              target_ulong pc, target_ulong cs_base, int flags,
 | 
					                              target_ulong pc, target_ulong cs_base, int flags,
 | 
				
			||||||
                              int cflags);
 | 
					                              int cflags);
 | 
				
			||||||
void cpu_exec_init(CPUState *env);
 | 
					void cpu_exec_init(CPUState *env);
 | 
				
			||||||
 | 
					void cpu_loop_exit(void);
 | 
				
			||||||
int page_unprotect(target_ulong address, unsigned long pc, void *puc);
 | 
					int page_unprotect(target_ulong address, unsigned long pc, void *puc);
 | 
				
			||||||
void tb_invalidate_phys_page_range(target_phys_addr_t start, target_phys_addr_t end,
 | 
					void tb_invalidate_phys_page_range(target_phys_addr_t start, target_phys_addr_t end,
 | 
				
			||||||
                                   int is_cpu_write_access);
 | 
					                                   int is_cpu_write_access);
 | 
				
			||||||
 | 
				
			|||||||
@ -409,7 +409,6 @@ int cpu_alpha_signal_handler(int host_signum, void *pinfo,
 | 
				
			|||||||
                             void *puc);
 | 
					                             void *puc);
 | 
				
			||||||
int cpu_alpha_mfpr (CPUState *env, int iprn, uint64_t *valp);
 | 
					int cpu_alpha_mfpr (CPUState *env, int iprn, uint64_t *valp);
 | 
				
			||||||
int cpu_alpha_mtpr (CPUState *env, int iprn, uint64_t val, uint64_t *oldvalp);
 | 
					int cpu_alpha_mtpr (CPUState *env, int iprn, uint64_t val, uint64_t *oldvalp);
 | 
				
			||||||
void cpu_loop_exit (void);
 | 
					 | 
				
			||||||
void pal_init (CPUState *env);
 | 
					void pal_init (CPUState *env);
 | 
				
			||||||
#if !defined (CONFIG_USER_ONLY)
 | 
					#if !defined (CONFIG_USER_ONLY)
 | 
				
			||||||
void call_pal (CPUState *env);
 | 
					void call_pal (CPUState *env);
 | 
				
			||||||
 | 
				
			|||||||
@ -58,6 +58,4 @@ static inline int cpu_halted(CPUState *env) {
 | 
				
			|||||||
#include "softmmu_exec.h"
 | 
					#include "softmmu_exec.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void cpu_loop_exit(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void raise_exception(int);
 | 
					void raise_exception(int);
 | 
				
			||||||
 | 
				
			|||||||
@ -45,8 +45,6 @@ int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
 | 
				
			|||||||
void cpu_cris_flush_flags(CPUCRISState *env, int cc_op);
 | 
					void cpu_cris_flush_flags(CPUCRISState *env, int cc_op);
 | 
				
			||||||
void helper_movec(CPUCRISState *env, int reg, uint32_t val);
 | 
					void helper_movec(CPUCRISState *env, int reg, uint32_t val);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void cpu_loop_exit(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static inline int cpu_halted(CPUState *env) {
 | 
					static inline int cpu_halted(CPUState *env) {
 | 
				
			||||||
	if (!env->halted)
 | 
						if (!env->halted)
 | 
				
			||||||
		return 0;
 | 
							return 0;
 | 
				
			||||||
 | 
				
			|||||||
@ -72,7 +72,6 @@ void raise_interrupt(int intno, int is_int, int error_code,
 | 
				
			|||||||
void raise_exception_err(int exception_index, int error_code);
 | 
					void raise_exception_err(int exception_index, int error_code);
 | 
				
			||||||
void raise_exception(int exception_index);
 | 
					void raise_exception(int exception_index);
 | 
				
			||||||
void do_smm_enter(void);
 | 
					void do_smm_enter(void);
 | 
				
			||||||
void __hidden cpu_loop_exit(void);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* n must be a constant to be efficient */
 | 
					/* n must be a constant to be efficient */
 | 
				
			||||||
static inline target_long lshift(target_long x, int n)
 | 
					static inline target_long lshift(target_long x, int n)
 | 
				
			||||||
 | 
				
			|||||||
@ -44,8 +44,6 @@ int cpu_m68k_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
 | 
				
			|||||||
#include "softmmu_exec.h"
 | 
					#include "softmmu_exec.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void cpu_loop_exit(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static inline int cpu_halted(CPUState *env) {
 | 
					static inline int cpu_halted(CPUState *env) {
 | 
				
			||||||
    if (!env->halted)
 | 
					    if (!env->halted)
 | 
				
			||||||
        return 0;
 | 
					        return 0;
 | 
				
			||||||
 | 
				
			|||||||
@ -29,7 +29,6 @@ int cpu_mips_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
 | 
				
			|||||||
void do_interrupt (CPUState *env);
 | 
					void do_interrupt (CPUState *env);
 | 
				
			||||||
void r4k_invalidate_tlb (CPUState *env, int idx, int use_extra);
 | 
					void r4k_invalidate_tlb (CPUState *env, int idx, int use_extra);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void cpu_loop_exit(void);
 | 
					 | 
				
			||||||
void do_raise_exception_err (uint32_t exception, int error_code);
 | 
					void do_raise_exception_err (uint32_t exception, int error_code);
 | 
				
			||||||
void do_raise_exception (uint32_t exception);
 | 
					void do_raise_exception (uint32_t exception);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -689,7 +689,6 @@ int cpu_ppc_signal_handler (int host_signum, void *pinfo,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void do_interrupt (CPUPPCState *env);
 | 
					void do_interrupt (CPUPPCState *env);
 | 
				
			||||||
void ppc_hw_interrupt (CPUPPCState *env);
 | 
					void ppc_hw_interrupt (CPUPPCState *env);
 | 
				
			||||||
void cpu_loop_exit (void);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
void dump_stack (CPUPPCState *env);
 | 
					void dump_stack (CPUPPCState *env);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -65,6 +65,4 @@ int find_utlb_entry(CPUState * env, target_ulong address, int use_asid);
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void do_interrupt(CPUState * env);
 | 
					void do_interrupt(CPUState * env);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void cpu_loop_exit(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif				/* _EXEC_SH4_H */
 | 
					#endif				/* _EXEC_SH4_H */
 | 
				
			||||||
 | 
				
			|||||||
@ -24,9 +24,6 @@ static inline void regs_to_env(void)
 | 
				
			|||||||
/* op_helper.c */
 | 
					/* op_helper.c */
 | 
				
			||||||
void do_interrupt(CPUState *env);
 | 
					void do_interrupt(CPUState *env);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* cpu-exec.c */
 | 
					 | 
				
			||||||
void cpu_loop_exit(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static inline int cpu_halted(CPUState *env1) {
 | 
					static inline int cpu_halted(CPUState *env1) {
 | 
				
			||||||
    if (!env1->halted)
 | 
					    if (!env1->halted)
 | 
				
			||||||
        return 0;
 | 
					        return 0;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user