From patchwork Fri Jul 26 17:49:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 169901 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp361160ilk; Fri, 26 Jul 2019 10:59:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKGuyfLlL0oLAGFPQaFVqwKpsqLtrFaqIJV69tLjgdrKSwiZdozNIVE7LnUMW8M7x3vpQx X-Received: by 2002:a37:9c94:: with SMTP id f142mr57365173qke.427.1564163951297; Fri, 26 Jul 2019 10:59:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564163951; cv=none; d=google.com; s=arc-20160816; b=MTALTF7VICoy1YsmPZG9KDnnS4Y0mDIhiHQ++kTAT8Ptqd9ucC8GV4PqOh8aC+rVoD KvCupSAKc9tkXR8KszViIPGOb4rf6B6q/VywMwATLnW8CIyPWXTGvbiIYet2Aghzp8xv jbPdUmx3cM3fUy+DwYVY/Zn9O8mYoCpgZOLAr/+uupKKAd3u8rhXdrL9kC0H4Zq4zLPU UVeR2BnNVr1EhG2tV+hhO9VJuW4PGT/enXR+5/dbLrG2eO0+79Rr/MG9NDgMCO6qXYSh 2fTHrSqv8fUS0aRP5ft+s+e++TyLeQ57MVEGOT/QkHjEgGD74pmP1YARSZ1pWEgQksMB BenA== 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=VzkvUsUZh9EVbOcurylb0EvE0t9ji9eIajoY1fu0OlU=; b=pshfqFh7/+G7b7j36hn1YRnsqAviskp9JTURS2TyNIb8hMOOzEH1/GnEDVX7+YsyqY JOVxhaNN+cFx3D9l2Oz0Y+W8ijve4Tg1NgB/pMh1u/IAL0EghwxoTeVg6ET8pr8si5Tr Gtn+e6rWHDLQo555kT7jp4TT0wjBovSU77nN5GDpRv9EFS5rXJx5/WhzFPuZQn9ilYW3 mqaySzJ3naxzBs15ucbb27j7yivqgr5kXvpB+MDDO+VgokBAxNijoiXer/ZAC4lsm8pT QEdZJzLSjHsTkW56SbEFx12vBr9/r2Oyh8RkaQ0JIPDVPjWijdTDWcCUVEyExgQyREhR uY9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JTiaH8qg; 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 i7si30642970qkl.262.2019.07.26.10.59.11 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jul 2019 10:59:11 -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=JTiaH8qg; 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 ([::1]:42514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4Uk-0003Ys-Ax for patch@linaro.org; Fri, 26 Jul 2019 13:59:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58513) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4NJ-0004ht-ED for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr4NF-0000P8-P1 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:24 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:33288) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hr4NF-0000Fa-EK for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:21 -0400 Received: by mail-pl1-x633.google.com with SMTP id c14so24959377plo.0 for ; Fri, 26 Jul 2019 10:51:15 -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=VzkvUsUZh9EVbOcurylb0EvE0t9ji9eIajoY1fu0OlU=; b=JTiaH8qg13W5L7ZBXSUJXBfgCem9ARL1uiQFgjSz3GSsuW+K63GFGoVMb1eXI/kHqS j5hIjUWGgN1EPPkz2rr1n64pKilRQCsxioGELbw3wawI+4wddJNXnP1nhoWD8pNmyV+C mNdpGdJaP81pZoxCI7PxFV7p6yVbbTITfQIw2go7rFoCe9x7xUaeBIACssl/3OzYWVCu ZY+9QXhV0w6pPtg4I9FY8QkZLOQp4g2sbKK8TBKlGAtn5myrOZEnDGIg/POrKhl92QWA 8lj0WeCyZz+FbWjo0mJ9pL4EKimeh8qPjin+JDCX8JxUhY/7WK2QK+16mujg8FbpX1GH n4lA== 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=VzkvUsUZh9EVbOcurylb0EvE0t9ji9eIajoY1fu0OlU=; b=gxUILojchfA4QTkL5IoKzKIYUB9Z9AgrWExrmVNdHBgvTdHTGzZRW9UfcOHGtALPIy Jbbs7TyUmp8TtU9ogHOrIh0YPcWOlYCG5tlITIfIr6gM2j7pa44Jxrh1loxx3yh8gfkk LJ7Wv2fRLMb2dmwEKdEC4kEMleLblM92oPUDZFgDoa8b7wnNSsUkjGb4b2HM8OudE2hy JKy4/DS/0BD9GhBn2rqxOhGlPCzC9teFVWD4LplzVBstohx5xBDOUZEPuFinDLf7kUji 6NzWp0LUF9VTB33ztJTu0p3Yhln1waqrtYVlwTkpIOdly2LEQWJ7RD2w12+rJXl36qQQ HeRQ== X-Gm-Message-State: APjAAAUlzJkIcwHKfKOSAABC5Z88Fz7zHTdhpiU+QKsPB7Ez1IlcNsQZ F/YXys8mHQEGZ8AXrY7wtA2idnrn7w8= X-Received: by 2002:a17:902:aa83:: with SMTP id d3mr94715985plr.74.1564163473666; Fri, 26 Jul 2019 10:51:13 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id o24sm104287919pfp.135.2019.07.26.10.51.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 10:51:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 10:49:58 -0700 Message-Id: <20190726175032.6769-34-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726175032.6769-1-richard.henderson@linaro.org> References: <20190726175032.6769-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::633 Subject: [Qemu-devel] [PATCH 33/67] target/arm: Convert Clear-Exclusive, Barriers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/translate.c | 122 +++++++++++++++-------------------- target/arm/a32-uncond.decode | 10 +++ target/arm/t32.decode | 10 +++ 3 files changed, 73 insertions(+), 69 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index b43b344f96..797e8f7344 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10049,6 +10049,58 @@ static bool trans_SRS(DisasContext *s, arg_SRS *a) return true; } +/* + * Clear-Exclusive, Barriers + */ + +static bool trans_CLREX(DisasContext *s, arg_CLREX *a) +{ + if (!ENABLE_ARCH_6K) { + return false; + } + gen_clrex(s); + return true; +} + +static bool trans_DSB(DisasContext *s, arg_DSB *a) +{ + if (!s->thumb && !ENABLE_ARCH_7) { + return false; + } + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + return true; +} + +static bool trans_DMB(DisasContext *s, arg_DMB *a) +{ + return trans_DSB(s, NULL); +} + +static bool trans_ISB(DisasContext *s, arg_ISB *a) +{ + /* + * We need to break the TB after this insn to execute + * self-modifying code correctly and also to take + * any pending interrupts immediately. + */ + gen_goto_tb(s, 0, s->pc & ~1); + return true; +} + +static bool trans_SB(DisasContext *s, arg_SB *a) +{ + if (!dc_isar_feature(aa32_sb, s)) { + return false; + } + /* + * 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 true; +} + /* * Legacy decoder. */ @@ -10142,38 +10194,6 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) s->base.is_jmp = DISAS_UPDATE; } return; - } else if ((insn & 0x0fffff00) == 0x057ff000) { - switch ((insn >> 4) & 0xf) { - case 1: /* clrex */ - ARCH(6K); - gen_clrex(s); - return; - case 4: /* dsb */ - case 5: /* dmb */ - ARCH(7); - tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); - return; - case 6: /* isb */ - /* We need to break the TB after this insn to execute - * self-modifying code correctly and also to take - * any pending interrupts immediately. - */ - 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; - } } else if ((insn & 0x0e000f00) == 0x0c000100) { if (arm_dc_feature(s, ARM_FEATURE_IWMMXT)) { /* iWMMXt register transfer. */ @@ -10636,43 +10656,7 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) gen_set_psr_im(s, offset, 0, imm); } break; - case 3: /* Special control operations. */ - if (!arm_dc_feature(s, ARM_FEATURE_V7) && - !arm_dc_feature(s, ARM_FEATURE_M)) { - goto illegal_op; - } - op = (insn >> 4) & 0xf; - switch (op) { - case 2: /* clrex */ - gen_clrex(s); - break; - case 4: /* dsb */ - case 5: /* dmb */ - tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); - break; - case 6: /* isb */ - /* We need to break the TB after this insn - * to execute self-modifying code correctly - * and also to take any pending interrupts - * immediately. - */ - 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; - } - break; + case 3: /* Special control operations, in decodetree */ case 4: /* bxj, in decodetree */ case 5: /* eret, in decodetree */ case 6: /* MRS, in decodetree */ diff --git a/target/arm/a32-uncond.decode b/target/arm/a32-uncond.decode index 3b961233e5..b077958cec 100644 --- a/target/arm/a32-uncond.decode +++ b/target/arm/a32-uncond.decode @@ -22,6 +22,7 @@ # All of those that have a COND field in insn[31:28] are in a32.decode # +&empty !extern &i !extern imm # Branch with Link and Exchange @@ -37,3 +38,12 @@ BLX_i 1111 101 . ........................ &i imm=%imm24h RFE 1111 100 pu:2 0 w:1 1 rn:4 0000 1010 0000 0000 &rfe SRS 1111 110 pu:2 1 w:1 0 1101 0000 0101 000 mode:5 &srs + +# Clear-Exclusive, Barriers + +# QEMU does not require the option field for the barriers. +CLREX 1111 0101 0111 1111 1111 0000 0001 1111 +DSB 1111 0101 0111 1111 1111 0000 0100 ---- +DMB 1111 0101 0111 1111 1111 0000 0101 ---- +ISB 1111 0101 0111 1111 1111 0000 0110 ---- +SB 1111 0101 0111 1111 1111 0000 0111 0000 diff --git a/target/arm/t32.decode b/target/arm/t32.decode index 26b51c3bb2..9fe1500fe0 100644 --- a/target/arm/t32.decode +++ b/target/arm/t32.decode @@ -306,6 +306,16 @@ CLZ 1111 1010 1011 ---- 1111 .... 1000 .... @rdm # of the space is "reserved hint, behaves as nop". NOP 1111 0011 1010 1111 1000 0000 ---- ---- } + + # Miscelaneous control + { + CLREX 1111 0011 1011 1111 1000 1111 0010 1111 + DSB 1111 0011 1011 1111 1000 1111 0100 ---- + DMB 1111 0011 1011 1111 1000 1111 0101 ---- + ISB 1111 0011 1011 1111 1000 1111 0110 ---- + SB 1111 0011 1011 1111 1000 1111 0111 0000 + } + # Note that the v7m insn overlaps both the normal and banked insn. { MRS_bank 1111 0011 111 r:1 .... 1000 rd:4 001. 0000 \