| Message ID | 1440752945-4514-1-git-send-email-laurent@vivier.eu |
|---|---|
| State | New |
| Headers | show |
On Fri, 28 Aug 2015 11:09:05 +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> > --- > tcg/s390/tcg-target.c | 2 ++ > 1 file changed, 2 insertions(+) > Thanks, that fixed compilation on s390 for me.
On 28 August 2015 at 10:15, Cornelia Huck <cornelia.huck@de.ibm.com> wrote: > On Fri, 28 Aug 2015 11:09:05 +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> >> --- >> tcg/s390/tcg-target.c | 2 ++ >> 1 file changed, 2 insertions(+) >> > > Thanks, that fixed compilation on s390 for me. I'm planning to apply this directly to master as a buildfix. thanks -- PMM
On 28 August 2015 at 11:03, Peter Maydell <peter.maydell@linaro.org> wrote: > On 28 August 2015 at 10:15, Cornelia Huck <cornelia.huck@de.ibm.com> wrote: >> On Fri, 28 Aug 2015 11:09:05 +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> >>> --- >>> tcg/s390/tcg-target.c | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >> >> Thanks, that fixed compilation on s390 for me. > > I'm planning to apply this directly to master as a buildfix. Incidentally, minor cleanup now possible: TCG_GUEST_BASE_REG is now only used inside ifndef CONFIG_SOFTMMU, so you can drop the #define of it to TCG_REG_R0 in the softmmu case. -- PMM
Le 28/08/2015 12:08, Peter Maydell a écrit : > On 28 August 2015 at 11:03, Peter Maydell <peter.maydell@linaro.org> wrote: >> On 28 August 2015 at 10:15, Cornelia Huck <cornelia.huck@de.ibm.com> wrote: >>> On Fri, 28 Aug 2015 11:09:05 +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> >>>> --- >>>> tcg/s390/tcg-target.c | 2 ++ >>>> 1 file changed, 2 insertions(+) >>>> >>> >>> Thanks, that fixed compilation on s390 for me. >> >> I'm planning to apply this directly to master as a buildfix. > > Incidentally, minor cleanup now possible: TCG_GUEST_BASE_REG > is now only used inside ifndef CONFIG_SOFTMMU, so you can drop > the #define of it to TCG_REG_R0 in the softmmu case. You're right I send a v2... Laurent
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index ee2e58d..2122744 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -2344,10 +2344,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> --- tcg/s390/tcg-target.c | 2 ++ 1 file changed, 2 insertions(+)