From patchwork Tue May 30 16:39:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 100721 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp303577qge; Tue, 30 May 2017 09:39:41 -0700 (PDT) X-Received: by 10.223.136.103 with SMTP id e36mr7421998wre.73.1496162381611; Tue, 30 May 2017 09:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496162381; cv=none; d=google.com; s=arc-20160816; b=uiOTDHL0eunK47R2BG9yMRPJSjvbgQAhmqU6XIr0lMY1TjQDUX/08UNV3znwI+cDSH 96/q87m1MZTe2FYPnfIEAWhfh1WFwsJ7CDzuFbgKsBkomu5bCdIOS+YlIRHZAg7lmRol ThUXJTpSa2Ip4hBQ0l1enOHf/lNFV7YN3iKH/gC8HxyOHrehR6u/HXKCDYnUD0o7xdKC CVfx6cWKv/SAb7gn2haxvx9n2mML6S1r8BcrunK1+v2GzFKJP83uZe7sRk04oThzewVj fvRsRVTrVF+YRdbUZ494ifVdmhqvDiro456KqV9juPT++aI2Y5Yi49UPWC8q3InRPSAj vFCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=1+mPTC0gfl4Dj77JrRezfEVP8hz1mVK6Xl85/mHdfcw=; b=BmwKMTZAoFk3ij1/K5B3bMFRuBPDibsRDxYJ/thnRj+Fp+ycCkhah/Xb5XI8QVWNFg 19A1iGdrdFH5wSDHTtAAzpOOGn6SknCjhsYURiuTNc1GTyD/XyTRHNQQ6Fc/6Uzd+X2x pzOjACgVx8DjZ1N7vhnipNsgJCdyTXZL1K8sJJ7isbC12XTTall4mFnmPWYgom/9s5XQ 4zObvX/mD75nKhKhigUtLenDqcgCG5Ahu2Ila785iP7N62QGWxE8VjsjWFCyZYrnC1Kf ZDiS/FjD43BoEy+IgPKOk2ZdG8dSfLOp5OBPzJHc8z7QIwdqOPRgar/7eHeV9T3qTkZH DpjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id n3si15983616wma.60.2017.05.30.09.39.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 May 2017 09:39:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dFkBE-0005PZ-SB; Tue, 30 May 2017 17:39:36 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Nikunj A Dadhania , Sandipan Das , Jose Ricardo Ziviani , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH risu] ppc64.risu: Fix broken constraints Date: Tue, 30 May 2017 17:39:35 +0100 Message-Id: <1496162375-1571-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 Commit c10b97092 changed some field names in rldicr and rldimi patterns but forgot to update the constraints to match the change. Since the field (previously 'rb' and now 'sh') is an immediate rather than a register number, the correct fix is to just delete the constraint since we don't need to avoid particular values. Signed-off-by: Peter Maydell --- ppc64.risu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/ppc64.risu b/ppc64.risu index dd304e2..e2fd4f6 100644 --- a/ppc64.risu +++ b/ppc64.risu @@ -1473,17 +1473,17 @@ RLDICLd PPC64LE 011110 rs:5 ra:5 sh:5 mb:6 000 sha:1 1 \ # format:MD book:I page:105 PPC SR rldicr[.] Rotate Left Dword Immediate then Clear Right RLDICR PPC64LE 011110 rs:5 ra:5 sh:5 me:6 001 sha:1 0 \ -!constraints { $rs != 1 && $ra != 1 && $rb != 1 && $rs != 13 && $ra != 13 && $rb != 13; } +!constraints { $rs != 1 && $ra != 1 && $rs != 13 && $ra != 13; } # format:MD book:I page:105 PPC SR rldicr[.] Rotate Left Dword Immediate then Clear Right RLDICRd PPC64LE 011110 rs:5 ra:5 sh:5 me:6 001 sha:1 1 \ -!constraints { $rs != 1 && $ra != 1 && $rb != 1 && $rs != 13 && $ra != 13 && $rb != 13; } +!constraints { $rs != 1 && $ra != 1 && $rs != 13 && $ra != 13; } # format:MD book:I page:105 PPC SR rldimi[.] Rotate Left Dword Immediate then Mask Insert RLDIMI PPC64LE 011110 rs:5 ra:5 sh:5 me:6 011 sha:1 0 \ -!constraints { $rs != 1 && $ra != 1 && $rb != 1 && $rs != 13 && $ra != 13 && $rb != 13; } +!constraints { $rs != 1 && $ra != 1 && $rs != 13 && $ra != 13; } # format:MD book:I page:105 PPC SR rldimi[.] Rotate Left Dword Immediate then Mask Insert RLDIMId PPC64LE 011110 rs:5 ra:5 sh:5 me:6 011 sha:1 1 \ -!constraints { $rs != 1 && $ra != 1 && $rb != 1 && $rs != 13 && $ra != 13 && $rb != 13; } +!constraints { $rs != 1 && $ra != 1 && $rs != 13 && $ra != 13; } # format:M book:I page:102 v:P1 SR rlwimi[.] Rotate Left Word Immediate then Mask Insert RLWIMI PPC64LE 010100 rs:5 ra:5 sh:5 mb:5 me:5 0 \