From 69784eaec335d09619639db4da6c1e4770290526 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 16 Mar 2012 23:50:54 +0100 Subject: w64: Fix data type of next_tb and tcg_qemu_tb_exec next_tb is the numeric value of a tcg target (= QEMU host) address. Using tcg_target_ulong instead of unsigned long shows this and makes the code portable for hosts with an unusual size of long (w64). The type cast '(long)(next_tb & ~3)' was not needed (casting unsigned long to long does not change the bits, and nor does casting long to pointer for most (= all non w64) hosts. It is removed here. Macro or function tcg_qemu_tb_exec is used to set next_tb. The function also returns next_tb. Therefore tcg_qemu_tb_exec must return a tcg_target_ulong. Signed-off-by: Stefan Weil 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 fb9ebef107..70e7bfb759 100644 --- a/tci.c +++ b/tci.c @@ -429,9 +429,9 @@ static bool tci_compare64(uint64_t u0, uint64_t u1, TCGCond condition) } /* Interpret pseudo code in tb. */ -unsigned long tcg_qemu_tb_exec(CPUArchState *cpustate, uint8_t *tb_ptr) +tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *cpustate, uint8_t *tb_ptr) { - unsigned long next_tb = 0; + tcg_target_ulong next_tb = 0; env = cpustate; tci_reg[TCG_AREG0] = (tcg_target_ulong)env; -- cgit v1.2.1