[PULL,v2,12/20] exec-all: introduce TB_PAGE_ADDR_FMT

Message ID	20171010193003.28857-13-richard.henderson@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 10 Oct 2017 12:29:55 -0700 Message-Id: <20171010193003.28857-13-richard.henderson@linaro.org> In-Reply-To: <20171010193003.28857-1-richard.henderson@linaro.org> References: <20171010193003.28857-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 12/20] exec-all: introduce TB_PAGE_ADDR_FMT Precedence: list Cc: peter.maydell@linaro.org, "Emilio G. Cota" <cota@braap.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	Queued TCG patches \| expand [PULL,v2,00/20] Queued TCG patches [PULL,v2,01/20] cputlb: bring back tlb_flush_count under !TLB_DEBUG [PULL,v2,02/20] tcg: fix corruption of code_time profiling counter upon tb_flush [PULL,v2,03/20] exec-all: fix typos in TranslationBlock's documentation [PULL,v2,04/20] translate-all: make have_tb_lock static [PULL,v2,05/20] cpu-exec: rename have_tb_lock to acquired_tb_lock in tb_find [PULL,v2,06/20] tcg/i386: constify tcg_target_callee_save_regs [PULL,v2,07/20] tcg/mips: constify tcg_target_callee_save_regs [PULL,v2,08/20] tcg: remove addr argument from lookup_tb_ptr [PULL,v2,09/20] tcg: consolidate TB lookups in tb_lookup__cpu_state [PULL,v2,10/20] exec-all: bring tb->invalid into tb->cflags [PULL,v2,11/20] translate-all: define and use DEBUG_TB_FLUSH_GATE [PULL,v2,12/20] exec-all: introduce TB_PAGE_ADDR_FMT [PULL,v2,13/20] translate-all: define and use DEBUG_TB_INVALIDATE_GATE [PULL,v2,14/20] translate-all: define and use DEBUG_TB_CHECK_GATE [PULL,v2,15/20] exec-all: extract tb->tc_* into a separate struct tc_tb [PULL,v2,16/20] tci: move tci_regs to tcg_qemu_tb_exec's stack [PULL,v2,17/20] tcg: take .helpers out of TCGContext [PULL,v2,18/20] util: move qemu_real_host_page_size/mask to osdep.h [PULL,v2,19/20] tcg: define TCG_HIGHWATER [PULL,v2,20/20] tcg/mips: delete commented out extern keyword.

Message ID

20171010193003.28857-13-richard.henderson@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Date: Tue, 10 Oct 2017 12:29:55 -0700
Message-Id: <20171010193003.28857-13-richard.henderson@linaro.org>
In-Reply-To: <20171010193003.28857-1-richard.henderson@linaro.org>
References: <20171010193003.28857-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL v2 12/20] exec-all: introduce TB_PAGE_ADDR_FMT
Precedence: list
Cc: peter.maydell@linaro.org, "Emilio G. Cota" <cota@braap.org>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

Queued TCG patches | expand

Commit Message

Richard Henderson Oct. 10, 2017, 7:29 p.m. UTC

From: "Emilio G. Cota" <cota@braap.org>


And fix the following warning when DEBUG_TB_INVALIDATE is enabled
in translate-all.c:

  CC      mipsn32-linux-user/accel/tcg/translate-all.o
/data/src/qemu/accel/tcg/translate-all.c: In function ‘tb_alloc_page’:
/data/src/qemu/accel/tcg/translate-all.c:1201:16: error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘tb_page_addr_t {aka unsigned int}’ [-Werror=format=]
         printf("protecting code page: 0x" TARGET_FMT_lx "\n",
                ^
cc1: all warnings being treated as errors
/data/src/qemu/rules.mak:66: recipe for target 'accel/tcg/translate-all.o' failed
make[1]: *** [accel/tcg/translate-all.o] Error 1
Makefile:328: recipe for target 'subdir-mipsn32-linux-user' failed
make: *** [subdir-mipsn32-linux-user] Error 2
cota@flamenco:/data/src/qemu/build ((18f3fe1...) *$)$

Reviewed-by: Richard Henderson <rth@twiddle.net>

Signed-off-by: Emilio G. Cota <cota@braap.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 include/exec/exec-all.h   | 2 ++
 accel/tcg/translate-all.c | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
2.13.6

diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 3135aaf4c9..79f8041811 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -31,8 +31,10 @@ 
    type.  */
 #if defined(CONFIG_USER_ONLY)
 typedef abi_ulong tb_page_addr_t;
+#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx
 #else
 typedef ram_addr_t tb_page_addr_t;
+#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT
 #endif
 
 #include "qemu/log.h"
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 799b027e79..90b3eed9c6 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -1193,8 +1193,7 @@  static inline void tb_alloc_page(TranslationBlock *tb,
         mprotect(g2h(page_addr), qemu_host_page_size,
                  (prot & PAGE_BITS) & ~PAGE_WRITE);
 #ifdef DEBUG_TB_INVALIDATE
-        printf("protecting code page: 0x" TARGET_FMT_lx "\n",
-               page_addr);
+        printf("protecting code page: 0x" TB_PAGE_ADDR_FMT "\n", page_addr);
 #endif
     }
 #else

[PULL,v2,12/20] exec-all: introduce TB_PAGE_ADDR_FMT

Commit Message

Patch