From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RO8Io-0007Bq-DH for qemu-devel@nongnu.org; Wed, 09 Nov 2011 08:34:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RO8Ij-0007ma-Ud for qemu-devel@nongnu.org; Wed, 09 Nov 2011 08:34:54 -0500 Received: from cantor2.suse.de ([195.135.220.15]:50976 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RO8Ij-0007mT-LY for qemu-devel@nongnu.org; Wed, 09 Nov 2011 08:34:49 -0500 Message-ID: <4EBA8171.50505@suse.de> Date: Wed, 09 Nov 2011 14:34:41 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1320843872-2402-1-git-send-email-benoit.canet@gmail.com> <1320843872-2402-2-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1320843872-2402-2-git-send-email-benoit.canet@gmail.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] arm-linux-user: fix elfload.c's AT_HWCAP reflected cpu features. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-15?Q?Beno=EEt_Canet?= Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org Am 09.11.2011 14:04, schrieb Beno=EEt Canet: > The cpu capabilities passed by the elf loader in AT_HWCAP where > a constant. > Make AT_HWCAP reflect the emulated cpu features in order to give > correct clues to eglibc. >=20 > Fix : [Bug 887516] [NEW] VFP support reported for the PXA270 >=20 > Signed-off-by: Benoit Canet > --- > linux-user/elfload.c | 31 +++++++++++++++++++++++++++---- > 1 files changed, 27 insertions(+), 4 deletions(-) >=20 > diff --git a/linux-user/elfload.c b/linux-user/elfload.c > index a413976..5d81ec1 100644 > --- a/linux-user/elfload.c > +++ b/linux-user/elfload.c > @@ -375,10 +375,33 @@ bool guest_validate_base(unsigned long guest_base= ) > return 1; /* All good */ > } > =20 > -#define ELF_HWCAP (ARM_HWCAP_ARM_SWP | ARM_HWCAP_ARM_HALF = \ > - | ARM_HWCAP_ARM_THUMB | ARM_HWCAP_ARM_FAST_MULT = \ > - | ARM_HWCAP_ARM_FPA | ARM_HWCAP_ARM_VFP = \ > - | ARM_HWCAP_ARM_NEON | ARM_HWCAP_ARM_VFPv3 ) > + > +#define ELF_HWCAP get_elf_hwcap() I assume ELF_HWCAP is being used in architecture-independent code? Or would it be feasible to replace all occurrences with the function call? > + > +static uint32_t get_elf_hwcap(void) > +{ > + CPUState *e =3D thread_env; > + uint32_t hwcaps =3D 0; > + > + hwcaps |=3D ARM_HWCAP_ARM_SWP; > + hwcaps |=3D ARM_HWCAP_ARM_HALF; > + hwcaps |=3D ARM_HWCAP_ARM_THUMB; > + hwcaps |=3D ARM_HWCAP_ARM_FAST_MULT; > + hwcaps |=3D ARM_HWCAP_ARM_FPA; > + > + /* prove for the extra features */ probe? > +#define GET_FEATURE(feat, hwcap) \ > + do {if (arm_feature(e, feat)) { hwcaps |=3D hwcap; } } while (0) This doesn't return anything, it sets the hwcap flag. SET_HWCAP maybe? > + GET_FEATURE(ARM_FEATURE_VFP, ARM_HWCAP_ARM_VFP); > + GET_FEATURE(ARM_FEATURE_IWMMXT, ARM_HWCAP_ARM_IWMMXT); > + GET_FEATURE(ARM_FEATURE_THUMB2EE, ARM_HWCAP_ARM_THUMBEE); > + GET_FEATURE(ARM_FEATURE_NEON, ARM_HWCAP_ARM_NEON); > + GET_FEATURE(ARM_FEATURE_VFP3, ARM_HWCAP_ARM_VFPv3); > + GET_FEATURE(ARM_FEATURE_VFP_FP16, ARM_HWCAP_ARM_VFPv3D16); I'm wondering if this translation table were better placed in target-arm/helper.c where we fiddle with the features in the first place. We could loop through all features here and call a function that returns the hwcap or 0 and |=3D it. Me and others will be adding new features and we'll risk adapting this here. I was told that VFP_FP16 is *not* VFPv3-D16. Please remove that for now. > +#undef GET_FEATURE > + > + return hwcaps; > +} > =20 > #endif > =20 Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg