From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5DpM-0003bW-8M for qemu-devel@nongnu.org; Sun, 18 Sep 2011 05:38:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5DpK-0001u2-V7 for qemu-devel@nongnu.org; Sun, 18 Sep 2011 05:38:20 -0400 Received: from mail-qy0-f180.google.com ([209.85.216.180]:38851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5DpK-0001tm-Pf for qemu-devel@nongnu.org; Sun, 18 Sep 2011 05:38:18 -0400 Received: by qyc1 with SMTP id 1so5062991qyc.4 for ; Sun, 18 Sep 2011 02:38:18 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1316289634-18786-7-git-send-email-weil@mail.berlios.de> References: <4E74FC29.1050003@mail.berlios.de> <1316289634-18786-7-git-send-email-weil@mail.berlios.de> From: Blue Swirl Date: Sun, 18 Sep 2011 09:37:58 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 7/8] tcg: Add tcg interpreter to configure / make List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: QEMU Developers On Sat, Sep 17, 2011 at 8:00 PM, Stefan Weil wrote: > Signed-off-by: Stefan Weil > --- > =C2=A0Makefile.target | =C2=A0 =C2=A01 + > =C2=A0configure =C2=A0 =C2=A0 =C2=A0 | =C2=A0 30 ++++++++++++++++++++++++= ++++-- > =C2=A02 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 > =C2=A0# cpu emulator library > =C2=A0libobj-y =3D exec.o translate-all.o cpu-exec.o translate.o > =C2=A0libobj-y +=3D tcg/tcg.o tcg/optimize.o > +libobj-$(CONFIG_TCG_INTERPRETER) +=3D tcg/tci.o > =C2=A0libobj-y +=3D fpu/softfloat.o > =C2=A0libobj-y +=3D op_helper.o helper.o > =C2=A0ifeq ($(TARGET_BASE_ARCH), i386) > diff --git a/configure b/configure > index ad924c4..1d800e1 100755 > --- a/configure > +++ b/configure > @@ -138,6 +138,7 @@ debug_tcg=3D"no" > =C2=A0debug_mon=3D"no" > =C2=A0debug=3D"no" > =C2=A0strip_opt=3D"yes" > +tcg_interpreter=3D"no" > =C2=A0bigendian=3D"no" > =C2=A0mingw32=3D"no" > =C2=A0EXESUF=3D"" > @@ -647,6 +648,10 @@ for opt do > =C2=A0 ;; > =C2=A0 --enable-kvm) kvm=3D"yes" > =C2=A0 ;; > + =C2=A0--disable-tcg-interpreter) tcg_interpreter=3D"no" > + =C2=A0;; > + =C2=A0--enable-tcg-interpreter) tcg_interpreter=3D"yes" > + =C2=A0;; > =C2=A0 --disable-spice) spice=3D"no" > =C2=A0 ;; > =C2=A0 --enable-spice) spice=3D"yes" > @@ -997,6 +1002,7 @@ echo " =C2=A0--enable-bluez =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 enable bluez stack connectivity" > =C2=A0echo " =C2=A0--disable-slirp =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0disa= ble SLIRP userspace network connectivity" > =C2=A0echo " =C2=A0--disable-kvm =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0disable KVM acceleration support" > =C2=A0echo " =C2=A0--enable-kvm =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= enable KVM acceleration support" > +echo " =C2=A0--enable-tcg-interpreter enable TCG with bytecode interpret= er (TCI)" > =C2=A0echo " =C2=A0--disable-nptl =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 disa= ble usermode NPTL support" > =C2=A0echo " =C2=A0--enable-nptl =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0enable usermode NPTL support" > =C2=A0echo " =C2=A0--enable-system =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0enab= le all system emulation targets" > @@ -2714,6 +2720,7 @@ echo "Linux AIO support $linux_aio" > =C2=A0echo "ATTR/XATTR support $attr" > =C2=A0echo "Install blobs =C2=A0 =C2=A0 $blobs" > =C2=A0echo "KVM support =C2=A0 =C2=A0 =C2=A0 $kvm" > +echo "TCG interpreter =C2=A0 $tcg_interpreter" > =C2=A0echo "fdt support =C2=A0 =C2=A0 =C2=A0 $fdt" > =C2=A0echo "preadv support =C2=A0 =C2=A0$preadv" > =C2=A0echo "fdatasync =C2=A0 =C2=A0 =C2=A0 =C2=A0 $fdatasync" > @@ -2761,6 +2768,15 @@ case "$cpu" in > =C2=A0 armv4b|armv4l) > =C2=A0 =C2=A0 ARCH=3Darm > =C2=A0 ;; > + =C2=A0*) > + =C2=A0 =C2=A0if test "$tcg_interpreter" =3D "yes" ; then > + =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "Unsupported CPU =3D $cpu, will use TCG= with TCI (experimental)" > + =C2=A0 =C2=A0 =C2=A0 =C2=A0ARCH=3Dunknown ARCH=3DTCI or 'all' would be more accurate. > + =C2=A0 =C2=A0else > + =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "Unsupported CPU =3D $cpu, try --enable= -tcg-interpreter" > + =C2=A0 =C2=A0 =C2=A0 =C2=A0exit 1 > + =C2=A0 =C2=A0fi > + =C2=A0;; > =C2=A0esac > =C2=A0echo "ARCH=3D$ARCH" >> $config_host_mak > =C2=A0if test "$debug_tcg" =3D "yes" ; then > @@ -2994,6 +3010,9 @@ fi > =C2=A0if test "$signalfd" =3D "yes" ; then > =C2=A0 echo "CONFIG_SIGNALFD=3Dy" >> $config_host_mak > =C2=A0fi > +if test "$tcg_interpreter" =3D "yes" ; then > + =C2=A0echo "CONFIG_TCG_INTERPRETER=3Dy" >> $config_host_mak > +fi > =C2=A0if test "$need_offsetof" =3D "yes" ; then > =C2=A0 echo "CONFIG_NEED_OFFSETOF=3Dy" >> $config_host_mak > =C2=A0fi > @@ -3454,7 +3473,9 @@ cflags=3D"" > =C2=A0includes=3D"" > =C2=A0ldflags=3D"" > > -if test "$ARCH" =3D "sparc64" ; then > +if test "$tcg_interpreter" =3D "yes"; then Here the test should be against ARCH for consistency. > + =C2=A0includes=3D"-I\$(SRC_PATH)/tcg/bytecode $includes" > +elif test "$ARCH" =3D "sparc64" ; then > =C2=A0 includes=3D"-I\$(SRC_PATH)/tcg/sparc $includes" > =C2=A0elif test "$ARCH" =3D "s390x" ; then > =C2=A0 includes=3D"-I\$(SRC_PATH)/tcg/s390 $includes" > @@ -3577,7 +3598,12 @@ if test "$gprof" =3D "yes" ; then > =C2=A0 fi > =C2=A0fi > > -linker_script=3D"-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld= " > +if test "$ARCH" =3D "unknown"; then > + =C2=A0linker_script=3D"" > +else > + =C2=A0linker_script=3D"-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(A= RCH).ld" > +fi > + > =C2=A0if test "$target_linux_user" =3D "yes" -o "$target_bsd_user" =3D "y= es" ; then > =C2=A0 case "$ARCH" in > =C2=A0 sparc) > -- > 1.7.2.5 > > >