yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 13:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

exec-all: introduce TB_PAGE_ADDR_FMT

Browse source 
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...) *$)$

Backports commit 67a5b5d2f6eb6d3b980570223ba5c478487ddb6f from qemu
This commit is contained in:
Emilio G. Cota 2018-03-05 02:49:41 -05:00 committed by Lioncash
parent 79f53cf97b
commit 5fc83f3eb2
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/include/exec/exec-all.h
View file

@ -31,8 +31,10 @@
type. */ type. */
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
typedef abi_ulong tb_page_addr_t; typedef abi_ulong tb_page_addr_t;
#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx
#else #else
typedef ram_addr_t tb_page_addr_t; typedef ram_addr_t tb_page_addr_t;
#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT
#endif #endif
#include "qemu/log.h" #include "qemu/log.h"

3
qemu/translate-all.c
View file

@ -1250,8 +1250,7 @@ static inline void tb_alloc_page(struct uc_struct *uc, TranslationBlock *tb,
mprotect(g2h(page_addr), uc->qemu_host_page_size, mprotect(g2h(page_addr), uc->qemu_host_page_size,
(prot & PAGE_BITS) & ~PAGE_WRITE); (prot & PAGE_BITS) & ~PAGE_WRITE);
#ifdef DEBUG_TB_INVALIDATE #ifdef DEBUG_TB_INVALIDATE
printf("protecting code page: 0x" TARGET_FMT_lx "\n", printf("protecting code page: 0x" TB_PAGE_ADDR_FMT "\n", page_addr);
page_addr);
#endif #endif
} }
#else #else