summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Vivier <laurent@vivier.eu>2015-08-28 12:23:41 +0200
committerPeter Maydell <peter.maydell@linaro.org>2015-08-28 16:05:24 +0100
commit090d0bfd948343d522cd20bc634105b5cfe2483b (patch)
tree40b09380e4790e2c132b32ff1dad31fb86b883d8
parent6c76ec68f68494d4a31b5d82073ed4d2798b8e13 (diff)
downloadhqemu-090d0bfd948343d522cd20bc634105b5cfe2483b.zip
hqemu-090d0bfd948343d522cd20bc634105b5cfe2483b.tar.gz
s390: fix softmmu compilation
guest_base must be used only in linux-user mode. Signed-off-by: Laurent Vivier <laurent@vivier.eu> Message-id: 1440757421-9674-1-git-send-email-laurent@vivier.eu Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--tcg/s390/tcg-target.c4
1 files 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) */
OpenPOWER on IntegriCloud