From patchwork Tue Mar 5 00:33:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 224886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE2542C0336 for ; Tue, 5 Mar 2013 11:46:44 +1100 (EST) Received: from localhost ([::1]:40756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCg1j-0001dv-6q for incoming@patchwork.ozlabs.org; Mon, 04 Mar 2013 19:46:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCfpa-0006iQ-Oy for qemu-devel@nongnu.org; Mon, 04 Mar 2013 19:34:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCfpX-0004H5-Pz for qemu-devel@nongnu.org; Mon, 04 Mar 2013 19:34:10 -0500 Received: from mail-ie0-x230.google.com ([2607:f8b0:4001:c03::230]:59095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCfpX-0004Gz-KM for qemu-devel@nongnu.org; Mon, 04 Mar 2013 19:34:07 -0500 Received: by mail-ie0-f176.google.com with SMTP id k13so6968629iea.21 for ; Mon, 04 Mar 2013 16:34:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=XbSF8Qb06xzBikXN3KHbjmKU+7KFirgfAEF3O2XVYEI=; b=G4IHqVS2YxvqxobrTnj5SgM683MAgiMZiQ3hIwpRQn6yNoG/AKzOM0E3ip+kNxpe4U UbUqssbo4ndECC8OSA2QGk2ht2wfxN6AVbAATzGVGCb1FOWnFVHOymJp6Az1n4jUtNzS lfx1z08hypkSeDMmDD/Tvq1kgLAXpz6Rd2FG4SZeQlw61Cp0bbqSDdSxHA0UhNmu+vJm 1qLuSifcYsRnvaHdo4aigQ7dWLAZx4GKkCrjKX4L3RAyjfiYnm3vxOi15DVZXGt9+zOW 4V2+51T6hhjjWMdgDbNIqXB8F96YnFZ2Qt34ZkGC9MX6V88tHoRx9pZjUB6lm7WngasX tseg== X-Received: by 10.43.65.145 with SMTP id xm17mr25713012icb.35.1362443647269; Mon, 04 Mar 2013 16:34:07 -0800 (PST) Received: from pebble.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id ih1sm12171205igc.3.2013.03.04.16.34.05 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Mar 2013 16:34:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2013 16:33:08 -0800 Message-Id: <1362443590-28191-26-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362443590-28191-1-git-send-email-rth@twiddle.net> References: <1362443590-28191-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::230 Cc: av1474@comtv.ru Subject: [Qemu-devel] [PATCH v2 25/27] tcg-ppc64: Use getauxval for ISA detection X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Glibc 2.16 includes an easy way to get feature bits previously buried in /proc or the program startup auxiliary vector. Use it. Signed-off-by: Richard Henderson --- configure | 18 ++++++++++++++++++ tcg/ppc64/tcg-target.c | 20 +++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 19738ac..c876099 100755 --- a/configure +++ b/configure @@ -3214,6 +3214,20 @@ if compile_prog "" "" ; then int128=yes fi +######################################## +# check if getauxval is available. + +getauxval=no +cat > $TMPC << EOF +#include +int main(void) { + return getauxval(AT_HWCAP) == 0; +} +EOF +if compile_prog "" "" ; then + getauxval=yes +fi + ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -3767,6 +3781,10 @@ if test "$int128" = "yes" ; then echo "CONFIG_INT128=y" >> $config_host_mak fi +if test "$getauxval" = "yes" ; then + echo "CONFIG_GETAUXVAL=y" >> $config_host_mak +fi + if test "$glusterfs" = "yes" ; then echo "CONFIG_GLUSTERFS=y" >> $config_host_mak fi diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index 2acccf6..826726d 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -44,8 +44,16 @@ static uint8_t *tb_ret_addr; #define GUEST_BASE 0 #endif +#ifdef CONFIG_GETAUXVAL +#include +static bool have_isa_2_05; +static bool have_isa_2_06; +#define HAVE_ISA_2_05 have_isa_2_05 +#define HAVE_ISEL have_isa_2_06 +#else #define HAVE_ISA_2_05 0 -#define HAVE_ISEL 0 +#define HAVE_ISA_ISEL 0 +#endif #ifdef CONFIG_USE_GUEST_BASE #define TCG_GUEST_BASE_REG 30 @@ -2084,6 +2092,16 @@ static const TCGTargetOpDef ppc_op_defs[] = { static void tcg_target_init (TCGContext *s) { +#ifdef CONFIG_GETAUXVAL + unsigned long hwcap = getauxval(AT_HWCAP); + /* Bizzarely, the linux kernel doesn't set *all* applicable bits. */ + if (hwcap & PPC_FEATURE_ARCH_2_06) { + have_isa_2_05 = have_isa_2_06 = true; + } else if (hwcap & PPC_FEATURE_ARCH_2_05) { + have_isa_2_05 = true; + } +#endif + tcg_regset_set32 (tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffffffff); tcg_regset_set32 (tcg_target_available_regs[TCG_TYPE_I64], 0, 0xffffffff); tcg_regset_set32 (tcg_target_call_clobber_regs, 0,