diff options
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/cpu.h | 4 | ||||
| -rw-r--r-- | target-ppc/op_helper.c | 2 | ||||
| -rw-r--r-- | target-ppc/translate.c | 4 | ||||
| -rw-r--r-- | target-ppc/translate_init.c | 18 |
4 files changed, 14 insertions, 14 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 1edf449..b50a593 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -303,7 +303,7 @@ struct ppc_spr_t { void (*hea_read)(void *opaque, int spr_num); void (*hea_write)(void *opaque, int spr_num); #endif - const unsigned char *name; + const char *name; }; /* Altivec registers (128 bits) */ @@ -733,7 +733,7 @@ void cpu_ppc_reset (void *opaque); void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); -const ppc_def_t *cpu_ppc_find_by_name (const unsigned char *name); +const ppc_def_t *cpu_ppc_find_by_name (const char *name); int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def); /* Time-base and decrementer management */ diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 1c08172..46e9b7a 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -244,7 +244,7 @@ void do_mulldo (void) int64_t th; uint64_t tl; - muls64(&tl, &th, T0, T1); + muls64(&tl, (uint64_t *)&th, T0, T1); T0 = (int64_t)tl; /* If th != 0 && th != -1, then we had an overflow */ if (likely((uint64_t)(th + 1) <= 1)) { diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 56bdef2..2d646b9 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -220,7 +220,7 @@ struct opc_handler_t { /* handler */ void (*handler)(DisasContext *ctx); #if defined(DO_PPC_STATISTICS) || defined(PPC_DUMP_CPU) - const unsigned char *oname; + const char *oname; #endif #if defined(DO_PPC_STATISTICS) uint64_t count; @@ -347,7 +347,7 @@ typedef struct opcode_t { unsigned char pad[1]; #endif opc_handler_t handler; - const unsigned char *oname; + const char *oname; } opcode_t; /*****************************************************************************/ diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 3e103dd..67951bf 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -34,7 +34,7 @@ #endif struct ppc_def_t { - const unsigned char *name; + const char *name; uint32_t pvr; uint32_t svr; uint64_t insns_flags; @@ -433,13 +433,13 @@ do { \ _spr_register(env, num, name, uea_read, uea_write, initial_value); \ } while (0) static inline void _spr_register (CPUPPCState *env, int num, - const unsigned char *name, + const char *name, void (*uea_read)(void *opaque, int sprn), void (*uea_write)(void *opaque, int sprn), target_ulong initial_value) #else static inline void spr_register (CPUPPCState *env, int num, - const unsigned char *name, + const char *name, void (*uea_read)(void *opaque, int sprn), void (*uea_write)(void *opaque, int sprn), void (*oea_read)(void *opaque, int sprn), @@ -1245,7 +1245,7 @@ static void gen_spr_usprgh (CPUPPCState *env) /* PowerPC BookE SPR */ static void gen_spr_BookE (CPUPPCState *env, uint64_t ivor_mask) { - const unsigned char *ivor_names[64] = { + const char *ivor_names[64] = { "IVOR0", "IVOR1", "IVOR2", "IVOR3", "IVOR4", "IVOR5", "IVOR6", "IVOR7", "IVOR8", "IVOR9", "IVOR10", "IVOR11", @@ -1407,7 +1407,7 @@ static void gen_spr_BookE (CPUPPCState *env, uint64_t ivor_mask) static void gen_spr_BookE_FSL (CPUPPCState *env, uint32_t mas_mask) { #if !defined(CONFIG_USER_ONLY) - const unsigned char *mas_names[8] = { + const char *mas_names[8] = { "MAS0", "MAS1", "MAS2", "MAS3", "MAS4", "MAS5", "MAS6", "MAS7", }; int mas_sprn[8] = { @@ -9157,7 +9157,7 @@ static int create_ppc_opcodes (CPUPPCState *env, const ppc_def_t *def) static void dump_ppc_insns (CPUPPCState *env) { opc_handler_t **table, *handler; - const unsigned char *p, *q; + const char *p, *q; uint8_t opc1, opc2, opc3; printf("Instructions set:\n"); @@ -9240,7 +9240,7 @@ int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def) init_ppc_proc(env, def); #if defined(PPC_DUMP_CPU) { - const unsigned char *mmu_model, *excp_model, *bus_model; + const char *mmu_model, *excp_model, *bus_model; switch (env->mmu_model) { case POWERPC_MMU_32B: mmu_model = "PowerPC 32"; @@ -9443,10 +9443,10 @@ static const ppc_def_t *ppc_find_by_pvr (uint32_t pvr) #include <ctype.h> -const ppc_def_t *cpu_ppc_find_by_name (const unsigned char *name) +const ppc_def_t *cpu_ppc_find_by_name (const char *name) { const ppc_def_t *ret; - const unsigned char *p; + const char *p; int i, max, len; /* Check if the given name is a PVR */ |