diff options
| author | Stefan Weil <sw@weilnetz.de> | 2012-04-17 19:22:39 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-04-21 13:28:28 +0000 |
| commit | c3ca04679e93a72635d6ef347886dbeba799b2d6 (patch) | |
| tree | f9a4a07f403b350a4c78a97e7fbf46a64b417081 | |
| parent | a896d03bb5f70ed76b3e9e1acba864115cfb5e01 (diff) | |
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 <sw@weilnetz.de>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | exec-all.h | 2 | ||||
| -rw-r--r-- | tci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/exec-all.h b/exec-all.h index 6bcc07538f..937d3cef01 100644 --- a/exec-all.h +++ b/exec-all.h @@ -283,7 +283,7 @@ extern int tb_invalidated_flag; /* Alpha and SH4 user mode emulations and Softmmu call GETPC(). For all others, GETPC remains undefined (which makes TCI a little faster. */ # if defined(CONFIG_SOFTMMU) || defined(TARGET_ALPHA) || defined(TARGET_SH4) -extern void *tci_tb_ptr; +extern uintptr_t tci_tb_ptr; # define GETPC() tci_tb_ptr # endif #elif defined(__s390__) && !defined(__s390x__) @@ -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) |