Commit 090d0bfd authored by Laurent Vivier's avatar Laurent Vivier Committed by Peter Maydell
Browse files

s390: fix softmmu compilation 



guest_base must be used only in linux-user mode.

Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-id: 1440757421-9674-1-git-send-email-laurent@vivier.eu
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 6c76ec68

tcg/s390/tcg-target.c

+2 −2
Original line number Diff line number Diff line
@@ -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) */