From nobody Tue Feb 10 12:13:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1567020890; cv=none; d=zoho.com; s=zohoarc; b=XLb64JVry6/WgycuUOOxGVogL7YizH3C3J/o7bMZfYx6ETlll1FFdz7RCBC3f0PTP6hTdAjLRYjtklxXYrmH2VUZrSzVvSziV601BUe5PB2wXiH/0R9IBXWcOBhunM6PNR0Exq3bMMhlQPmYIUDi7haDrPASDxNbdg5zGp4CfnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567020890; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ZPbSh9zJCU6tFB8sqkv7S5LslxkLSpT7ZOLVU6IYp00=; b=SzXrqCSdi9P6qynmBc0Tvk4mn7dBVClvexipBQ9cEmB3rqocjDfwJYYgZH3darwzU8Heu70FJqkrje/y6aYqRiZiePnT03w1U2R0SGpJ9FrRjsJormz7s6kgXeRXZT8EjDetejPd95+nomiTj9kLFimdJQmjmpiZGghjVdDuxnQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1567020890591584.6724861988907; Wed, 28 Aug 2019 12:34:50 -0700 (PDT) Received: from localhost ([::1]:41354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33iS-000675-CV for importer@patchew.org; Wed, 28 Aug 2019 15:34:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37864) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33G8-0003Wr-6L for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33G6-0000AR-5c for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:32 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:41376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33G5-00009y-Na for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:30 -0400 Received: by mail-pl1-x641.google.com with SMTP id m9so390610pls.8 for ; Wed, 28 Aug 2019 12:05:29 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f27sm2967944pgm.60.2019.08.28.12.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:05:27 -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=ZPbSh9zJCU6tFB8sqkv7S5LslxkLSpT7ZOLVU6IYp00=; b=ekb03WIJpECk2/qIFh9O+7RE8shJjCiDjcwFSzkQDbLsmEut/DxTEoPuBd+FDCIUk/ BiMhjpSFbd3ue5/xCMQjyAIoze8Z90CpkhpM6jlkf0Z4MwIXimVm6/mh26+HJdeYJWK9 g3ejcbBopJQMpt3XibmsHRESKPmRQPjrQuDgO4Xhl3yNYNEHF3D1Zt7qfpQkTPA2Xavl ygzipBBBZo/Jl4G+kl+/0M4baog+Z18mdj6xhuIZXxRzUnu6JLrKGawffbhG7Hsxs9b+ kjMBGHHBCc33AEdiPAWHw/7xWJggsJ7DrQyQ98A2TcpF5O4lQfxXr8QcvfnA6ESJFpeJ m3Sg== 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=ZPbSh9zJCU6tFB8sqkv7S5LslxkLSpT7ZOLVU6IYp00=; b=ID7g0To6YutD14fpVsacxSXnvCn02nPL3t2FMmrIQyDL3WNzwm2+8HrswU7tzwa6sU y4BjqqIt7Q4fimwREx48Qs+JHd0BMSHrAsXX355GWDu3Kj5bRaURoCBInzKd5xpafNNG nEz6PevkJekZOHYDOYrau7R4xAZibex3Pnjrvke2qJhucK/XiRSzLSRAl71NWvrbED5O Q1SwiwLQmqnTnBP34fjnK/HznWgx6pVkogxnXvEe08MzZIm9OBfzd1F32/nYafwsBpsW jBmWTVGFyjaJD0KdRI1cK/BiY5ocs7MTwMSys8AlsbOv8ZHOIF8RqKS1FVApp1UgQ33l 6TeQ== X-Gm-Message-State: APjAAAVF0GNuSSFMHZ/530KcSwykXpQT0J2/76eElh4r90wI0A8pGtk7 dCcoHfiZQ8vAL6aX+2nrNdeWNet3byU= X-Google-Smtp-Source: APXvYqx7o3jc8bZEgg/+0ckrlp9GlIibgtOUbDa5DvQd2eXgV5Ob0PUk78iBBu7tViJ+0QVbiWRMYQ== X-Received: by 2002:a17:902:d906:: with SMTP id c6mr5633124plz.13.1567019128062; Wed, 28 Aug 2019 12:05:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:09 -0700 Message-Id: <20190828190456.30315-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828190456.30315-1-richard.henderson@linaro.org> References: <20190828190456.30315-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::641 Subject: [Qemu-devel] [PATCH v3 22/69] target/arm: Diagnose UNPREDICTABLE ldrex/strex cases 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/translate.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 10ec976bd9..3f61916ff9 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8886,6 +8886,18 @@ static bool op_strex(DisasContext *s, arg_STREX *a, = TCGMemOp mop, bool rel) { TCGv_i32 addr; =20 + /* We UNDEF for these UNPREDICTABLE cases. */ + if (a->rd =3D=3D 15 || a->rn =3D=3D 15 || a->rt =3D=3D 15 + || a->rd =3D=3D a->rn || a->rd =3D=3D a->rt + || (s->thumb && (a->rd =3D=3D 13 || a->rt =3D=3D 13)) + || (mop =3D=3D MO_64 + && (a->rt2 =3D=3D 15 + || a->rd =3D=3D a->rt2 || a->rt =3D=3D a->rt2 + || (s->thumb && a->rt2 =3D=3D 13)))) { + unallocated_encoding(s); + return true; + } + if (rel) { tcg_gen_mb(TCG_MO_ALL | TCG_BAR_STRL); } @@ -8912,6 +8924,7 @@ static bool trans_STREXD_a32(DisasContext *s, arg_STR= EX *a) if (!ENABLE_ARCH_6K) { return false; } + /* We UNDEF for these UNPREDICTABLE cases. */ if (a->rt & 1) { unallocated_encoding(s); return true; @@ -8954,6 +8967,7 @@ static bool trans_STLEXD_a32(DisasContext *s, arg_STR= EX *a) if (!ENABLE_ARCH_8) { return false; } + /* We UNDEF for these UNPREDICTABLE cases. */ if (a->rt & 1) { unallocated_encoding(s); return true; @@ -8993,8 +9007,13 @@ static bool op_stl(DisasContext *s, arg_STL *a, TCGM= emOp mop) if (!ENABLE_ARCH_8) { return false; } - addr =3D load_reg(s, a->rn); + /* We UNDEF for these UNPREDICTABLE cases. */ + if (a->rn =3D=3D 15 || a->rt =3D=3D 15) { + unallocated_encoding(s); + return true; + } =20 + addr =3D load_reg(s, a->rn); tmp =3D load_reg(s, a->rt); tcg_gen_mb(TCG_MO_ALL | TCG_BAR_STRL); gen_aa32_st_i32(s, tmp, addr, get_mem_index(s), mop | s->be_data); @@ -9024,6 +9043,16 @@ static bool op_ldrex(DisasContext *s, arg_LDREX *a, = TCGMemOp mop, bool acq) { TCGv_i32 addr; =20 + /* We UNDEF for these UNPREDICTABLE cases. */ + if (a->rn =3D=3D 15 || a->rt =3D=3D 15 + || (s->thumb && a->rt =3D=3D 13) + || (mop =3D=3D MO_64 + && (a->rt2 =3D=3D 15 || a->rt =3D=3D a->rt2 + || (s->thumb && a->rt2 =3D=3D 13)))) { + unallocated_encoding(s); + return true; + } + addr =3D tcg_temp_local_new_i32(); load_reg_var(s, addr, a->rn); tcg_gen_addi_i32(addr, addr, a->imm); @@ -9050,6 +9079,7 @@ static bool trans_LDREXD_a32(DisasContext *s, arg_LDR= EX *a) if (!ENABLE_ARCH_6K) { return false; } + /* We UNDEF for these UNPREDICTABLE cases. */ if (a->rt & 1) { unallocated_encoding(s); return true; @@ -9092,6 +9122,7 @@ static bool trans_LDAEXD_a32(DisasContext *s, arg_LDR= EX *a) if (!ENABLE_ARCH_8) { return false; } + /* We UNDEF for these UNPREDICTABLE cases. */ if (a->rt & 1) { unallocated_encoding(s); return true; @@ -9131,8 +9162,13 @@ static bool op_lda(DisasContext *s, arg_LDA *a, TCGM= emOp mop) if (!ENABLE_ARCH_8) { return false; } - addr =3D load_reg(s, a->rn); + /* We UNDEF for these UNPREDICTABLE cases. */ + if (a->rn =3D=3D 15 || a->rt =3D=3D 15) { + unallocated_encoding(s); + return true; + } =20 + addr =3D load_reg(s, a->rn); tmp =3D tcg_temp_new_i32(); gen_aa32_ld_i32(s, tmp, addr, get_mem_index(s), mop | s->be_data); disas_set_da_iss(s, mop, a->rt | ISSIsAcqRel); --=20 2.17.1