From c3ca04679e93a72635d6ef347886dbeba799b2d6 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 17 Apr 2012 19:22:39 +0200 Subject: tci: GETPC() macro must return an uintptr_t Change the data type of tci_tb_ptr, so GETPC() returns an uintptr_t now (like for all other TCG targets). This completes commit 2050396801ca0c8359364d61eaadece951006057 and fixes builds with TCI. Signed-off-by: Stefan Weil Reviewed-by: Eric Blake Signed-off-by: Blue Swirl --- tci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tci.c') diff --git a/tci.c b/tci.c index c43fe7d260..71de66d508 100644 --- a/tci.c +++ b/tci.c @@ -58,7 +58,7 @@ CPUArchState *env; /* Targets which don't use GETPC also don't need tci_tb_ptr which makes them a little faster. */ #if defined(GETPC) -void *tci_tb_ptr; +uintptr_t tci_tb_ptr; #endif static tcg_target_ulong tci_reg[TCG_TARGET_NB_REGS]; @@ -450,7 +450,7 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *cpustate, uint8_t *tb_ptr) for (;;) { #if defined(GETPC) - tci_tb_ptr = tb_ptr; + tci_tb_ptr = (uintptr_t)tb_ptr; #endif TCGOpcode opc = tb_ptr[0]; #if !defined(NDEBUG) -- cgit v1.2.3