Re: [Qemu-devel] [PATCH 7/8] tcg: Add tcg interpreter to configure / make

[Stefan Weil]

Am 18.09.2011 11:37, schrieb Blue Swirl:
> On Sat, Sep 17, 2011 at 8:00 PM, Stefan Weil <address@hidden> wrote:
> > Signed-off-by: Stefan Weil <address@hidden>
> > ---
> >  Makefile.target |    1 +
> >  configure       |   30 ++++++++++++++++++++++++++++--
> >  2 files changed, 29 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile.target b/Makefile.target
> > index 88d2f1f..a2c3a4a 100644
> > --- a/Makefile.target
> > +++ b/Makefile.target
> > @@ -69,6 +69,7 @@ all: $(PROGS) stap
> >  # cpu emulator library
> >  libobj-y = exec.o translate-all.o cpu-exec.o translate.o
> >  libobj-y += tcg/tcg.o tcg/optimize.o
> > +libobj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o
> >  libobj-y += fpu/softfloat.o
> >  libobj-y += op_helper.o helper.o
> >  ifeq ($(TARGET_BASE_ARCH), i386)
> > diff --git a/configure b/configure
[snip]
> > @@ -2761,6 +2768,15 @@ case "$cpu" in
> >   armv4b|armv4l)
> >     ARCH=arm
> >   ;;
> > +  *)
> > +    if test "$tcg_interpreter" = "yes" ; then
> > +        echo "Unsupported CPU = $cpu, will use TCG with TCI 
> > (experimental)"
> > +        ARCH=unknown
>
> ARCH=TCI or 'all' would be more accurate.

Ok, I'll change it to ARCH=all (or 'any' or 'tci', if that is preferred).

> > +if test "$tcg_interpreter" = "yes"; then
>
> Here the test should be against ARCH for consistency.

That would not work:

There are 3 supported setups: no tcg interpreter, tcg interpreter
with known ARCH and tcg interpreter with unknown ARCH.

For the include path, I must test $tcg_interpreter.
For the linker script, I test $ARCH (see below).

> > +  includes="-I\$(SRC_PATH)/tcg/bytecode $includes"
> > +elif test "$ARCH" = "sparc64" ; then
> >    includes="-I\$(SRC_PATH)/tcg/sparc $includes"
> >   elif test "$ARCH" = "s390x" ; then
> >    includes="-I\$(SRC_PATH)/tcg/s390 $includes"
> > @@ -3577,7 +3598,12 @@ if test "$gprof" = "yes" ; then
> >    fi
> >   fi
> >
> > -linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld"
> > +if test "$ARCH" = "unknown"; then
> > +  linker_script=""
> > +else
> > +  linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld"
> > +fi
> > +