david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-mips: rename helpers from do_ to helper_

Browse Source 
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6773 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2009-03-08 00:06:01 +00:00
parent 829ef7b015
commit c01fccd2de
6 changed files with 277 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target-mips/cpu.h
View File

@ -41,10 +41,10 @@ struct CPUMIPSTLBContext {
uint32_t nb_tlb; uint32_t nb_tlb;
uint32_t tlb_in_use; uint32_t tlb_in_use;
int (*map_address) (struct CPUMIPSState *env, target_ulong *physical, int *prot, target_ulong address, int rw, int access_type); int (*map_address) (struct CPUMIPSState *env, target_ulong *physical, int *prot, target_ulong address, int rw, int access_type);
void (*do_tlbwi) (void); void (*helper_tlbwi) (void);
void (*do_tlbwr) (void); void (*helper_tlbwr) (void);
void (*do_tlbp) (void); void (*helper_tlbp) (void);
void (*do_tlbr) (void); void (*helper_tlbr) (void);
union { union {
struct { struct {
r4k_tlb_t tlb[MIPS_TLB_MAX]; r4k_tlb_t tlb[MIPS_TLB_MAX];
@ -466,10 +466,10 @@ int fixed_mmu_map_address (CPUMIPSState *env, target_ulong *physical, int *prot,
target_ulong address, int rw, int access_type); target_ulong address, int rw, int access_type);
int r4k_map_address (CPUMIPSState *env, target_ulong *physical, int *prot, int r4k_map_address (CPUMIPSState *env, target_ulong *physical, int *prot,
target_ulong address, int rw, int access_type); target_ulong address, int rw, int access_type);
void r4k_do_tlbwi (void); void r4k_helper_tlbwi (void);
void r4k_do_tlbwr (void); void r4k_helper_tlbwr (void);
void r4k_do_tlbp (void); void r4k_helper_tlbp (void);
void r4k_do_tlbr (void); void r4k_helper_tlbr (void);
void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); 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, void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,

2
target-mips/exec.h
View File

@ -17,8 +17,6 @@ register struct CPUMIPSState *env asm(AREG0);
#include "softmmu_exec.h" #include "softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */ #endif /* !defined(CONFIG_USER_ONLY) */
void do_mtc0_status_debug(uint32_t old, uint32_t val);
void do_mtc0_status_irqraise_debug(void);
void dump_fpu(CPUState *env); void dump_fpu(CPUState *env);
void fpu_dump_state(CPUState *env, FILE *f, void fpu_dump_state(CPUState *env, FILE *f,
int (*fpu_fprintf)(FILE *f, const char *fmt, ...), int (*fpu_fprintf)(FILE *f, const char *fmt, ...),

5
target-mips/helper.h
View File

@ -1,10 +1,5 @@
#include "def-helper.h" #include "def-helper.h"
/* FIXME: We should rename the helper functions and remove this hack. */
#undef HELPER
#define HELPER(name) do_##name
DEF_HELPER_2(raise_exception_err, void, i32, int) DEF_HELPER_2(raise_exception_err, void, i32, int)
DEF_HELPER_1(raise_exception, void, i32) DEF_HELPER_1(raise_exception, void, i32)
DEF_HELPER_0(interrupt_restart, void) DEF_HELPER_0(interrupt_restart, void)

531
target-mips/op_helper.c
View File

File diff suppressed because it is too large Load Diff

8
target-mips/translate.c
View File

@ -5451,25 +5451,25 @@ static void gen_cp0 (CPUState *env, DisasContext *ctx, uint32_t opc, int rt, int
break; break;
case OPC_TLBWI: case OPC_TLBWI:
opn = "tlbwi"; opn = "tlbwi";
if (!env->tlb->do_tlbwi) if (!env->tlb->helper_tlbwi)
goto die; goto die;
gen_helper_tlbwi(); gen_helper_tlbwi();
break; break;
case OPC_TLBWR: case OPC_TLBWR:
opn = "tlbwr"; opn = "tlbwr";
if (!env->tlb->do_tlbwr) if (!env->tlb->helper_tlbwr)
goto die; goto die;
gen_helper_tlbwr(); gen_helper_tlbwr();
break; break;
case OPC_TLBP: case OPC_TLBP:
opn = "tlbp"; opn = "tlbp";
if (!env->tlb->do_tlbp) if (!env->tlb->helper_tlbp)
goto die; goto die;
gen_helper_tlbp(); gen_helper_tlbp();
break; break;
case OPC_TLBR: case OPC_TLBR:
opn = "tlbr"; opn = "tlbr";
if (!env->tlb->do_tlbr) if (!env->tlb->helper_tlbr)
goto die; goto die;
gen_helper_tlbr(); gen_helper_tlbr();
break; break;

8
target-mips/translate_init.c
View File

@ -456,10 +456,10 @@ static void r4k_mmu_init (CPUMIPSState *env, const mips_def_t *def)
{ {
env->tlb->nb_tlb = 1 + ((def->CP0_Config1 >> CP0C1_MMU) & 63); env->tlb->nb_tlb = 1 + ((def->CP0_Config1 >> CP0C1_MMU) & 63);
env->tlb->map_address = &r4k_map_address; env->tlb->map_address = &r4k_map_address;
env->tlb->do_tlbwi = r4k_do_tlbwi; env->tlb->helper_tlbwi = r4k_helper_tlbwi;
env->tlb->do_tlbwr = r4k_do_tlbwr; env->tlb->helper_tlbwr = r4k_helper_tlbwr;
env->tlb->do_tlbp = r4k_do_tlbp; env->tlb->helper_tlbp = r4k_helper_tlbp;
env->tlb->do_tlbr = r4k_do_tlbr; env->tlb->helper_tlbr = r4k_helper_tlbr;
} }
static void mmu_init (CPUMIPSState *env, const mips_def_t *def) static void mmu_init (CPUMIPSState *env, const mips_def_t *def)