From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xla2S-0003We-DT for qemu-devel@nongnu.org; Tue, 04 Nov 2014 04:04:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xla2O-0002jG-43 for qemu-devel@nongnu.org; Tue, 04 Nov 2014 04:04:32 -0500 Received: from lhrrgout.huawei.com ([194.213.3.17]:38796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xla2N-0002j8-SN for qemu-devel@nongnu.org; Tue, 04 Nov 2014 04:04:28 -0500 Message-ID: <54589694.8020302@huawei.com> Date: Tue, 4 Nov 2014 10:04:20 +0100 From: Claudio Fontana MIME-Version: 1.0 References: <1414524244-20316-1-git-send-email-peter.maydell@linaro.org> <1414524244-20316-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1414524244-20316-2-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset="ISO-8859-1" 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: patches@linaro.org On 28.10.2014 20:24, Peter Maydell wrote: > 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 > --- > 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) > > nit: the line for ENABLE_ARCH_6K seems to be differently aligned than the rest. Reviewed-by: Claudio Fontana -- Claudio Fontana Server Virtualization Architect Huawei Technologies Duesseldorf GmbH Riesstraße 25 - 80992 München office: +49 89 158834 4135 mobile: +49 15253060158