From nobody Thu Dec 18 19:31:45 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154782476022982.83111875828945; Fri, 18 Jan 2019 07:19:20 -0800 (PST) Received: from localhost ([127.0.0.1]:41280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVvT-0002f1-5W for importer@patchew.org; Fri, 18 Jan 2019 10:19:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVbU-0002lR-1Q for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkVbS-0007Ml-KH for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:39 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39355) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkVbS-0007AC-B8 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:38 -0500 Received: by mail-wr1-x432.google.com with SMTP id t27so15421308wra.6 for ; Fri, 18 Jan 2019 06:58:20 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:19 -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=WURCN/Q3C9zq14X2sVexVzUEUVxOkuyTAKSkSnCOxXE=; b=Kl3kqAZqBVBmPWDruSAB5hadrCJOXZ2GgYALVe+qqBp7Ba7GP7akcGHHX8zy/y/b93 zWRC6+07l58hr6t84qmqaQH/mGoqVI3zxvtpYcV/cO3KqqwpNUPYc+N0cQpRu+xD+rPd bB8TozseQNrcQD9d8OBz1Zh04+rNHnDog5d98= 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=WURCN/Q3C9zq14X2sVexVzUEUVxOkuyTAKSkSnCOxXE=; b=Psqg6RM/LKVbdKWCV5m+Y+0KslrgwP8clG6zQ1u72miHR77E1lZhgf6ZSaTzb3Uy8S dRZRSt6+/vYkQkyO+2+h1v0w0PU6+O3sNvX6wi2QY/y0eqzDDlELBDN/L8jor3cPwqqA wOl2YqO2X5wuOmXKLWiEYTQaUJyQahWzWr6gXWHVmOGT3ZLiXfR9NnwXX0Nv/ehHGGkr 8EUOvgc+KWKfjhiKU1eoqqM/7/W/peDJdlaMgCh5COjRrjt8ddD1Vj+ckXOzJJA9wyZI XWCDmHraF6asa65FE3t7KFfpIWfDEdR2BxtMKcolcqIXM2ASn2ItXjKK+9zeShjuXVo+ HIyw== X-Gm-Message-State: AJcUukf7pLky3K2x90huOIhJNUKLa/r8yQFQ9E/Sth+A5LW0S9AQENQG IKu6clasBd64mooxasQDSzLflf1UJiGo4Q== X-Google-Smtp-Source: ALg8bN5BeUUa7YEKvFN9zLdHld3u2lB9Go0MBdH72QlcUUUxHWe2lw5HqIN/d87Hz/oASXEYl3WrVw== X-Received: by 2002:adf:d243:: with SMTP id o3mr17465432wri.66.1547823499684; Fri, 18 Jan 2019 06:58:19 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:27 +0000 Message-Id: <20190118145805.6852-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PULL 11/49] target/arm: Rearrange decode in disas_data_proc_1src 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Richard Henderson Now properly signals unallocated for REV64 with SF=3D0. Allows for the opcode2 field to be decoded shortly. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20190108223129.5570-8-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index b72aea3e974..dac61a3c3a5 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -4563,38 +4563,51 @@ static void handle_rev16(DisasContext *s, unsigned = int sf, */ static void disas_data_proc_1src(DisasContext *s, uint32_t insn) { - unsigned int sf, opcode, rn, rd; + unsigned int sf, opcode, opcode2, rn, rd; =20 - if (extract32(insn, 29, 1) || extract32(insn, 16, 5)) { + if (extract32(insn, 29, 1)) { unallocated_encoding(s); return; } =20 sf =3D extract32(insn, 31, 1); opcode =3D extract32(insn, 10, 6); + opcode2 =3D extract32(insn, 16, 5); rn =3D extract32(insn, 5, 5); rd =3D extract32(insn, 0, 5); =20 - switch (opcode) { - case 0: /* RBIT */ +#define MAP(SF, O2, O1) ((SF) | (O1 << 1) | (O2 << 7)) + + switch (MAP(sf, opcode2, opcode)) { + case MAP(0, 0x00, 0x00): /* RBIT */ + case MAP(1, 0x00, 0x00): handle_rbit(s, sf, rn, rd); break; - case 1: /* REV16 */ + case MAP(0, 0x00, 0x01): /* REV16 */ + case MAP(1, 0x00, 0x01): handle_rev16(s, sf, rn, rd); break; - case 2: /* REV32 */ + case MAP(0, 0x00, 0x02): /* REV/REV32 */ + case MAP(1, 0x00, 0x02): handle_rev32(s, sf, rn, rd); break; - case 3: /* REV64 */ + case MAP(1, 0x00, 0x03): /* REV64 */ handle_rev64(s, sf, rn, rd); break; - case 4: /* CLZ */ + case MAP(0, 0x00, 0x04): /* CLZ */ + case MAP(1, 0x00, 0x04): handle_clz(s, sf, rn, rd); break; - case 5: /* CLS */ + case MAP(0, 0x00, 0x05): /* CLS */ + case MAP(1, 0x00, 0x05): handle_cls(s, sf, rn, rd); break; + default: + unallocated_encoding(s); + break; } + +#undef MAP } =20 static void handle_div(DisasContext *s, bool is_signed, unsigned int sf, --=20 2.20.1