| Message ID | 1440757421-9674-1-git-send-email-laurent@vivier.eu |
|---|---|
| State | New |
| Headers | show |
On Fri, 28 Aug 2015 12:23:41 +0200 Laurent Vivier <laurent@vivier.eu> wrote: > guest_base must be used only in linux-user mode. > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- > v2: minor cleanup, drop TCG_GUEST_BASE_REG if CONFIG_SOFTMMU > tcg/s390/tcg-target.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Still builds for me on s390 :)
On 28 August 2015 at 11:23, Laurent Vivier <laurent@vivier.eu> wrote: > guest_base must be used only in linux-user mode. > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- > v2: minor cleanup, drop TCG_GUEST_BASE_REG if CONFIG_SOFTMMU > tcg/s390/tcg-target.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks; applied to master as a buildfix. -- PMM
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) */
guest_base must be used only in linux-user mode. Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- v2: minor cleanup, drop TCG_GUEST_BASE_REG if CONFIG_SOFTMMU tcg/s390/tcg-target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)