diff options
author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-10 10:12:00 +0000 |
---|---|---|
committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-10 10:12:00 +0000 |
commit | 22548760ca36e3c9c716bf725194a846d1073855 (patch) | |
tree | 57643945499692088cb5d186a1fd5579ef4b8bbc /target-sparc/helper.c | |
parent | 9800ee2677ab1f6d506a03086a2fbfe66fe09f5c (diff) | |
download | qemu-22548760ca36e3c9c716bf725194a846d1073855.zip qemu-22548760ca36e3c9c716bf725194a846d1073855.tar.gz qemu-22548760ca36e3c9c716bf725194a846d1073855.tar.bz2 |
Fix compiler warnings
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4404 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-sparc/helper.c')
-rw-r--r-- | target-sparc/helper.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/target-sparc/helper.c b/target-sparc/helper.c index e378028..759232a 100644 --- a/target-sparc/helper.c +++ b/target-sparc/helper.c @@ -28,6 +28,7 @@ #include "cpu.h" #include "exec-all.h" #include "qemu-common.h" +#include "helper.h" //#define DEBUG_MMU //#define DEBUG_FEATURES @@ -35,7 +36,7 @@ typedef struct sparc_def_t sparc_def_t; struct sparc_def_t { - const unsigned char *name; + const char *name; target_ulong iu_version; uint32_t fpu_version; uint32_t mmu_version; @@ -47,7 +48,7 @@ struct sparc_def_t { uint32_t features; }; -static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const unsigned char *cpu_model); +static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model); /* Sparc MMU emulation */ @@ -67,13 +68,13 @@ void cpu_unlock(void) #if defined(CONFIG_USER_ONLY) -int cpu_sparc_handle_mmu_fault(CPUState *env, target_ulong address, int rw, +int cpu_sparc_handle_mmu_fault(CPUState *env1, target_ulong address, int rw, int mmu_idx, int is_softmmu) { if (rw & 2) - env->exception_index = TT_TFAULT; + env1->exception_index = TT_TFAULT; else - env->exception_index = TT_DFAULT; + env1->exception_index = TT_DFAULT; return 1; } @@ -387,8 +388,7 @@ void dump_mmu(CPUState *env) * UltraSparc IIi I/DMMUs */ static int get_physical_address_data(CPUState *env, target_phys_addr_t *physical, int *prot, - int *access_index, target_ulong address, int rw, - int is_user) + target_ulong address, int rw, int is_user) { target_ulong mask; unsigned int i; @@ -447,8 +447,7 @@ static int get_physical_address_data(CPUState *env, target_phys_addr_t *physical } static int get_physical_address_code(CPUState *env, target_phys_addr_t *physical, int *prot, - int *access_index, target_ulong address, int rw, - int is_user) + target_ulong address, int is_user) { target_ulong mask; unsigned int i; @@ -509,9 +508,11 @@ static int get_physical_address(CPUState *env, target_phys_addr_t *physical, int is_user = mmu_idx == MMU_USER_IDX; if (rw == 2) - return get_physical_address_code(env, physical, prot, access_index, address, rw, is_user); + return get_physical_address_code(env, physical, prot, address, + is_user); else - return get_physical_address_data(env, physical, prot, access_index, address, rw, is_user); + return get_physical_address_data(env, physical, prot, address, rw, + is_user); } /* Perform address translation */ @@ -1134,7 +1135,7 @@ static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features) fprintf(stderr, "CPU feature %s not found\n", flagname); } -static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const unsigned char *cpu_model) +static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) { unsigned int i; const sparc_def_t *def = NULL; |