From patchwork Tue Mar 5 16:50:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 159677 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp5186391jad; Tue, 5 Mar 2019 08:54:06 -0800 (PST) X-Google-Smtp-Source: APXvYqx+EZHte+jdLZK+0U64WJocILIVkRjH/sFs2a7iG4dX4Dm4PVfEOz7UmlDe9p3Nkik3fA+B X-Received: by 2002:a25:bf82:: with SMTP id l2mr2990953ybk.15.1551804846300; Tue, 05 Mar 2019 08:54:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551804846; cv=none; d=google.com; s=arc-20160816; b=RGdkGuOtpjrTxyD0ffgFinO0o8inOyIAsSlJIXxvpwrdjoVC2WgcLp8PcRraYK67wZ emDbH/sdJ9jl3/HJuL2TM9pEv/e0WNatrY2Ha7PlOObyEHEEPeEI9SdsPW7Wsw2REEiG PjR4Z1wfmDxhDjZPIMK9i0tyomlz6RJGnB5L/SWSgcWR8MeDiQ+N8xJBxxxUhzU3Ay5c uELygJBgGaLfgsr5fUy2PdrDgyRU8IhgvEBJaKdRx0AKgKujAD0mxdavfB/rM5kE3hgq VjxAa9Sg0ztifBRo1nE1QzoOfvDRRmtqDNSYCM2UnE0Qnka8mV+nC4MeqdKfTx77d34s 471A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=1uIXKoONtnkjCTDZZuAUO2wCgsqHmmOWbYwfgzZEbss=; b=XEnV/U9n0p2cJvYt081W5aRkx5oXsUzAWdk1VoWGzwBof9ewW7QRD7nsFvupjAPAXF wjkJdzLIi7fGF4klKq7EglT36YFw+O8WquTv/XojBp1I7XN3hqWl1MVhkjPGHihDgwqV PNdiyjueCoFNPu3p7H37rkN3TKt/oJb6JoLMF9YvQkxANroGdG5vrtHOipEW4FsRGRk9 Iiw9a5KL9gAOCtxKGf73Ew4uWgh1L9fhu1mI50uPE/UpLY9z3d+jVTIs5tsk+6nHwyoX T0nnRuW8PTTjqSGEKcN7qNosGgMkS8y1LkaLEFj7pPY0m9rCWnD6BUCXRridAUmcz5yF HAhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rI6e9KXR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id f3si5130755ybn.283.2019.03.05.08.54.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2019 08:54:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rI6e9KXR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:45744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DKP-0002ou-Q8 for patch@linaro.org; Tue, 05 Mar 2019 11:54:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1DHQ-0001WZ-Fi for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1DHP-0000iT-FU for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:51:00 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:44122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1DHP-0000gO-6v for qemu-devel@nongnu.org; Tue, 05 Mar 2019 11:50:59 -0500 Received: by mail-wr1-x433.google.com with SMTP id w2so10237116wrt.11 for ; Tue, 05 Mar 2019 08:50:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1uIXKoONtnkjCTDZZuAUO2wCgsqHmmOWbYwfgzZEbss=; b=rI6e9KXRVQqc3l9NbxyAPX3LRq8MF07XkiZRvtbhn7SYI7d2AfuSFYzvE7hpUY1u2H ZRqhU9eiIsrl7qxchaugqKP5GJqkzL01Vxdic0zPZ5khlrPKz7tGqyFuFK/66KXIl5LQ j/HSZ6/3hlzy44QzFXp1AgBQSugEgpDHaGe8FMXUg3J4aNa9SW6/e9zzPqvGmodZn3gq PpGS5v0KM5tWwe62snJDy+lOyZbmkcg7oUHremq130X3vnePgHnq2nmm7uwes6sAnKyr 9X8bNAMa9PvCHEduTj5b5BhGAZdC8VmwYp6osDiL5p51E7/+6MxnRYgr/Aekaj9+fNbe m+Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1uIXKoONtnkjCTDZZuAUO2wCgsqHmmOWbYwfgzZEbss=; b=eTw8svz80QDZWnH8gZr5/VDWFON6oQe50jJCTRsq//o3KzLe3An8iv2UGxd6h69GVg gSwftLfWHOWxdtFgJeaqgTY7qwUWtyTbiKZGgxn4TUXkMmYcyo3ou+QCpfmECrSR3w7H i0ABvbghQMavCWdXZyaZKOHiP7/N6RasAXz1yeFsQ8RRfqi/gezbjaj/8WfYKp53zSvc 4pTi6G9CphlUtJ2BVGyeRHmbNwb9NlbD1plk5YYYafgzFZGep3hRz28fwKy37nNSjChc fHEQ+vzvI03Ly22U+TUeA7eon/CZ+ON2eqa4ZNbT4kFZeiS8tprjCsf3VqxFFRPsre7d Jn9w== X-Gm-Message-State: APjAAAVUlqTHCtV1fM5xIarA2yT8MpplN7FfxT56NOMuCXf0wDZtPr72 nVIubWC0o/rkGd0wQSF1zcFECtKqXSE= X-Received: by 2002:adf:fc12:: with SMTP id i18mr16736622wrr.201.1551804657903; Tue, 05 Mar 2019 08:50:57 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 2sm10071495wrg.89.2019.03.05.08.50.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Mar 2019 08:50:56 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2019 16:50:32 +0000 Message-Id: <20190305165051.26860-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305165051.26860-1-peter.maydell@linaro.org> References: <20190305165051.26860-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PULL 03/22] target/arm: Implement ARMv8.0-SB 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Message-id: 20190301200501.16533-3-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/cpu.h | 10 ++++++++++ linux-user/elfload.c | 1 + target/arm/cpu.c | 1 + target/arm/cpu64.c | 2 ++ target/arm/translate-a64.c | 14 ++++++++++++++ target/arm/translate.c | 22 ++++++++++++++++++++++ 6 files changed, 50 insertions(+) -- 2.20.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 67b06bfad09..361e51143c7 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3307,6 +3307,11 @@ static inline bool isar_feature_aa32_fhm(const ARMISARegisters *id) return FIELD_EX32(id->id_isar6, ID_ISAR6, FHM) != 0; } +static inline bool isar_feature_aa32_sb(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_isar6, ID_ISAR6, SB) != 0; +} + static inline bool isar_feature_aa32_fp16_arith(const ARMISARegisters *id) { /* @@ -3445,6 +3450,11 @@ static inline bool isar_feature_aa64_pauth(const ARMISARegisters *id) FIELD_DP64(0, ID_AA64ISAR1, GPI, 0xf))) != 0; } +static inline bool isar_feature_aa64_sb(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, SB) != 0; +} + static inline bool isar_feature_aa64_fp16(const ARMISARegisters *id) { /* We always set the AdvSIMD and FP fields identically wrt FP16. */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b9f7cbbdc17..6cfebe1446d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -604,6 +604,7 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE_ID(aa64_pauth, ARM_HWCAP_A64_PACA | ARM_HWCAP_A64_PACG); GET_FEATURE_ID(aa64_fhm, ARM_HWCAP_A64_ASIMDFHM); GET_FEATURE_ID(aa64_jscvt, ARM_HWCAP_A64_JSCVT); + GET_FEATURE_ID(aa64_sb, ARM_HWCAP_A64_SB); #undef GET_FEATURE_ID diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 54b61f917be..ef069c268df 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2021,6 +2021,7 @@ static void arm_max_initfn(Object *obj) t = FIELD_DP32(t, ID_ISAR6, JSCVT, 1); t = FIELD_DP32(t, ID_ISAR6, DP, 1); t = FIELD_DP32(t, ID_ISAR6, FHM, 1); + t = FIELD_DP32(t, ID_ISAR6, SB, 1); cpu->isar.id_isar6 = t; t = cpu->id_mmfr4; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 1b0c427277b..6788c0f6ff7 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -318,6 +318,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64ISAR1, API, 0); t = FIELD_DP64(t, ID_AA64ISAR1, GPA, 1); t = FIELD_DP64(t, ID_AA64ISAR1, GPI, 0); + t = FIELD_DP64(t, ID_AA64ISAR1, SB, 1); cpu->isar.id_aa64isar1 = t; t = cpu->isar.id_aa64pfr0; @@ -349,6 +350,7 @@ static void aarch64_max_initfn(Object *obj) u = FIELD_DP32(u, ID_ISAR6, JSCVT, 1); u = FIELD_DP32(u, ID_ISAR6, DP, 1); u = FIELD_DP32(u, ID_ISAR6, FHM, 1); + u = FIELD_DP32(u, ID_ISAR6, SB, 1); cpu->isar.id_isar6 = u; /* diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index d3c8eaf0893..4aa5a307e41 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1637,7 +1637,21 @@ static void handle_sync(DisasContext *s, uint32_t insn, reset_btype(s); gen_goto_tb(s, 0, s->pc); return; + + case 7: /* SB */ + if (crm != 0 || !dc_isar_feature(aa64_sb, s)) { + goto do_unallocated; + } + /* + * TODO: There is no speculation barrier opcode for TCG; + * MB and end the TB instead. + */ + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + gen_goto_tb(s, 0, s->pc); + return; + default: + do_unallocated: unallocated_encoding(s); return; } diff --git a/target/arm/translate.c b/target/arm/translate.c index ad879e3480c..9f71206f857 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9282,6 +9282,17 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) */ gen_goto_tb(s, 0, s->pc & ~1); return; + case 7: /* sb */ + if ((insn & 0xf) || !dc_isar_feature(aa32_sb, s)) { + goto illegal_op; + } + /* + * TODO: There is no speculation barrier opcode + * for TCG; MB and end the TB instead. + */ + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + gen_goto_tb(s, 0, s->pc & ~1); + return; default: goto illegal_op; } @@ -11900,6 +11911,17 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) */ gen_goto_tb(s, 0, s->pc & ~1); break; + case 7: /* sb */ + if ((insn & 0xf) || !dc_isar_feature(aa32_sb, s)) { + goto illegal_op; + } + /* + * TODO: There is no speculation barrier opcode + * for TCG; MB and end the TB instead. + */ + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + gen_goto_tb(s, 0, s->pc & ~1); + break; default: goto illegal_op; }