From patchwork Tue Feb 25 14:39:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1244333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=nid8GJYA; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RhRR66zGz9sQt for ; Wed, 26 Feb 2020 01:40:02 +1100 (AEDT) Received: from localhost ([::1]:57996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bNO-00017V-Qj for incoming@patchwork.ozlabs.org; Tue, 25 Feb 2020 09:39:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50645) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bMx-000178-AT for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:39:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bMt-0005Wv-8g for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:39:31 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6bMt-0005VQ-1I for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:39:27 -0500 Received: by mail-wr1-x442.google.com with SMTP id l5so10774913wrx.4 for ; Tue, 25 Feb 2020 06:39:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CxC7+57klu/2mln+X9DRHhYMcaLTR/a8a6mDU1Kkwh0=; b=nid8GJYAJPYBPm/sS1dx1DsWD7C33KyCs1UYpq/bGeHkJz2ohx55kYP6MoXAx/BfDD z22K2c68MTFWY/PHKVJAo6uKWVPNnDe4TlnYTRiH0M8F+BJkj2Tt2JwgdsLZK0UBUL4y 9szs8FDdtVH0lkl2VeGbZBA0PcgUkX28PklCZncEnqPnf4AAOXTFCKx27Hp25TWmwxi8 3DNJ7H5WSOaBcVfqfb3cpORSUJ0UMlvDVMmpgnW5TLruY10o9kH+Z+AWlIHFYPTo5qIc M3L1E7bXZXShVFoXfrzv7Qri7bMVL4+UTx7Y1qvRzd5WxYuHnt9kkiTuU1/k5v7ukUOq XbeQ== 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:mime-version :content-transfer-encoding; bh=CxC7+57klu/2mln+X9DRHhYMcaLTR/a8a6mDU1Kkwh0=; b=bYE3SYhbGncOT6U6USjLquHjxHpDKEEWTdTYLOupI3u82MYNug+zcJ/6X4yz1N2A6v ZqeInllLFi+4zqfQos82ReMXUgiOZNo2Taj0bKwxaVvYyEk07BKYM9g1DRQMY7G92nzN 8YzW52EC3UuUbhGC+UpO2cRJcKFGhfD8oDKQMXif8T8GKKHMZiFQiIIAxYB7sJ1Jg8UT zOts7CzsPzci5EMTkpTQSziThJVpWswuNUQL9ey4PiezdMMcijG4YaaHXnpM7AUbtxmD 5960VkH/wVNPSf4WVJdzneggHuwcsG4k64nDr725m0Nh1K6R8ufaz10BeQKP3cv+VGu7 uM8w== X-Gm-Message-State: APjAAAWDIzyqMaaDk8Gdis1Dy2YMv4gNWTfYQcrxmV7HFIHFYag1ISX4 xbPdNxaqVRWZ0p6QxsaZkza5ZA== X-Google-Smtp-Source: APXvYqwU4yLh/xJKjVASihiQSNbsM8wOJz7/8WYgkpIVwqsMHUF+1qKnjy77ISI080QbkY4waVrv5g== X-Received: by 2002:adf:a50b:: with SMTP id i11mr1369390wrb.60.1582641565849; Tue, 25 Feb 2020 06:39:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w8sm4388820wmm.0.2020.02.25.06.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 06:39:25 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH RISU] aarch64.risu: Add patterns for v8.3-RCPC and v8.4-RCPC insns Date: Tue, 25 Feb 2020 14:39:23 +0000 Message-Id: <20200225143923.22297-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 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::442 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add patterns for the new instructions in the v8.3-RCPC and v8.4-RCPC extensions. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée --- This is what I used for testing the RCPC QEMU patches I sent out the other day. Did I get the @ section syntax here right? aarch64.risu | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/aarch64.risu b/aarch64.risu index c4eda7a..8f08cd0 100644 --- a/aarch64.risu +++ b/aarch64.risu @@ -3019,3 +3019,35 @@ SM3TT2B A64_V 1100 1110 010 rm:5 10 imm:2 11 rn:5 rd:5 XAR A64_V 1100 1110 100 rm:5 imm:6 rn:5 rd:5 @ + +# v8.3-RCPC instructions +@v8_3_rcpc + +# LDAPR, LDAPRH, LDAPRB +# As usual, the $rn != $rt constraint is risu-imposed, not architectural +LDAPR A64 sz:2 111000 101 11111 1100 00 rn:5 rt:5 \ +!constraints { $rn != 31 && $rn != $rt } \ +!memory { align(1 << $sz); reg_plus_imm($rn, 0); } + +@ + +# v8.4-RCPC instructions +# As usual, the $rn != $rt constraint is risu-imposed, not architectural +@v8_4_rcpc +STLUR A64 sz:2 011001 00 0 imm:9 00 rn:5 rt:5 \ +!constraints { $rn != 31 && $rn != $rt } \ +!memory { align(1 << $sz); reg_plus_imm($rn, $imm); } + +LDAPUR A64 sz:2 011001 01 0 imm:9 00 rn:5 rt:5 \ +!constraints { $rn != 31 && $rn != $rt } \ +!memory { align(1 << $sz); reg_plus_imm($rn, $imm); } + +LDAPURS64 A64 sz:2 011001 10 0 imm:9 00 rn:5 rt:5 \ +!constraints { $rn != 31 && $rn != $rt && $sz != 3 } \ +!memory { align(1 << $sz); reg_plus_imm($rn, $imm); } + +LDAPURS32 A64 sz:2 011001 11 0 imm:9 00 rn:5 rt:5 \ +!constraints { $rn != 31 && $rn != $rt && $sz < 2 } \ +!memory { align(1 << $sz); reg_plus_imm($rn, $imm); } + +@