From patchwork Thu Apr 1 21:05:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 49245 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6C098B7C8E for ; Fri, 2 Apr 2010 08:10:43 +1100 (EST) Received: from localhost ([127.0.0.1]:45184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxRbR-0007Zy-N7 for incoming@patchwork.ozlabs.org; Thu, 01 Apr 2010 17:07:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxRa4-0007ZM-1Y for qemu-devel@nongnu.org; Thu, 01 Apr 2010 17:05:36 -0400 Received: from [140.186.70.92] (port=50996 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxRa0-0007YV-1z for qemu-devel@nongnu.org; Thu, 01 Apr 2010 17:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxRZy-00008M-1h for qemu-devel@nongnu.org; Thu, 01 Apr 2010 17:05:31 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:57462) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxRZx-000080-IY for qemu-devel@nongnu.org; Thu, 01 Apr 2010 17:05:30 -0400 Received: from flocke.weilnetz.de (p54ADFAC7.dip.t-dialin.net [84.173.250.199]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M0bmA-1Nhh730PYk-00uCHL; Thu, 01 Apr 2010 23:05:27 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NxRZu-0005U2-8F; Thu, 01 Apr 2010 23:05:26 +0200 From: Stefan Weil To: QEMU Developers Date: Thu, 1 Apr 2010 23:05:14 +0200 Message-Id: <1270155914-21047-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1269890225-13639-10-git-send-email-weil@mail.berlios.de> References: <1269890225-13639-10-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX18C3PwNdgIp54LNdtCtQxxpZW5q8AVvUIEvv9M 36yicARBic1EGZbaeYjNYpGr2joFiy/tb8PJbKgT2vLrIXW/gG Z3tqSdHpZLw6IYJDem73c1JwzWCpEe9B9bGkWQsjNo69HrEST8 fuQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] target-mips: Fix format specifiers for fpu_fprintf 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 In the previous patch which introduced fprintf_function to allow parameter checking by gcc some compiler warnings remained unfixed. These warnings are fixed here. Signed-off-by: Stefan Weil --- target-mips/translate.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/target-mips/translate.c b/target-mips/translate.c index 02367e4..61f8d72 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -9563,20 +9563,26 @@ static void fpu_dump_state(CPUState *env, FILE *f, int i; int is_fpu64 = !!(env->hflags & MIPS_HFLAG_F64); -#define printfpr(fp) \ - do { \ - if (is_fpu64) \ - fpu_fprintf(f, "w:%08x d:%016lx fd:%13g fs:%13g psu: %13g\n", \ - (fp)->w[FP_ENDIAN_IDX], (fp)->d, (fp)->fd, \ - (fp)->fs[FP_ENDIAN_IDX], (fp)->fs[!FP_ENDIAN_IDX]); \ - else { \ - fpr_t tmp; \ - tmp.w[FP_ENDIAN_IDX] = (fp)->w[FP_ENDIAN_IDX]; \ - tmp.w[!FP_ENDIAN_IDX] = ((fp) + 1)->w[FP_ENDIAN_IDX]; \ - fpu_fprintf(f, "w:%08x d:%016lx fd:%13g fs:%13g psu:%13g\n", \ - tmp.w[FP_ENDIAN_IDX], tmp.d, tmp.fd, \ - tmp.fs[FP_ENDIAN_IDX], tmp.fs[!FP_ENDIAN_IDX]); \ - } \ +#define printfpr(fp) \ + do { \ + if (is_fpu64) \ + fpu_fprintf(f, "w:%08x d:%016" PRIx64 \ + " fd:%13g fs:%13g psu: %13g\n", \ + (fp)->w[FP_ENDIAN_IDX], (fp)->d, \ + (double)(fp)->fd, \ + (double)(fp)->fs[FP_ENDIAN_IDX], \ + (double)(fp)->fs[!FP_ENDIAN_IDX]); \ + else { \ + fpr_t tmp; \ + tmp.w[FP_ENDIAN_IDX] = (fp)->w[FP_ENDIAN_IDX]; \ + tmp.w[!FP_ENDIAN_IDX] = ((fp) + 1)->w[FP_ENDIAN_IDX]; \ + fpu_fprintf(f, "w:%08x d:%016" PRIx64 \ + " fd:%13g fs:%13g psu:%13g\n", \ + tmp.w[FP_ENDIAN_IDX], tmp.d, \ + (double)tmp.fd, \ + (double)tmp.fs[FP_ENDIAN_IDX], \ + (double)tmp.fs[!FP_ENDIAN_IDX]); \ + } \ } while(0)