From: Taylor R Campbell <campbell@mumble.net>
Date: Sat, 19 Jan 2019 21:20:47 +0000 (+0000)
Subject: Fix encoding of ROR and EXTR instructions.
X-Git-Tag: mit-scheme-pucked-10.1.20~11^2~66^2~60
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=462471469ee6d6ad41c8ddd34a3f3ef9a6cea1d7;p=mit-scheme.git

Fix encoding of ROR and EXTR instructions.
---

diff --git a/src/compiler/machines/aarch64/instr2.scm b/src/compiler/machines/aarch64/instr2.scm
index f86ba3796..e0b9b29cd 100644
--- a/src/compiler/machines/aarch64/instr2.scm
+++ b/src/compiler/machines/aarch64/instr2.scm
@@ -293,7 +293,7 @@ USA.
                   (? Rn)
                   ,@(if m=n? '() '((? Rm)))
                   (&U (? s unsigned-5)))
-               (BITS (1 0)              ;sf=0
+               (BITS (1 0)              ;sf=0, 32-bit operand size
                      (2 ,op21)
                      (1 1)
                      (4 #b0011)
@@ -309,12 +309,12 @@ USA.
                   (? Rn)
                   ,@(if m=n? '() '((? Rm)))
                   (&U (? s unsigned-6)))
-               (BITS (1 0)              ;sf=0
+               (BITS (1 1)              ;sf=1, 64-bit operand size
                      (2 ,op21)
                      (1 1)
                      (4 #b0011)
                      (1 1)
-                     (1 0)              ;N, must match sf
+                     (1 1)              ;N, must match sf
                      (1 ,o0)
                      (5 ,(if m=n? 'Rn 'Rm))
                      (6 s)