From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwKVb-0006SP-BC for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:23 -0400 Received: from [140.186.70.92] (port=33808 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwKVZ-0006SH-0w for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NwKVX-0008Bb-C7 for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:20 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:63036) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NwKVX-0008BX-1H for qemu-devel@nongnu.org; Mon, 29 Mar 2010 15:20:19 -0400 From: Stefan Weil Date: Mon, 29 Mar 2010 21:17:01 +0200 Message-Id: <1269890225-13639-11-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 10/14] target-ppc: 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 * The register dump was wrong for XER register. * cpu_ppc_load_tbl returns uint64_t, so use PRIx64. * Print space before DECR, but not at end of line. Signed-off-by: Stefan Weil --- target-ppc/cpu.h | 2 +- target-ppc/translate.c | 12 ++++++------ target-ppc/translate_init.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 2ad4486..23e6a3c 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -757,7 +757,7 @@ void ppc_store_sr (CPUPPCState *env, int srnum, target_ulong value); #endif /* !defined(CONFIG_USER_ONLY) */ void ppc_store_msr (CPUPPCState *env, target_ulong value); -void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); +void ppc_cpu_list (FILE *f, fprintf_function cpu_fprintf); const ppc_def_t *cpu_ppc_find_by_name (const char *name); int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def); diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 0af7e4f..63ffd60 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -8831,7 +8831,7 @@ GEN_SPEOP_LDST(evstwwo, 0x1E, 2), /*****************************************************************************/ /* Misc PowerPC helpers */ void cpu_dump_state (CPUState *env, FILE *f, - int (*cpu_fprintf)(FILE *f, const char *fmt, ...), + fprintf_function cpu_fprintf, int flags) { #define RGPL 4 @@ -8840,15 +8840,15 @@ void cpu_dump_state (CPUState *env, FILE *f, int i; cpu_fprintf(f, "NIP " TARGET_FMT_lx " LR " TARGET_FMT_lx " CTR " - TARGET_FMT_lx " XER %08x\n", env->nip, env->lr, env->ctr, - env->xer); + TARGET_FMT_lx " XER " TARGET_FMT_lx "\n", + env->nip, env->lr, env->ctr, env->xer); cpu_fprintf(f, "MSR " TARGET_FMT_lx " HID0 " TARGET_FMT_lx " HF " TARGET_FMT_lx " idx %d\n", env->msr, env->spr[SPR_HID0], env->hflags, env->mmu_idx); #if !defined(NO_TIMER_DUMP) - cpu_fprintf(f, "TB %08x %08x " + cpu_fprintf(f, "TB %08x %08" PRIx64 #if !defined(CONFIG_USER_ONLY) - "DECR %08x" + " DECR %08x" #endif "\n", cpu_ppc_load_tbu(env), cpu_ppc_load_tbl(env) @@ -8899,7 +8899,7 @@ void cpu_dump_state (CPUState *env, FILE *f, } void cpu_dump_statistics (CPUState *env, FILE*f, - int (*cpu_fprintf)(FILE *f, const char *fmt, ...), + fprintf_function cpu_fprintf, int flags) { #if defined(DO_PPC_STATISTICS) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index e8eadf4..413a343 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9754,7 +9754,7 @@ const ppc_def_t *cpu_ppc_find_by_name (const char *name) return ret; } -void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)) +void ppc_cpu_list (FILE *f, fprintf_function cpu_fprintf) { int i, max; -- 1.7.0