From patchwork Mon Oct 8 21:22:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 148449 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4136216lji; Mon, 8 Oct 2018 14:31:09 -0700 (PDT) X-Google-Smtp-Source: ACcGV63EzP1T7FJWfCbcKJeQGvoh1DcPRWjQh//iQw7eCCeW/JSyt4jEAB2/wPkrzkPdLZ+T6c89 X-Received: by 2002:ac8:d84:: with SMTP id s4-v6mr20592795qti.284.1539034269198; Mon, 08 Oct 2018 14:31:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539034269; cv=none; d=google.com; s=arc-20160816; b=LamKG/YjUu7AQbDDwpL/BTW6iDeyrpAMHm+JevOv1HjAArCM3U4wChJ87IYm2TdPkV qSMln80hHU8mCaG1uXbHyuUN5V4cqhf7Y660R3By/HzCzDjANkYwaQCbTETddIjfNxrx 4a9MObDKwdbm7Bu1RONQmJHvjsaECoPtgHs0Y76FKua41kYaV/iSBSEnJTiLoS4msls+ qLf+PfFaR+CFdIwWS8spokjOnR7jGYS1hd3w/S8GgeLzIZ2yurG+mrxQ8gkRhpPgq1wA A+372xVnOl72RAYiPfkz4mh6qG/v1T9aldnBHExZK1tXPvIyI08vmfJO2soQwezivJo+ v82g== 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=rCfKJvEImAlIOS5OuIocjp/nzs9AjrM4OqneJbqaU0k=; b=ihH8LbTXFkVFwOSDoAjdADnaNltXRCmD90Wgr3VauS8ND6Y0oaoGD1FxZpVRY2XcDe Hg3cMYYehlcDKxjS0KrsxjnQDWhLG+uBAorRAuq1Q+tvJRl1ipJpJ5xjiZO7q2dDXftu vX+cTbgZPM2Dd06MWnsA5fqVYM6ss/KeTtfRmtidIUm4tZk4U7afwnj3aJBhPNg1bR+u /WjVttVIdDJOv/7jArZ9unSGJvFgrhTnth8ocyT9c1bdnsO+s+o0h8HDtjOpjFDslay5 tNYGkjAQGhnQmaHnTIpidlICpMxsMUiIlSpBezCYBeu4g7/lyfd5xmSHWtFwmLaji5q3 5ABw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hxIiuK3L; 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 k45-v6si1648234qvf.138.2018.10.08.14.31.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 08 Oct 2018 14:31:09 -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=hxIiuK3L; 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]:48385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9d7M-0007cZ-Ha for patch@linaro.org; Mon, 08 Oct 2018 17:31:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9d4P-00055T-RQ for qemu-devel@nongnu.org; Mon, 08 Oct 2018 17:28:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9cyw-0008C1-Pb for qemu-devel@nongnu.org; Mon, 08 Oct 2018 17:22:28 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:35694) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g9cyt-0008AE-Iz for qemu-devel@nongnu.org; Mon, 08 Oct 2018 17:22:24 -0400 Received: by mail-pg1-x52b.google.com with SMTP id v133-v6so8400074pgb.2 for ; Mon, 08 Oct 2018 14:22:21 -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=rCfKJvEImAlIOS5OuIocjp/nzs9AjrM4OqneJbqaU0k=; b=hxIiuK3LJOfBKzpQVMqGpIvrtvLJsfDuOoS048hBaMuPzezqmTu5te//llcIVhaeO5 SsVSETtg25U9DZvtf0WzOXGrUzKkThPLSdC98Y7YghZQzcro9avYeLrztT5bJCr2Tklv yyM7/yrHVpQXlHjy/rJFRnN9W94XRr84iPSr0= 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=rCfKJvEImAlIOS5OuIocjp/nzs9AjrM4OqneJbqaU0k=; b=r6ue0EM4DIDTvlo66bYoRDHgpcWTOuthm2w/RDqrg0blTsAyWQrEBkLCObCr+9rQ+N xrcn0ouPx9XqTZ451MzDmc9ThuAiPJdpqhUIIegCnr7bUCTzYRF+wf18t72M7B0aypKY jU1SqjGUAjvruzRBupRNcBwj7W/4Opg41EgPkEeW/4BG8TzmKIa1L+VzcBxrnb+nQ7wX DoijiVbXIjNsAvhUa8NtUlE5GUkaCf7W+kndgwLt5TSEQbIESVFKQn7Sw/8Oj5yfkbtn nvBcVbbB9UpiRs1261nMZPpsAY5gIS/1fGM8PVzw2mP/r5bigQ9x6uO5YHyyJYRnczUD uacw== X-Gm-Message-State: ABuFfog/NY0nNMOZztFVVWzg7OhRzm+1VxOMRAUw0VK9HdIqO8b6WueM phRgs8+NWzT9T4Bg5bMHGEJoJAd0yBY= X-Received: by 2002:a62:8c93:: with SMTP id m141-v6mr27635668pfd.16.1539033740002; Mon, 08 Oct 2018 14:22:20 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id r25-v6sm20392913pgm.59.2018.10.08.14.22.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Oct 2018 14:22:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 8 Oct 2018 14:22:03 -0700 Message-Id: <20181008212205.17752-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181008212205.17752-1-richard.henderson@linaro.org> References: <20181008212205.17752-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::52b Subject: [Qemu-devel] [PATCH v3 08/10] 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.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 557ef8daf9..d8cb9633d2 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1552,7 +1552,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, @@ -3151,6 +3150,11 @@ static inline bool aa32_feature_jazelle(ARMCPU *cpu) return FIELD_EX32(cpu->id_isar1, ID_ISAR1, JAZELLE) != 0; } +static inline bool aa32_feature_t32ee(ARMCPU *cpu) +{ + return FIELD_EX32(cpu->id_isar3, ID_ISAR3, T32EE) != 0; +} + static inline bool aa32_feature_aes(ARMCPU *cpu) { return FIELD_EX32(cpu->id_isar5, ID_ISAR5, AES) != 0; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 9b00e977d8..3061d703b2 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 4e2609aa7e..f8faea7933 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1436,7 +1436,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; @@ -1505,7 +1504,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 @@ -1568,7 +1566,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); @@ -1614,7 +1611,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 0efbb5c76c..0da13175be 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5356,7 +5356,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 (aa32_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..d44e891533 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 aa32_feature_t32ee(cpu); } static const VMStateDescription vmstate_thumb2ee = {