From patchwork Sat Sep 15 16:17:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 146791 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1945606ljw; Sat, 15 Sep 2018 09:26:54 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZBtc/enuALbx5lXAtyBx28J8gPPwnhAmHsLjAngraFGkB8F8zjRbZ/tkjAijKtGNdZOOG6 X-Received: by 2002:a37:b12:: with SMTP id 18-v6mr12351726qkl.167.1537028814664; Sat, 15 Sep 2018 09:26:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537028814; cv=none; d=google.com; s=arc-20160816; b=UgG60n4AbjlE1GZD+ZKMTHP6MgtGNPJUYU0uOoQ22i2RiyMSPxKLY4l2pjnODqLH96 iDgSjV0HoGE2DPBx+cFqOzveT9sWeZW5AdFwzYfX8UdYhb/LqiY2/xRwrdrSc5SiTWxa xQ77bAktOYE8gveBkL3IyAy07AwMIX+IvRHkMGvPXNvv4MSlVNUfxirmVFqjBhYqQNVZ UvF2lI7zsQzjoHszGTiQiM0PpUGkd8wwLqJQItwzK/Rt5z6yXrUZJBnjngguIOQkjAER YbGzDiYXPtp/kHpACN0qfvnhW4njceMVzjF2JulWwXrjub2LCZ3ZVBCU7oTqAMNDGAyk lYhg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=jgmkTEluYq/Qp7SO+CS3JMwIujLwX/BOHR5l9U0Ukbw=; b=bg32EjqzWuHLMvfQg2pBvjYFRTP5ZAOGzrCcNKrYPWrWTOcXLTcnQQmfS49Mid6WNM qX1QG5TAdpiiA7nA0gkVwwFyYpgsYZrngWqd0FbOQw5hPbAAsvezSZoPm2g87fjb8war 2awB0yC0bmq7/c55L1MvmA8xObwCF/t0pOj984hAxturxG+fxcpXjlpQZgOBIqOPytbr +PIr5YCPvkM0ezEb2oL01cMvGmfthD1KPDZMVzQAYEhSe6LN4pQVslqlpZaFP1YdAYPS CzOXqYwxoANfdPh3WWh2F2YcJtkig/LpvUzWSDmpzd3scX7ib1wnQsRc6RqRGUOkIbNb HqQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ary9sSbH; 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 a13-v6si176429qtd.152.2018.09.15.09.26.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 15 Sep 2018 09:26:54 -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=ary9sSbH; 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]:56137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DPK-0003qd-3z for patch@linaro.org; Sat, 15 Sep 2018 12:26:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DGf-0004cC-WB for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1DGf-00047A-90 for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:57 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:43776) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g1DGe-000457-30 for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:57 -0400 Received: by mail-pf1-x433.google.com with SMTP id j26-v6so5639105pfi.10 for ; Sat, 15 Sep 2018 09:17:55 -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; bh=jgmkTEluYq/Qp7SO+CS3JMwIujLwX/BOHR5l9U0Ukbw=; b=ary9sSbH8ZGW182aHqLzYAQ1LEITJbii3BQUuD6SguZ64wesaGRMC0t6SiXqdtAsgY b9yt5O4ZPBhGVGjrpDdZRNseY7eJGpKRbVMW9X0ahPAjp4yhZc+N4//KUruGjMRBc/S2 JaF9nOq+ySKndSPYjs+42l4/ORo0XBbmiQ6cI= 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; bh=jgmkTEluYq/Qp7SO+CS3JMwIujLwX/BOHR5l9U0Ukbw=; b=dIey33tjKur4PSn67gwkti63w7rzfy/9U3AN93cEciavgNFka6kWlQNVHo9jBEeT/V S7xPGLIg0WbO1lwGo8DyerqvzHsRaAZwjNOH+JOf76L5E1s+QJFXOsTR4FqZiULtNgcA OIURXektYZ4HwAQRWOele4+EwyKMGqqp1kvmNSXK1NEMcN/teAMZP4XXlpXlNf8xyfEm KKbBrwLpejwgP3zqyC43OmPucGVRwpJ9iwyYhzIJMruvM3WUmWqvj/1h9+crFjdHJQbA Rd6dY6yom/GrMoXtvb67AilF2NmhVxSy2r6feQMJ3raP+/DL9m8wnUXMYbSNj2cm6pOK Up1A== X-Gm-Message-State: APzg51A56cvzuEHBfMwnc43cMdCgy4ov5YJaF6NwejB8dRcyCqFvr1FJ d0YBeqk0y/FztUyBvrZ4KBxnNKtkBRA= X-Received: by 2002:a63:3cc:: with SMTP id 195-v6mr16189011pgd.229.1537028274634; Sat, 15 Sep 2018 09:17:54 -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 k26-v6sm18648793pfb.167.2018.09.15.09.17.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Sep 2018 09:17:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 15 Sep 2018 09:17:35 -0700 Message-Id: <20180915161738.25257-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180915161738.25257-1-richard.henderson@linaro.org> References: <20180915161738.25257-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::433 Subject: [Qemu-devel] [PATCH 10/13] target/arm: Derive id_aa64isar0 from features 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" Signed-off-by: Richard Henderson --- target/arm/cpu.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) -- 2.17.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4fb3e0a9ea..1c51b9f631 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1017,6 +1017,51 @@ static uint32_t resolve_id_pfr1(CPUARMState *env) return ret; } +static uint64_t resolve_id_aa64isar0(CPUARMState *env) +{ + uint64_t ret = 0; + + /* AES */ + if (arm_feature(env, ARM_FEATURE_V8_PMULL)) { + ret = deposit64(ret, 4, 4, 2); + } else if (arm_feature(env, ARM_FEATURE_V8_AES)) { + ret = deposit64(ret, 4, 4, 1); + } + if (arm_feature(env, ARM_FEATURE_V8_SHA1)) { + ret = deposit64(ret, 8, 4, 1); /* SHA1 */ + } + /* SHA2 */ + if (arm_feature(env, ARM_FEATURE_V8_SHA512)) { + ret = deposit64(ret, 12, 4, 2); + } else if (arm_feature(env, ARM_FEATURE_V8_SHA256)) { + ret = deposit64(ret, 12, 4, 1); + } + if (arm_feature(env, ARM_FEATURE_CRC)) { + ret = deposit64(ret, 16, 4, 1); /* CRC32 */ + } + if (arm_feature(env, ARM_FEATURE_V8_ATOMICS)) { + ret = deposit64(ret, 20, 4, 2); /* Atomic */ + } + if (arm_feature(env, ARM_FEATURE_V8_RDM)) { + ret = deposit64(ret, 28, 4, 1); /* RDM */ + } + if (arm_feature(env, ARM_FEATURE_V8_SHA3)) { + ret = deposit64(ret, 32, 4, 1); /* SHA3 */ + } + if (arm_feature(env, ARM_FEATURE_V8_SM3)) { + ret = deposit64(ret, 36, 4, 1); /* SM3 */ + } + if (arm_feature(env, ARM_FEATURE_V8_SM4)) { + ret = deposit64(ret, 40, 4, 1); /* SM4 */ + } + if (arm_feature(env, ARM_FEATURE_V8_DOTPROD)) { + ret = deposit64(ret, 44, 4, 1); /* DP */ + } + /* FHM -- not implemented yet */ + + return ret; +} + static void resolve_id_regs(ARMCPU *cpu) { CPUARMState *env = &cpu->env; @@ -1053,6 +1098,10 @@ static void resolve_id_regs(ARMCPU *cpu) orig = cpu->id_pfr1; cpu->id_pfr1 = resolve_id_pfr1(env); g_assert_cmphex(cpu->id_pfr1, ==, orig); + + orig = cpu->id_aa64isar0; + cpu->id_aa64isar0 = resolve_id_aa64isar0(env); + g_assert_cmphex(cpu->id_aa64isar0, ==, orig); } static void arm_cpu_realizefn(DeviceState *dev, Error **errp)