ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2050396801
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>
This commit is contained in:
Stefan Weil 2012-04-17 19:22:39 +02:00 committed by Blue Swirl
parent a896d03bb5
commit c3ca04679e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exec-all.h
View File

@ -283,7 +283,7 @@ extern int tb_invalidated_flag;
/* Alpha and SH4 user mode emulations and Softmmu call GETPC(). /* Alpha and SH4 user mode emulations and Softmmu call GETPC().
For all others, GETPC remains undefined (which makes TCI a little faster. */ For all others, GETPC remains undefined (which makes TCI a little faster. */
# if defined(CONFIG_SOFTMMU) || defined(TARGET_ALPHA) || defined(TARGET_SH4) # 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 # define GETPC() tci_tb_ptr
# endif # endif
#elif defined(__s390__) && !defined(__s390x__) #elif defined(__s390__) && !defined(__s390x__)

4
tci.c
View File

@ -58,7 +58,7 @@ CPUArchState *env;
/* Targets which don't use GETPC also don't need tci_tb_ptr /* Targets which don't use GETPC also don't need tci_tb_ptr
which makes them a little faster. */ which makes them a little faster. */
#if defined(GETPC) #if defined(GETPC)
void *tci_tb_ptr; uintptr_t tci_tb_ptr;
#endif #endif
static tcg_target_ulong tci_reg[TCG_TARGET_NB_REGS]; 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 (;;) { for (;;) {
#if defined(GETPC) #if defined(GETPC)
tci_tb_ptr = tb_ptr; tci_tb_ptr = (uintptr_t)tb_ptr;
#endif #endif
TCGOpcode opc = tb_ptr[0]; TCGOpcode opc = tb_ptr[0];
#if !defined(NDEBUG) #if !defined(NDEBUG)