From patchwork Tue Oct 16 22:31:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149005 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp5672019lji; Tue, 16 Oct 2018 15:38:35 -0700 (PDT) X-Google-Smtp-Source: ACcGV60xE5tp+OkK21ocK6qon67JQZU9DGbDepwPYI9uRJJCAxqtSeRq3Pj+TSFAX4AZKox/LYWT X-Received: by 2002:a37:d6d8:: with SMTP id p85-v6mr21840045qkl.14.1539729515103; Tue, 16 Oct 2018 15:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539729515; cv=none; d=google.com; s=arc-20160816; b=UN1fMlRMPWjGb+FM9cZyU8GikECzKKQSM1EAEjvDEVkj/3HXrRYKxRRlTzNGH5Uy/P C5tDFJnNUbCNn6ovrGkGO00d9Iiv0xNWShTL2dpqN4eFsI72GK3b0m0SkKx3Gs+ESnCR nxT4MNAMCP3njJe9Ap4AweniS2eCaH3DKMqHIUUNiqDCCy8k7gu4FRnnNnvoz27I5PJq ZtK6jZ+/1YJF1lQ/jaOtBbiBRLUyhWe9Q8xDmmUEPwPI+lFDMM5KjzKlX2Fjw7jHQUAK Tf5rBnQ4GO7IYIWvratx63sEzkueRUbKXWfgcsllFzKxKr2d8dOWXjDeHYdToU44GCsA p73A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=tPt2b6vHu83/KVV1oPQBHxI6axfXRsFslZXK1O07DV8=; b=V+4nbDIm1u6F7UyTDvAccrRI7/zWL1OmnTzI2wcaXxS+KgqfIohQ254z0tlzi7ZCeu kYH+0CN9MXD4mVl9LotejI5ElSCFyl3n3YieAjE6bVck5zCmV8ENSuujTqkIOSsE6RLo /m1BPTF79AeMNeFnyoyOKY2EFbOMgJCdK9m318b+B1oVw8NEvjvk+WFS+snMqlko0C1K AYr5N7WfCUjjl+7tW9qJExA70J5Z6OqO2n4iL99X4lP1QkQXE+rDyoaXtYNfHRLUpfeA RsFoLWV/EFo/J9LixUXDEVs6tKqOXu323xdbQP3pAN7eSOxD5d9IQy4AlDS+3kaf+gzh 55HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OT99Hvxy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t15si1861952qvn.177.2018.10.16.15.38.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 16 Oct 2018 15:38:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OT99Hvxy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCXz0-00071w-JW for patch@linaro.org; Tue, 16 Oct 2018 18:38:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCXsD-0001Y2-Uj for qemu-devel@nongnu.org; Tue, 16 Oct 2018 18:31:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCXsA-0005WG-Mx for qemu-devel@nongnu.org; Tue, 16 Oct 2018 18:31:33 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:41232) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCXsA-0005Sz-DL for qemu-devel@nongnu.org; Tue, 16 Oct 2018 18:31:30 -0400 Received: by mail-pg1-x541.google.com with SMTP id 23-v6so11511561pgc.8 for ; Tue, 16 Oct 2018 15:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tPt2b6vHu83/KVV1oPQBHxI6axfXRsFslZXK1O07DV8=; b=OT99HvxyPyUtWb+P8mCdV6qDEjf8hp6ae98hpojk8Nr1dxUMAuqpeSARCIE2BOq353 N9auPGrTUUAm+7zCJzEbq7Yn5s1OViUJZsf1XXUQWbIIWQKrte22wgfajVjRpyfrWUwo H9axaAS06s4qSCzT4ixpf13rZOJ6OV1aH6zIA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tPt2b6vHu83/KVV1oPQBHxI6axfXRsFslZXK1O07DV8=; b=O/TVSA1DLSfqx58kwzsjFXwgs4Fwo/7TK/zlUGvjRZk5JzIpBEEcSnhJQTDbwC08HQ ObURH4om+a7Jb+zyeP3udQoZy2aKWtNUbNiMETPpxJbk8JvW95sdYN9jJl+O0yG1PkqF 3aB7Y/XqD8Q7a1eErh84a0NsU8u9FBVztdsuTRr24bjaN1vNgiHsegtlYDZf3DtC6IPZ v9WNaimARMVZifEWLN7s4as7WNcDm/+UCGE+uty+IAkCObdLPzn+42bmH48rzcFvfxgE +0SsR5fbtnVfCvzaemV77lub95vTRyUd1XC1GJBmX4zUgAB5oEhBk2NL6Tp5sRxxErVU 3uUQ== X-Gm-Message-State: ABuFfoj0RPJUd4P2QyFZ7XlZlPvePK5AqD6rQ9bRoMFvdHX1leKI6llO cQn5t2M+QGbf91/kcWK+ddoTm4kR9dg= X-Received: by 2002:a63:30c8:: with SMTP id w191-v6mr21617979pgw.447.1539729088323; Tue, 16 Oct 2018 15:31:28 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id a79-v6sm23094458pfa.124.2018.10.16.15.31.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Oct 2018 15:31:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Oct 2018 15:31:13 -0700 Message-Id: <20181016223115.24100-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181016223115.24100-1-richard.henderson@linaro.org> References: <20181016223115.24100-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v4 6/8] target/arm: Convert t32ee from feature bit to isar3 test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/arm/cpu.h | 6 +++++- linux-user/elfload.c | 2 +- target/arm/cpu.c | 4 ---- target/arm/helper.c | 2 +- target/arm/machine.c | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 4fdace5de1..af68932946 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1558,7 +1558,6 @@ enum arm_features { ARM_FEATURE_NEON, ARM_FEATURE_M, /* Microcontroller profile. */ ARM_FEATURE_OMAPCP, /* OMAP specific CP15 ops handling. */ - ARM_FEATURE_THUMB2EE, ARM_FEATURE_V7MP, /* v7 Multiprocessing Extensions */ ARM_FEATURE_V7VE, /* v7 Virtualization Extensions (non-EL2 parts) */ ARM_FEATURE_V4T, @@ -3157,6 +3156,11 @@ static inline bool isar_feature_jazelle(const ARMISARegisters *id) return FIELD_EX32(id->id_isar1, ID_ISAR1, JAZELLE) != 0; } +static inline bool isar_feature_t32ee(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_isar3, ID_ISAR3, T32EE) != 0; +} + static inline bool isar_feature_aa32_aes(const ARMISARegisters *id) { return FIELD_EX32(id->id_isar5, ID_ISAR5, AES) != 0; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 1e0f22d812..c6edc545ac 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -466,7 +466,7 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE(ARM_FEATURE_V5, ARM_HWCAP_ARM_EDSP); 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_ID(t32ee, 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_V6K, ARM_HWCAP_ARM_TLS); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 8f16e96b6c..e08a2d2d79 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1440,7 +1440,6 @@ static void cortex_a8_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7); set_feature(&cpu->env, ARM_FEATURE_VFP3); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->midr = 0x410fc080; @@ -1509,7 +1508,6 @@ static void cortex_a9_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_VFP3); set_feature(&cpu->env, ARM_FEATURE_VFP_FP16); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_EL3); /* Note that A9 supports the MP extensions even for * A9UP and single-core A9MP (which are both different @@ -1572,7 +1570,6 @@ static void cortex_a7_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7VE); set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); @@ -1618,7 +1615,6 @@ static void cortex_a15_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7VE); set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); diff --git a/target/arm/helper.c b/target/arm/helper.c index 342c802a95..b7d9a3392e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5359,7 +5359,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, vmsa_pmsa_cp_reginfo); define_arm_cp_regs(cpu, vmsa_cp_reginfo); } - if (arm_feature(env, ARM_FEATURE_THUMB2EE)) { + if (cpu_isar_feature(t32ee, cpu)) { define_arm_cp_regs(cpu, t2ee_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) { diff --git a/target/arm/machine.c b/target/arm/machine.c index ff4ec22bf7..5402ff8ae5 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -301,9 +301,8 @@ static const VMStateDescription vmstate_m = { static bool thumb2ee_needed(void *opaque) { ARMCPU *cpu = opaque; - CPUARMState *env = &cpu->env; - return arm_feature(env, ARM_FEATURE_THUMB2EE); + return cpu_isar_feature(t32ee, cpu); } static const VMStateDescription vmstate_thumb2ee = {