From patchwork Sun Jan 27 13:32:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 216007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2AFE92C007E for ; Mon, 28 Jan 2013 02:05:35 +1100 (EST) Received: from localhost ([::1]:46803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzSOP-0002HG-20 for incoming@patchwork.ozlabs.org; Sun, 27 Jan 2013 08:35:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzSMX-0007vl-0s for qemu-devel@nongnu.org; Sun, 27 Jan 2013 08:33:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TzSMM-0003H6-SW for qemu-devel@nongnu.org; Sun, 27 Jan 2013 08:33:32 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48543 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzSMM-0003GH-MZ for qemu-devel@nongnu.org; Sun, 27 Jan 2013 08:33:22 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 716D9A5271; Sun, 27 Jan 2013 14:33:08 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 27 Jan 2013 14:32:17 +0100 Message-Id: <1359293537-8251-20-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359293537-8251-1-git-send-email-afaerber@suse.de> References: <1359293537-8251-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC 19/19] target-unicore32: Refactor debug output macros X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make debug output compile-testable even if disabled. Signed-off-by: Andreas Färber --- target-unicore32/helper.c | 12 ++++++------ target-unicore32/softmmu.c | 12 ++++++------ 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c index 5359538..688c985 100644 --- a/target-unicore32/helper.c +++ b/target-unicore32/helper.c @@ -17,13 +17,13 @@ #include "ui/console.h" #endif -#undef DEBUG_UC32 +#define DEBUG_UC32 0 -#ifdef DEBUG_UC32 -#define DPRINTF(fmt, ...) printf("%s: " fmt , __func__, ## __VA_ARGS__) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif +#define DPRINTF(fmt, ...) G_STMT_START \ + if (DEBUG_UC32) { \ + printf("%s: " fmt , __func__, ## __VA_ARGS__); \ + } \ + G_STMT_END CPUUniCore32State *uc32_cpu_init(const char *cpu_model) { diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c index fc27100..2ce30d9 100644 --- a/target-unicore32/softmmu.c +++ b/target-unicore32/softmmu.c @@ -14,13 +14,13 @@ #include -#undef DEBUG_UC32 +#define DEBUG_UC32 0 -#ifdef DEBUG_UC32 -#define DPRINTF(fmt, ...) printf("%s: " fmt , __func__, ## __VA_ARGS__) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif +#define DPRINTF(fmt, ...) G_STMT_START \ + if (DEBUG_UC32) { \ + printf("%s: " fmt , __func__, ## __VA_ARGS__); \ + } \ + G_STMT_END #define SUPERPAGE_SIZE (1 << 22) #define UC32_PAGETABLE_READ (1 << 8)