From patchwork Wed Jun 26 20:52: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: 254866 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D321B2C008E for ; Thu, 27 Jun 2013 06:57:02 +1000 (EST) Received: from localhost ([::1]:53432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urwlw-0004ie-QJ for incoming@patchwork.ozlabs.org; Wed, 26 Jun 2013 16:57:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urwhg-0007HH-0F for qemu-devel@nongnu.org; Wed, 26 Jun 2013 16:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Urwhc-0000oL-V5 for qemu-devel@nongnu.org; Wed, 26 Jun 2013 16:52:35 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:50961) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Urwhc-0000oF-Na for qemu-devel@nongnu.org; Wed, 26 Jun 2013 16:52:32 -0400 Received: by mail-pa0-f44.google.com with SMTP id lj1so73001pab.17 for ; Wed, 26 Jun 2013 13:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=5qVcbnJRYyXR++V1Tuw320gfejut+gDM7pwKVpdWarA=; b=WEp+UXtR+ISQ/izYcDV/vVTEVUFtTSEhziWRK2Ykh0Q+gCzbkopkkC959BzS05oOua zqnNZfzs7FHGAnXOn2T00uLpeGICUPxhPjgLKCvWTEspLStc+K8CDOsTgC3yMjO5gkaz 3uU2JdXbBDG2t1JDvkCDboD9QVYH6Neyem+o0jsPkgFB0JuLcTCrKyVKJ3C4HUrGsCrm D/sOMqeeDRXCghRXYi67qEKX8c9FOv8j0V2E++vU84jLSFo9PE+OpBuxJNuGwbI9YprQ PZG/yJRRwxPqkH55SXJpuB4SLQdgcwW8lhSG1TQz90vg6N70l5/wIFPK9fY1m9YX1Vmv oFXQ== X-Received: by 10.68.218.199 with SMTP id pi7mr2582696pbc.19.1372279951896; Wed, 26 Jun 2013 13:52:31 -0700 (PDT) Received: from fremont.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id ix3sm29805715pbc.37.2013.06.26.13.52.30 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Jun 2013 13:52:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Jun 2013 13:52:08 -0700 Message-Id: <1372279929-28836-9-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1372279929-28836-1-git-send-email-rth@twiddle.net> References: <1372279929-28836-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:400e:c03::22c Cc: blauwirbel@gmail.com, claudio.fontana@huawei.com, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v2 8/9] tcg-arm: Simplify logic in detecting the ARM ISA in use 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 GCC 4.8 defines a handy __ARM_ARCH symbol that we can use, which will make us nicely forward compatible with ARMv8 AArch32. Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c | 62 +++++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index 2c46ceb..763b173 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -22,50 +22,28 @@ * THE SOFTWARE. */ -#if defined(__ARM_ARCH_7__) || \ - defined(__ARM_ARCH_7A__) || \ - defined(__ARM_ARCH_7EM__) || \ - defined(__ARM_ARCH_7M__) || \ - defined(__ARM_ARCH_7R__) -#define USE_ARMV7_INSTRUCTIONS +/* The __ARM_ARCH define is provided by gcc 4.8. Construct it otherwise. */ +#ifndef __ARM_ARCH +# if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ + || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ + || defined(__ARM_ARCH_7EM__) +# define __ARM_ARCH 7 +# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) +# define __ARM_ARCH 6 +# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5E__) \ + || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) \ + || defined(__ARM_ARCH_5TEJ__) +# define __ARM_ARCH 5 +# else +# define __ARM_ARCH 4 +# endif #endif -#if defined(USE_ARMV7_INSTRUCTIONS) || \ - defined(__ARM_ARCH_6J__) || \ - defined(__ARM_ARCH_6K__) || \ - defined(__ARM_ARCH_6T2__) || \ - defined(__ARM_ARCH_6Z__) || \ - defined(__ARM_ARCH_6ZK__) -#define USE_ARMV6_INSTRUCTIONS -#endif - -#if defined(USE_ARMV6_INSTRUCTIONS) || \ - defined(__ARM_ARCH_5T__) || \ - defined(__ARM_ARCH_5TE__) || \ - defined(__ARM_ARCH_5TEJ__) -#define USE_ARMV5_INSTRUCTIONS -#endif - -#ifdef USE_ARMV5_INSTRUCTIONS -static const int use_armv5_instructions = 1; -#else -static const int use_armv5_instructions = 0; -#endif -#undef USE_ARMV5_INSTRUCTIONS - -#ifdef USE_ARMV6_INSTRUCTIONS -static const int use_armv6_instructions = 1; -#else -static const int use_armv6_instructions = 0; -#endif -#undef USE_ARMV6_INSTRUCTIONS - -#ifdef USE_ARMV7_INSTRUCTIONS -static const int use_armv7_instructions = 1; -#else -static const int use_armv7_instructions = 0; -#endif -#undef USE_ARMV7_INSTRUCTIONS +#define use_armv5_instructions (__ARM_ARCH >= 5) +#define use_armv6_instructions (__ARM_ARCH >= 6) +#define use_armv7_instructions (__ARM_ARCH >= 7) #ifndef use_idiv_instructions bool use_idiv_instructions;