{"id":1019101,"url":"http://patchwork.ozlabs.org/api/patches/1019101/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1545989148-13582-12-git-send-email-aleksandar.markovic@rt-rk.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1545989148-13582-12-git-send-email-aleksandar.markovic@rt-rk.com>","list_archive_url":null,"date":"2018-12-28T09:25:18","name":"[PULL,11/41] disas: nanoMIPS: Fix types and format strings","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"31541485328082f3a6e99db5d82fb68c6f357500","submitter":{"id":68635,"url":"http://patchwork.ozlabs.org/api/people/68635/?format=json","name":"Aleksandar Markovic","email":"aleksandar.markovic@rt-rk.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1545989148-13582-12-git-send-email-aleksandar.markovic@rt-rk.com/mbox/","series":[{"id":83742,"url":"http://patchwork.ozlabs.org/api/series/83742/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=83742","date":"2018-12-28T09:25:09","name":"[PULL,01/41] MAINTAINERS: target/mips: Add MIPS files under default-configs directory","version":1,"mbox":"http://patchwork.ozlabs.org/series/83742/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1019101/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1019101/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=rt-rk.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 43R1ZQ5wjJz9s2P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 28 Dec 2018 20:27:26 +1100 (AEDT)","from localhost ([127.0.0.1]:57728 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1gcoQO-0001D1-Gx\n\tfor incoming@patchwork.ozlabs.org; Fri, 28 Dec 2018 04:27:24 -0500","from eggs.gnu.org ([208.118.235.92]:47741)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1gcoP3-0000Vw-1l\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:02 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1gcoP1-00035o-4O\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:26:00 -0500","from mx2.rt-rk.com ([89.216.37.149]:49209 helo=mail.rt-rk.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <aleksandar.markovic@rt-rk.com>)\n\tid 1gcoP0-00034c-SD\n\tfor qemu-devel@nongnu.org; Fri, 28 Dec 2018 04:25:59 -0500","from localhost (localhost [127.0.0.1])\n\tby mail.rt-rk.com (Postfix) with ESMTP id 1EE051A2140;\n\tFri, 28 Dec 2018 10:25:55 +0100 (CET)","from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local\n\t[10.10.13.43])\n\tby mail.rt-rk.com (Postfix) with ESMTPSA id DA5161A1E0A;\n\tFri, 28 Dec 2018 10:25:54 +0100 (CET)"],"X-Virus-Scanned":"amavisd-new at rt-rk.com","From":"Aleksandar Markovic <aleksandar.markovic@rt-rk.com>","To":"qemu-devel@nongnu.org","Date":"Fri, 28 Dec 2018 10:25:18 +0100","Message-Id":"<1545989148-13582-12-git-send-email-aleksandar.markovic@rt-rk.com>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1545989148-13582-1-git-send-email-aleksandar.markovic@rt-rk.com>","References":"<1545989148-13582-1-git-send-email-aleksandar.markovic@rt-rk.com>","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [fuzzy]","X-Received-From":"89.216.37.149","Subject":"[Qemu-devel] [PULL 11/41] disas: nanoMIPS: Fix types and format\n\tstrings","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"peter.maydell@linaro.org, amarkovic@wavecomp.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: Stefan Weil <sw@weilnetz.de>\n\nUse POSIX types and format strings.\n\nReviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>\nSigned-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>\nSigned-off-by: Stefan Weil <sw@weilnetz.de>\n---\n disas/nanomips.cpp | 20 ++++++++++++--------\n disas/nanomips.h   | 10 +++++-----\n 2 files changed, 17 insertions(+), 13 deletions(-)","diff":"diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp\nindex 1238c2f..28d78d6 100644\n--- a/disas/nanomips.cpp\n+++ b/disas/nanomips.cpp\n@@ -258,7 +258,7 @@ namespace img\n std::string to_string(img::address a)\n {\n     char buffer[256];\n-    sprintf(buffer, \"0x%08llx\", a);\n+    sprintf(buffer, \"0x%\" PRIx64, a);\n     return buffer;\n }\n \n@@ -284,7 +284,8 @@ uint64 NMD::renumber_registers(uint64 index, uint64 *register_list,\n     }\n \n     throw std::runtime_error(img::format(\n-                   \"Invalid register mapping index %d, size of list = %d\",\n+                   \"Invalid register mapping index %\" PRIu64\n+                   \", size of list = %zu\",\n                    index, register_list_size));\n }\n \n@@ -501,7 +502,8 @@ std::string NMD::GPR(uint64 reg)\n         return gpr_reg[reg];\n     }\n \n-    throw std::runtime_error(img::format(\"Invalid GPR register index %d\", reg));\n+    throw std::runtime_error(img::format(\"Invalid GPR register index %\" PRIu64,\n+                                         reg));\n }\n \n \n@@ -518,7 +520,8 @@ std::string NMD::FPR(uint64 reg)\n         return fpr_reg[reg];\n     }\n \n-    throw std::runtime_error(img::format(\"Invalid FPR register index %d\", reg));\n+    throw std::runtime_error(img::format(\"Invalid FPR register index %\" PRIu64,\n+                                         reg));\n }\n \n \n@@ -532,26 +535,27 @@ std::string NMD::AC(uint64 reg)\n         return ac_reg[reg];\n     }\n \n-    throw std::runtime_error(img::format(\"Invalid AC register index %d\", reg));\n+    throw std::runtime_error(img::format(\"Invalid AC register index %\" PRIu64,\n+                                         reg));\n }\n \n \n std::string NMD::IMMEDIATE(uint64 value)\n {\n-    return img::format(\"0x%x\", value);\n+    return img::format(\"0x%\" PRIx64, value);\n }\n \n \n std::string NMD::IMMEDIATE(int64 value)\n {\n-    return img::format(\"%d\", value);\n+    return img::format(\"%\" PRId64, value);\n }\n \n \n std::string NMD::CPR(uint64 reg)\n {\n     /* needs more work */\n-    return img::format(\"CP%d\", reg);\n+    return img::format(\"CP%\" PRIu64, reg);\n }\n \n \ndiff --git a/disas/nanomips.h b/disas/nanomips.h\nindex 84cc9a6..71428b3 100644\n--- a/disas/nanomips.h\n+++ b/disas/nanomips.h\n@@ -24,14 +24,14 @@\n \n #include <string>\n \n-typedef unsigned short uint16;\n-typedef unsigned int uint32;\n-typedef long long int64;\n-typedef unsigned long long uint64;\n+typedef int64_t int64;\n+typedef uint64_t uint64;\n+typedef uint32_t uint32;\n+typedef uint16_t uint16;\n \n namespace img\n {\n-    typedef unsigned long long address;\n+    typedef uint64_t address;\n }\n \n \n","prefixes":["PULL","11/41"]}