diff options
Diffstat (limited to 'target-mips')
| -rw-r--r-- | target-mips/cpu.h | 3 | ||||
| -rw-r--r-- | target-mips/translate.c | 12 | ||||
| -rw-r--r-- | target-mips/translate_init.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/target-mips/cpu.h b/target-mips/cpu.h index 19511d7f02..c1f211fc17 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -8,6 +8,7 @@ #define CPUState struct CPUMIPSState #include "config.h" +#include "qemu-common.h" #include "mips-defs.h" #include "cpu-defs.h" #include "softfloat.h" @@ -496,7 +497,7 @@ void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec, int unused, int size); #endif -void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); +void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf); #define cpu_init cpu_mips_init #define cpu_exec cpu_mips_exec diff --git a/target-mips/translate.c b/target-mips/translate.c index d62c6158fc..ba45eb0e52 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -12450,8 +12450,7 @@ void gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb) gen_intermediate_code_internal(env, tb, 1); } -static void fpu_dump_state(CPUState *env, FILE *f, - int (*fpu_fprintf)(FILE *f, const char *fmt, ...), +static void fpu_dump_state(CPUState *env, FILE *f, fprintf_function fpu_fprintf, int flags) { int i; @@ -12480,8 +12479,8 @@ static void fpu_dump_state(CPUState *env, FILE *f, } while(0) - fpu_fprintf(f, "CP1 FCR0 0x%08x FCR31 0x%08x SR.FR %d fp_status 0x%08x(0x%02x)\n", - env->active_fpu.fcr0, env->active_fpu.fcr31, is_fpu64, env->active_fpu.fp_status, + fpu_fprintf(f, "CP1 FCR0 0x%08x FCR31 0x%08x SR.FR %d fp_status 0x%02x\n", + env->active_fpu.fcr0, env->active_fpu.fcr31, is_fpu64, get_float_exception_flags(&env->active_fpu.fp_status)); for (i = 0; i < 32; (is_fpu64) ? i++ : (i += 2)) { fpu_fprintf(f, "%3s: ", fregnames[i]); @@ -12499,7 +12498,7 @@ static void fpu_dump_state(CPUState *env, FILE *f, static void cpu_mips_check_sign_extensions (CPUState *env, FILE *f, - int (*cpu_fprintf)(FILE *f, const char *fmt, ...), + fprintf_function cpu_fprintf, int flags) { int i; @@ -12525,8 +12524,7 @@ cpu_mips_check_sign_extensions (CPUState *env, FILE *f, } #endif -void cpu_dump_state (CPUState *env, FILE *f, - int (*cpu_fprintf)(FILE *f, const char *fmt, ...), +void cpu_dump_state (CPUState *env, FILE *f, fprintf_function cpu_fprintf, int flags) { int i; diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c index 8d1ece704d..590e092a1d 100644 --- a/target-mips/translate_init.c +++ b/target-mips/translate_init.c @@ -500,7 +500,7 @@ static const mips_def_t *cpu_mips_find_by_name (const char *name) return NULL; } -void mips_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)) +void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf) { int i; |