From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwKVR-0006Qs-Hs for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:13 -0400 Received: from [140.186.70.92] (port=33784 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwKVQ-0006Qk-8b for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NwKVN-0008Ap-75 for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:12 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:57762) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NwKVM-0008Ai-RE for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:09 -0400 From: Stefan Weil Date: Mon, 29 Mar 2010 21:17:00 +0200 Message-Id: <1269890225-13639-10-git-send-email-weil@mail.berlios.de> In-Reply-To: <1269890225-13639-1-git-send-email-weil@mail.berlios.de> References: <1269890225-13639-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH 09/14] target-mips: Use fprintf_function and fix wrong format specifiers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Removed unused declaration of fpu_dump_state. These compiler warnings still have to be fixed: cc1: warnings being treated as errors /x/target-mips/translate.c: In function 'fpu_dump_state': /x/target-mips/translate.c:9585: error: format '%08x' expects type 'unsigned int', but argument 6 has type 'float_status' /x/target-mips/translate.c:9588: error: format '%13g' expects type 'double', but argument 5 has type 'float64' /x/target-mips/translate.c:9588: error: format '%13g' expects type 'double', but argument 6 has type 'float32' /x/target-mips/translate.c:9588: error: format '%13g' expects type 'double', but argument 7 has type 'float32' /x/target-mips/translate.c:9588: error: format '%13g' expects type 'double', but argument 5 has type 'float64' /x/target-mips/translate.c:9588: error: format '%13g' expects type 'double', but argument 6 has type 'float32' /x/target-mips/translate.c:9588: error: format '%13g' expects type 'double', but argument 7 has type 'float32' Signed-off-by: Stefan Weil --- target-mips/cpu.h | 2 +- target-mips/exec.h | 3 --- target-mips/translate.c | 6 +++--- target-mips/translate_init.c | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target-mips/cpu.h b/target-mips/cpu.h index 7285636..d2d038a 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -495,7 +495,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/exec.h b/target-mips/exec.h index 01e9c4d..abd37fd 100644 --- a/target-mips/exec.h +++ b/target-mips/exec.h @@ -18,9 +18,6 @@ register struct CPUMIPSState *env asm(AREG0); #endif /* !defined(CONFIG_USER_ONLY) */ void dump_fpu(CPUState *env); -void fpu_dump_state(CPUState *env, FILE *f, - int (*fpu_fprintf)(FILE *f, const char *fmt, ...), - int flags); void cpu_mips_clock_init (CPUState *env); void cpu_mips_tlb_flush (CPUState *env, int flush_global); diff --git a/target-mips/translate.c b/target-mips/translate.c index 0ade3bd..c0a4b87 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -9557,7 +9557,7 @@ void gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb) } static void fpu_dump_state(CPUState *env, FILE *f, - int (*fpu_fprintf)(FILE *f, const char *fmt, ...), + fprintf_function fpu_fprintf, int flags) { int i; @@ -9599,7 +9599,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; @@ -9626,7 +9626,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, ...), + fprintf_function cpu_fprintf, int flags) { int i; diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c index b79ed56..11385ba 100644 --- a/target-mips/translate_init.c +++ b/target-mips/translate_init.c @@ -469,7 +469,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; -- 1.7.0