From patchwork Mon Mar 29 19:17:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 48897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id BF28BB7CD5 for ; Tue, 30 Mar 2010 06:45:36 +1100 (EST) Received: from localhost ([127.0.0.1]:42111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwKoD-0004O5-L7 for incoming@patchwork.ozlabs.org; Mon, 29 Mar 2010 15:39:37 -0400 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 Received: from flocke.weilnetz.de (p54ADF80E.dip.t-dialin.net [84.173.248.14]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0M7o3Q-1Na6kr34r2-00vFYT; Mon, 29 Mar 2010 21:20:17 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NwKVK-0003aG-W0; Mon, 29 Mar 2010 21:20:07 +0200 From: Stefan Weil To: QEMU Developers Date: Mon, 29 Mar 2010 21:17:01 +0200 Message-Id: <1269890225-13639-11-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1269890225-13639-1-git-send-email-weil@mail.berlios.de> References: <1269890225-13639-1-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX18xoiaeS8joIz0QnZ5vGrRfndIT/jV8FtNxL6x l4LOY77HYN4M98itQJmPULYaUyfgedGrfmsK6xdRiNgSejg48v piPMqpgbRosZRzU5n0AdE91Y7TA3KsQu+gIHKPV3jV+uZmDJh+ y7g== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 10/14] target-ppc: Use fprintf_function and fix wrong format specifiers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org * 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;