[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/23] exec-all: introduce TB_PAGE_ADDR_FMT
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 12/23] exec-all: introduce TB_PAGE_ADDR_FMT |
Date: |
Mon, 9 Oct 2017 17:55:49 -0700 |
From: "Emilio G. Cota" <address@hidden>
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
address@hidden:/data/src/qemu/build ((18f3fe1...) *$)$
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/exec-all.h | 2 ++
accel/tcg/translate-all.c | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
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
--
2.13.6
- [Qemu-devel] [PULL 01/23] cputlb: bring back tlb_flush_count under !TLB_DEBUG, (continued)
- [Qemu-devel] [PULL 01/23] cputlb: bring back tlb_flush_count under !TLB_DEBUG, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 03/23] exec-all: fix typos in TranslationBlock's documentation, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 02/23] tcg: fix corruption of code_time profiling counter upon tb_flush, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 04/23] translate-all: make have_tb_lock static, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 05/23] cpu-exec: rename have_tb_lock to acquired_tb_lock in tb_find, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 06/23] tcg/i386: constify tcg_target_callee_save_regs, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 08/23] tcg: remove addr argument from lookup_tb_ptr, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 07/23] tcg/mips: constify tcg_target_callee_save_regs, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 09/23] tcg: consolidate TB lookups in tb_lookup__cpu_state, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 10/23] exec-all: bring tb->invalid into tb->cflags, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 12/23] exec-all: introduce TB_PAGE_ADDR_FMT,
Richard Henderson <=
- [Qemu-devel] [PULL 11/23] translate-all: define and use DEBUG_TB_FLUSH_GATE, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 13/23] translate-all: define and use DEBUG_TB_INVALIDATE_GATE, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 15/23] exec-all: extract tb->tc_* into a separate struct tc_tb, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 17/23] tcg: take .helpers out of TCGContext, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 14/23] translate-all: define and use DEBUG_TB_CHECK_GATE, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 19/23] util: move qemu_real_host_page_size/mask to osdep.h, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 16/23] tci: move tci_regs to tcg_qemu_tb_exec's stack, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 20/23] osdep: introduce qemu_mprotect_rwx/none, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 21/23] translate-all: use qemu_protect_rwx/none helpers, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 18/23] tcg: allocate optimizer temps with tcg_malloc, Richard Henderson, 2017/10/09