From patchwork Mon Jun 25 15:52:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9607 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 09F9823F2E for ; Mon, 25 Jun 2012 15:52:35 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id CCFBBA18341 for ; Mon, 25 Jun 2012 15:52:34 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so3202623yen.11 for ; Mon, 25 Jun 2012 08:52:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=m0aXsN8Xj+EK11J7woyZAymvJTTPd7Vdnsjik7xIdTs=; b=kJ+AKQ79QPODWSPp6vmhLKmhkKsM0KIxL6eYyfXFRbpUTdzqZxBXjCTkyheH6r1uNX jVhMS99r7wwmOO/gbbh5m3o/fZTeomJ8TWGwOr+C0j3ru45hj7vseDz3cavvaWDcrEcM BSUOBqkSgJXh2x6Qt2v8J5po1lIdU3ttg62vL3XR9DmJwjmDkXWxnaj4amK1ENfir6Rf KmSlEd47unJkOAAbpVLQQz/YO+BZzFBgOQQ3YCqBXMYluYK4MDXNrEhVqMbLmcQw0kc/ z3yZ/RKwBwd9epxNN9p4gG5RW15LX0miSB3UpcUd2BZoTIEHaWE2OsF4wz022S5Ejoix YTkA== Received: by 10.50.160.198 with SMTP id xm6mr8725192igb.0.1340639554281; Mon, 25 Jun 2012 08:52:34 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp51992ibb; Mon, 25 Jun 2012 08:52:32 -0700 (PDT) Received: by 10.43.106.1 with SMTP id ds1mr6059158icc.24.1340639552156; Mon, 25 Jun 2012 08:52:32 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id fi2si15308247icc.104.2012.06.25.08.52.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jun 2012 08:52:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SjBaS-0006uJ-F3; Mon, 25 Jun 2012 16:52:24 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eric Blake Subject: [PATCH v2 4/4] monitor: Use TARGET_PRI*PHYS to avoid TARGET_PHYS_ADDR_BITS ifdef Date: Mon, 25 Jun 2012 16:52:24 +0100 Message-Id: <1340639544-26520-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1340639544-26520-1-git-send-email-peter.maydell@linaro.org> References: <1340639544-26520-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQlH5zDX+4AkjVGVnT8eHOzuEhn7OYf4NWJFBDOIBGxbarAxW3VUgzVEknhFldTmKWDiMor3 Now we have TARGET_PRI*PHYS for printing target_phys_addr_t values, we can use them in monitor.c rather than having duplicate code in two arms of a TARGET_PHYS_ADDR_BITS ifdef. Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber --- monitor.c | 29 ++++------------------------- 1 files changed, 4 insertions(+), 25 deletions(-) diff --git a/monitor.c b/monitor.c index f6107ba..188c03d 100644 --- a/monitor.c +++ b/monitor.c @@ -1262,45 +1262,24 @@ static void do_print(Monitor *mon, const QDict *qdict) int format = qdict_get_int(qdict, "format"); target_phys_addr_t val = qdict_get_int(qdict, "val"); -#if TARGET_PHYS_ADDR_BITS == 32 switch(format) { case 'o': - monitor_printf(mon, "%#o", val); + monitor_printf(mon, "%#" TARGET_PRIoPHYS, val); break; case 'x': - monitor_printf(mon, "%#x", val); + monitor_printf(mon, "%#" TARGET_PRIxPHYS, val); break; case 'u': - monitor_printf(mon, "%u", val); + monitor_printf(mon, "%" TARGET_PRIuPHYS, val); break; default: case 'd': - monitor_printf(mon, "%d", val); + monitor_printf(mon, "%" TARGET_PRIdPHYS, val); break; case 'c': monitor_printc(mon, val); break; } -#else - switch(format) { - case 'o': - monitor_printf(mon, "%#" PRIo64, val); - break; - case 'x': - monitor_printf(mon, "%#" PRIx64, val); - break; - case 'u': - monitor_printf(mon, "%" PRIu64, val); - break; - default: - case 'd': - monitor_printf(mon, "%" PRId64, val); - break; - case 'c': - monitor_printc(mon, val); - break; - } -#endif monitor_printf(mon, "\n"); }