From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36486)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1XkDig-0003V8-9k
	for qemu-devel@nongnu.org; Fri, 31 Oct 2014 11:02:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1XkBxC-00025b-FJ
	for qemu-devel@nongnu.org; Fri, 31 Oct 2014 09:09:27 -0400
Received: from static.88-198-71-155.clients.your-server.de
	([88.198.71.155]:45809 helo=socrates.bennee.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1XkBxC-000241-8B
	for qemu-devel@nongnu.org; Fri, 31 Oct 2014 09:09:22 -0400
References: <1414524244-20316-1-git-send-email-peter.maydell@linaro.org>
	<1414524244-20316-2-git-send-email-peter.maydell@linaro.org>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <1414524244-20316-2-git-send-email-peter.maydell@linaro.org>
Date: Fri, 31 Oct 2014 13:09:34 +0000
Message-ID: <871tpo4c8h.fsf@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH 1/5] target-arm/translate.c: Use
	arm_dc_feature() in ENABLE_ARCH_ macros
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org, patches@linaro.org


Peter Maydell <peter.maydell@linaro.org> writes:

> All the places where we use the ENABLE_ARCH_* and ARCH() macros have a
> DisasContext* s, so switch them over to use arm_dc_feature() rather than
> arm_feature() so we don't need to pass the CPUARMState* env around too.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


> ---
>  target-arm/translate.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/target-arm/translate.c b/target-arm/translate.c
> index 1d52e47..f69e5ef 100644
> --- a/target-arm/translate.c
> +++ b/target-arm/translate.c
> @@ -38,16 +38,16 @@
>  #include "trace-tcg.h"
>  
>  
> -#define ENABLE_ARCH_4T    arm_feature(env, ARM_FEATURE_V4T)
> -#define ENABLE_ARCH_5     arm_feature(env, ARM_FEATURE_V5)
> +#define ENABLE_ARCH_4T    arm_dc_feature(s, ARM_FEATURE_V4T)
> +#define ENABLE_ARCH_5     arm_dc_feature(s, ARM_FEATURE_V5)
>  /* currently all emulated v5 cores are also v5TE, so don't bother */
> -#define ENABLE_ARCH_5TE   arm_feature(env, ARM_FEATURE_V5)
> +#define ENABLE_ARCH_5TE   arm_dc_feature(s, ARM_FEATURE_V5)
>  #define ENABLE_ARCH_5J    0
> -#define ENABLE_ARCH_6     arm_feature(env, ARM_FEATURE_V6)
> -#define ENABLE_ARCH_6K   arm_feature(env, ARM_FEATURE_V6K)
> -#define ENABLE_ARCH_6T2   arm_feature(env, ARM_FEATURE_THUMB2)
> -#define ENABLE_ARCH_7     arm_feature(env, ARM_FEATURE_V7)
> -#define ENABLE_ARCH_8     arm_feature(env, ARM_FEATURE_V8)
> +#define ENABLE_ARCH_6     arm_dc_feature(s, ARM_FEATURE_V6)
> +#define ENABLE_ARCH_6K   arm_dc_feature(s, ARM_FEATURE_V6K)
> +#define ENABLE_ARCH_6T2   arm_dc_feature(s, ARM_FEATURE_THUMB2)
> +#define ENABLE_ARCH_7     arm_dc_feature(s, ARM_FEATURE_V7)
> +#define ENABLE_ARCH_8     arm_dc_feature(s, ARM_FEATURE_V8)
>  
>  #define ARCH(x) do { if (!ENABLE_ARCH_##x) goto illegal_op; } while(0)

-- 
Alex Bennée