From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVGp2-00058s-AD for qemu-devel@nongnu.org; Fri, 28 Aug 2015 06:23:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVGoy-0006mE-CL for qemu-devel@nongnu.org; Fri, 28 Aug 2015 06:23:48 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:4809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVGoy-0006m3-62 for qemu-devel@nongnu.org; Fri, 28 Aug 2015 06:23:44 -0400 From: Laurent Vivier Date: Fri, 28 Aug 2015 12:23:41 +0200 Message-Id: <1440757421-9674-1-git-send-email-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH v2] s390: fix softmmu compilation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: cornelia.huck@de.ibm.com, agraf@suse.de, rth@twiddle.net, peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, Laurent Vivier guest_base must be used only in linux-user mode. Signed-off-by: Laurent Vivier --- v2: minor cleanup, drop TCG_GUEST_BASE_REG if CONFIG_SOFTMMU tcg/s390/tcg-target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index ee2e58d..fbf97bb 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -53,8 +53,6 @@ #ifndef CONFIG_SOFTMMU #define TCG_GUEST_BASE_REG TCG_REG_R13 -#else -#define TCG_GUEST_BASE_REG TCG_REG_R0 #endif /* All of the following instructions are prefixed with their instruction @@ -2344,10 +2342,12 @@ static void tcg_target_qemu_prologue(TCGContext *s) TCG_STATIC_CALL_ARGS_SIZE + TCG_TARGET_CALL_STACK_OFFSET, CPU_TEMP_BUF_NLONGS * sizeof(long)); +#ifndef CONFIG_SOFTMMU if (guest_base >= 0x80000) { tcg_out_movi(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, guest_base); tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG); } +#endif tcg_out_mov(s, TCG_TYPE_PTR, TCG_AREG0, tcg_target_call_iarg_regs[0]); /* br %r3 (go to TB) */ -- 2.4.3