From patchwork Mon Apr 29 17:00:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 163069 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp2154073ill; Mon, 29 Apr 2019 10:21:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqy9U4LQjViq1OqdU8Je+6jKi0kw4sMLcd+HEomcbHP+rPdjxnvmecPSkSP1ik/S3R+yeCAD X-Received: by 2002:a5d:4b8f:: with SMTP id b15mr6800925wrt.191.1556558510246; Mon, 29 Apr 2019 10:21:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556558510; cv=none; d=google.com; s=arc-20160816; b=kRrLSHDPT7mgo9cO+0MExhEd8kjJR0AIakCFusqSpId0EQeBTg5g3gbQsMagpCF2bR 2JMOSRtsMtAeuy9900W1SsHKr1hQH8h/dG0g6Gswny1COm4RwDQfObq4Eo4B01gdhiOO 1fhTikt84zlWtUokKjiv5qmocLCm61gFXHZJzfqSpSV3HA5RSdE5DJgYWitwSJc2HgBj 19lT3NRYE3g0IasB+8pT/p8UVY3ZQhuwSkRXudcjVDb+N34pMOKw5cm28HNJAywuDDL+ qPCpff8dVAO1+PKDPChR98ghJzhK0NUcwhNuLAe813YetjDU+wZdNxMMHQ6Nq7WomXW9 N8PQ== 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=lJUudDaDiId6vq4HrX2mxmCThhHruq8pKrvlbVUyK2U=; b=GUmiWD4xaALtN/55IPyxVhVA72yTjsfnD1SP+laSurlT85TZJtwekICiZnvvDcYx9p /cGbs51gushtV/We1XG85T0+t/zsoQXWMamlk/sPVoTsbELUbHH8RBC3PL99eS0lhFGK rJ+aUQDiMIdMBkJG/+4Ky/qIAtXOKD0T7Fm3vgNNftNhneGjuF/I42P/8apMqrr/o1fN dkUbGC/HxybCJ5IQeSliude/uDkpKVrmeLvWRvEOMPzvZV/UvJhEIqZXiv13KYDoqsI+ JTqBQHD+rnd1ho2w69Fnl50m1CDgyMjXFdJrGfY+mWrBLfZKJGVm3X5hIMDqClPidA1t 6fpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=t+SwSahC; 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 z23si72447wml.135.2019.04.29.10.21.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Apr 2019 10:21:50 -0700 (PDT) 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=t+SwSahC; 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]:60897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9yP-00050u-4P for patch@linaro.org; Mon, 29 Apr 2019 13:21:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9er-0004r2-3K for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hL9en-0006jp-Pz for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:35 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:40395) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hL9el-0006ZN-7e for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:32 -0400 Received: by mail-wm1-x32d.google.com with SMTP id h11so154899wmb.5 for ; Mon, 29 Apr 2019 10:01:10 -0700 (PDT) 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=lJUudDaDiId6vq4HrX2mxmCThhHruq8pKrvlbVUyK2U=; b=t+SwSahCawCOpjr0YYmfOwihSyKCmueeHtMqtL0bmeY5I/VbgSQEu9v5G0ajUxseM9 rgsEJI8W15al+V0naZBb1jYTpy0rkCjGdAV4bppYRzjEqcgiSM1awu30C+K73hj0tymj a6PWbMq+W9IGCkrPVEQ5owudlW0iDa2mAebAOWqYdafm0Bmcg7Mf4dQ1Txuz3T9DPSxp R4Ql9usadujPXnR3J5w2fKDGiJ4f6ildOq66EIJ4Na0ZFFygf+kXL4GqZQUbuPNufJ6R LkhmwKsaA7R/518COfgSU8RpD6+nbcwXy+31iSwwAdkSQnMCrsq8ER3KKKpf8HkujEFI hj3g== 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=lJUudDaDiId6vq4HrX2mxmCThhHruq8pKrvlbVUyK2U=; b=rRyb2oypwFeW0F0XagZ/v5H6VanEwvyAofABFv7moDXTtQ7EVDTwVLEO5GVJRz3loi 4NddGrdtweV1GEppvXMCFmCjS5Sln6TOJ3e2oVkkryCssXTHZDOV07JOJgfI+q7QQBRf pYqDqxbAOJyt6aVuDBN3wmDsYajeKiPaKzLBZb1VgigQyjoTo5f8KjD+GuyIYwa9JwY/ /n049WskcHpGhM+FJq63b9zG3he5Yhd/F+iEGT+26STf6SnJCW65BYKUsrP4crKvZrbG kltZmDl/4Mu0MIX1hs2YERWuU2qwJb4FY0LPl1ztc/M1+Rsim6FVuKzvWxQtlqdNv+SO Vqhg== X-Gm-Message-State: APjAAAXWA33MZMLXi7HGMxdrZK0SaJ+XWmcQzFkKTZb+wXhryhWXuO2f STAPPQgoNmxE9fVXjP8Vo1pawWT5YFo= X-Received: by 2002:a1c:ef08:: with SMTP id n8mr27597wmh.85.1556557268940; Mon, 29 Apr 2019 10:01:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a13sm36896wmj.39.2019.04.29.10.01.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 10:01:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Apr 2019 18:00:16 +0100 Message-Id: <20190429170030.11323-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429170030.11323-1-peter.maydell@linaro.org> References: <20190429170030.11323-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::32d Subject: [Qemu-devel] [PULL 28/42] target/arm: Implement VLLDM for v7M CPUs with an FPU 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" Implement the VLLDM instruction for v7M for the FPU present cas. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20190416125744.27770-26-peter.maydell@linaro.org --- target/arm/helper.h | 1 + target/arm/helper.c | 54 ++++++++++++++++++++++++++++++++++++++++++ target/arm/translate.c | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/target/arm/helper.h b/target/arm/helper.h index 62051ae6d51..50cb036378b 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -72,6 +72,7 @@ DEF_HELPER_3(v7m_tt, i32, env, i32, i32) DEF_HELPER_1(v7m_preserve_fp_state, void, env) DEF_HELPER_2(v7m_vlstm, void, env, i32) +DEF_HELPER_2(v7m_vlldm, void, env, i32) DEF_HELPER_2(v8m_stackcheck, void, env, i32) diff --git a/target/arm/helper.c b/target/arm/helper.c index b821037c3b6..81a92ab4911 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7390,6 +7390,12 @@ void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t fptr) g_assert_not_reached(); } +void HELPER(v7m_vlldm)(CPUARMState *env, uint32_t fptr) +{ + /* translate.c should never generate calls here in user-only mode */ + g_assert_not_reached(); +} + uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) { /* The TT instructions can be used by unprivileged code, but in @@ -8474,6 +8480,54 @@ void HELPER(v7m_vlstm)(CPUARMState *env, uint32_t fptr) env->v7m.control[M_REG_S] &= ~R_V7M_CONTROL_FPCA_MASK; } +void HELPER(v7m_vlldm)(CPUARMState *env, uint32_t fptr) +{ + /* fptr is the value of Rn, the frame pointer we load the FP regs from */ + assert(env->v7m.secure); + + if (!(env->v7m.control[M_REG_S] & R_V7M_CONTROL_SFPA_MASK)) { + return; + } + + /* Check access to the coprocessor is permitted */ + if (!v7m_cpacr_pass(env, true, arm_current_el(env) != 0)) { + raise_exception_ra(env, EXCP_NOCP, 0, 1, GETPC()); + } + + if (env->v7m.fpccr[M_REG_S] & R_V7M_FPCCR_LSPACT_MASK) { + /* State in FP is still valid */ + env->v7m.fpccr[M_REG_S] &= ~R_V7M_FPCCR_LSPACT_MASK; + } else { + bool ts = env->v7m.fpccr[M_REG_S] & R_V7M_FPCCR_TS_MASK; + int i; + uint32_t fpscr; + + if (fptr & 7) { + raise_exception_ra(env, EXCP_UNALIGNED, 0, 1, GETPC()); + } + + for (i = 0; i < (ts ? 32 : 16); i += 2) { + uint32_t slo, shi; + uint64_t dn; + uint32_t faddr = fptr + 4 * i; + + if (i >= 16) { + faddr += 8; /* skip the slot for the FPSCR */ + } + + slo = cpu_ldl_data(env, faddr); + shi = cpu_ldl_data(env, faddr + 4); + + dn = (uint64_t) shi << 32 | slo; + *aa32_vfp_dreg(env, i / 2) = dn; + } + fpscr = cpu_ldl_data(env, fptr + 0x40); + vfp_set_fpscr(env, fpscr); + } + + env->v7m.control[M_REG_S] |= R_V7M_CONTROL_FPCA_MASK; +} + static bool v7m_push_stack(ARMCPU *cpu) { /* Do the "set up stack frame" part of exception entry, diff --git a/target/arm/translate.c b/target/arm/translate.c index 99b38dd5f2b..10bc53f91c6 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -11823,7 +11823,7 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) TCGv_i32 fptr = load_reg(s, rn); if (extract32(insn, 20, 1)) { - /* VLLDM */ + gen_helper_v7m_vlldm(cpu_env, fptr); } else { gen_helper_v7m_vlstm(cpu_env, fptr); }