Google Git Google Git
Sign in
go/arch/refs/heads/master^!/.
commit
b1b4ab794d606c37fd45a3c92b6eac48a1c4371b
[log]
author
Elliott Olson <elliottolson7@gmail.com>
Sun Oct 18 18:57:56 2026 -0700
committer
Gopher Robot <gobot@golang.org>
Sun Oct 25 16:53:20 2026 -0700
tree
89e3bc7b4b32f04ce58a9b7fcae9274e9e5cb415
parent
2706cbca0310da129d94a0160d18c6e588de03e3 [diff] 
arm/armasm: drop '$' from constant shift counts in GoSyntax

GoSyntax printed shifted register operands with a constant count as
R0<<$28. The Go assembler rejects the '$' there and expects R0<<28,
which is also what it prints itself.

With this change, 682 of the 1084 plan9 test cases in decode.txt
assemble back to the same encoding with cmd/asm, up from 496.

Updates golang/go#23159

Change-Id: Id6b91aeb8521c0fe272cc30b0f69559432085c6b
Reviewed-on: https://go-review.googlesource.com/c/arch/+/850509
Reviewed-by: David Chase <drchase@google.com>
Auto-Submit: David Chase <drchase@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/arm/armasm/plan9x.go b/arm/armasm/plan9x.go
index 842ab98..7ea6930 100644
--- a/arm/armasm/plan9x.go
+++ b/arm/armasm/plan9x.go

@@ -239,7 +239,7 @@
 		return buf.String()
 
 	case RegShift:
-		return fmt.Sprintf("R%d%s$%d", int(a.Reg), plan9Shift[a.Shift], int(a.Count))
+		return fmt.Sprintf("R%d%s%d", int(a.Reg), plan9Shift[a.Shift], int(a.Count))
 
 	case RegShiftReg:
 		return fmt.Sprintf("R%d%sR%d", int(a.Reg), plan9Shift[a.Shift], int(a.RegCount))

diff --git a/arm/armasm/testdata/decode.txt b/arm/armasm/testdata/decode.txt
index 7653ee0..0ce150d 100644
--- a/arm/armasm/testdata/decode.txt
+++ b/arm/armasm/testdata/decode.txt

@@ -324,22 +324,22 @@
 002011e0|	1	plan9	AND.S R0, R1, R2
 001001e0|	1	plan9	AND R0, R1, R1
 001011e0|	1	plan9	AND.S R0, R1, R1
-202e01e0|	1	plan9	AND R0>>$28, R1, R2
-002e01e0|	1	plan9	AND R0<<$28, R1, R2
-402e01e0|	1	plan9	AND R0->$28, R1, R2
-602e01e0|	1	plan9	AND R0@>$28, R1, R2
-202e11e0|	1	plan9	AND.S R0>>$28, R1, R2
-002e11e0|	1	plan9	AND.S R0<<$28, R1, R2
-402e11e0|	1	plan9	AND.S R0->$28, R1, R2
-602e11e0|	1	plan9	AND.S R0@>$28, R1, R2
-001e01e0|	1	plan9	AND R0<<$28, R1, R1
-201e01e0|	1	plan9	AND R0>>$28, R1, R1
-401e01e0|	1	plan9	AND R0->$28, R1, R1
-601e01e0|	1	plan9	AND R0@>$28, R1, R1
-001e11e0|	1	plan9	AND.S R0<<$28, R1, R1
-201e11e0|	1	plan9	AND.S R0>>$28, R1, R1
-401e11e0|	1	plan9	AND.S R0->$28, R1, R1
-601e11e0|	1	plan9	AND.S R0@>$28, R1, R1
+202e01e0|	1	plan9	AND R0>>28, R1, R2
+002e01e0|	1	plan9	AND R0<<28, R1, R2
+402e01e0|	1	plan9	AND R0->28, R1, R2
+602e01e0|	1	plan9	AND R0@>28, R1, R2
+202e11e0|	1	plan9	AND.S R0>>28, R1, R2
+002e11e0|	1	plan9	AND.S R0<<28, R1, R2
+402e11e0|	1	plan9	AND.S R0->28, R1, R2
+602e11e0|	1	plan9	AND.S R0@>28, R1, R2
+001e01e0|	1	plan9	AND R0<<28, R1, R1
+201e01e0|	1	plan9	AND R0>>28, R1, R1
+401e01e0|	1	plan9	AND R0->28, R1, R1
+601e01e0|	1	plan9	AND R0@>28, R1, R1
+001e11e0|	1	plan9	AND.S R0<<28, R1, R1
+201e11e0|	1	plan9	AND.S R0>>28, R1, R1
+401e11e0|	1	plan9	AND.S R0->28, R1, R1
+601e11e0|	1	plan9	AND.S R0@>28, R1, R1
 103102e0|	1	plan9	AND R0<<R1, R2, R3
 303102e0|	1	plan9	AND R0>>R1, R2, R3
 503102e0|	1	plan9	AND R0->R1, R2, R3
@@ -368,22 +368,22 @@
 002031e0|	1	plan9	EOR.S R0, R1, R2
 001021e0|	1	plan9	EOR R0, R1, R1
 001031e0|	1	plan9	EOR.S R0, R1, R1
-202e21e0|	1	plan9	EOR R0>>$28, R1, R2
-002e21e0|	1	plan9	EOR R0<<$28, R1, R2
-402e21e0|	1	plan9	EOR R0->$28, R1, R2
-602e21e0|	1	plan9	EOR R0@>$28, R1, R2
-202e31e0|	1	plan9	EOR.S R0>>$28, R1, R2
-002e31e0|	1	plan9	EOR.S R0<<$28, R1, R2
-402e31e0|	1	plan9	EOR.S R0->$28, R1, R2
-602e31e0|	1	plan9	EOR.S R0@>$28, R1, R2
-001e21e0|	1	plan9	EOR R0<<$28, R1, R1
-201e21e0|	1	plan9	EOR R0>>$28, R1, R1
-401e21e0|	1	plan9	EOR R0->$28, R1, R1
-601e21e0|	1	plan9	EOR R0@>$28, R1, R1
-001e31e0|	1	plan9	EOR.S R0<<$28, R1, R1
-201e31e0|	1	plan9	EOR.S R0>>$28, R1, R1
-401e31e0|	1	plan9	EOR.S R0->$28, R1, R1
-601e31e0|	1	plan9	EOR.S R0@>$28, R1, R1
+202e21e0|	1	plan9	EOR R0>>28, R1, R2
+002e21e0|	1	plan9	EOR R0<<28, R1, R2
+402e21e0|	1	plan9	EOR R0->28, R1, R2
+602e21e0|	1	plan9	EOR R0@>28, R1, R2
+202e31e0|	1	plan9	EOR.S R0>>28, R1, R2
+002e31e0|	1	plan9	EOR.S R0<<28, R1, R2
+402e31e0|	1	plan9	EOR.S R0->28, R1, R2
+602e31e0|	1	plan9	EOR.S R0@>28, R1, R2
+001e21e0|	1	plan9	EOR R0<<28, R1, R1
+201e21e0|	1	plan9	EOR R0>>28, R1, R1
+401e21e0|	1	plan9	EOR R0->28, R1, R1
+601e21e0|	1	plan9	EOR R0@>28, R1, R1
+001e31e0|	1	plan9	EOR.S R0<<28, R1, R1
+201e31e0|	1	plan9	EOR.S R0>>28, R1, R1
+401e31e0|	1	plan9	EOR.S R0->28, R1, R1
+601e31e0|	1	plan9	EOR.S R0@>28, R1, R1
 103122e0|	1	plan9	EOR R0<<R1, R2, R3
 303122e0|	1	plan9	EOR R0>>R1, R2, R3
 503122e0|	1	plan9	EOR R0->R1, R2, R3
@@ -412,22 +412,22 @@
 002091e1|	1	plan9	ORR.S R0, R1, R2
 001081e1|	1	plan9	ORR R0, R1, R1
 001091e1|	1	plan9	ORR.S R0, R1, R1
-202e81e1|	1	plan9	ORR R0>>$28, R1, R2
-002e81e1|	1	plan9	ORR R0<<$28, R1, R2
-402e81e1|	1	plan9	ORR R0->$28, R1, R2
-602e81e1|	1	plan9	ORR R0@>$28, R1, R2
-202e91e1|	1	plan9	ORR.S R0>>$28, R1, R2
-002e91e1|	1	plan9	ORR.S R0<<$28, R1, R2
-402e91e1|	1	plan9	ORR.S R0->$28, R1, R2
-602e91e1|	1	plan9	ORR.S R0@>$28, R1, R2
-001e81e1|	1	plan9	ORR R0<<$28, R1, R1
-201e81e1|	1	plan9	ORR R0>>$28, R1, R1
-401e81e1|	1	plan9	ORR R0->$28, R1, R1
-601e81e1|	1	plan9	ORR R0@>$28, R1, R1
-001e91e1|	1	plan9	ORR.S R0<<$28, R1, R1
-201e91e1|	1	plan9	ORR.S R0>>$28, R1, R1
-401e91e1|	1	plan9	ORR.S R0->$28, R1, R1
-601e91e1|	1	plan9	ORR.S R0@>$28, R1, R1
+202e81e1|	1	plan9	ORR R0>>28, R1, R2
+002e81e1|	1	plan9	ORR R0<<28, R1, R2
+402e81e1|	1	plan9	ORR R0->28, R1, R2
+602e81e1|	1	plan9	ORR R0@>28, R1, R2
+202e91e1|	1	plan9	ORR.S R0>>28, R1, R2
+002e91e1|	1	plan9	ORR.S R0<<28, R1, R2
+402e91e1|	1	plan9	ORR.S R0->28, R1, R2
+602e91e1|	1	plan9	ORR.S R0@>28, R1, R2
+001e81e1|	1	plan9	ORR R0<<28, R1, R1
+201e81e1|	1	plan9	ORR R0>>28, R1, R1
+401e81e1|	1	plan9	ORR R0->28, R1, R1
+601e81e1|	1	plan9	ORR R0@>28, R1, R1
+001e91e1|	1	plan9	ORR.S R0<<28, R1, R1
+201e91e1|	1	plan9	ORR.S R0>>28, R1, R1
+401e91e1|	1	plan9	ORR.S R0->28, R1, R1
+601e91e1|	1	plan9	ORR.S R0@>28, R1, R1
 103182e1|	1	plan9	ORR R0<<R1, R2, R3
 303182e1|	1	plan9	ORR R0>>R1, R2, R3
 503182e1|	1	plan9	ORR R0->R1, R2, R3
@@ -456,22 +456,22 @@
 002051e0|	1	plan9	SUB.S R0, R1, R2
 001041e0|	1	plan9	SUB R0, R1, R1
 001051e0|	1	plan9	SUB.S R0, R1, R1
-202e41e0|	1	plan9	SUB R0>>$28, R1, R2
-002e41e0|	1	plan9	SUB R0<<$28, R1, R2
-402e41e0|	1	plan9	SUB R0->$28, R1, R2
-602e41e0|	1	plan9	SUB R0@>$28, R1, R2
-202e51e0|	1	plan9	SUB.S R0>>$28, R1, R2
-002e51e0|	1	plan9	SUB.S R0<<$28, R1, R2
-402e51e0|	1	plan9	SUB.S R0->$28, R1, R2
-602e51e0|	1	plan9	SUB.S R0@>$28, R1, R2
-001e41e0|	1	plan9	SUB R0<<$28, R1, R1
-201e41e0|	1	plan9	SUB R0>>$28, R1, R1
-401e41e0|	1	plan9	SUB R0->$28, R1, R1
-601e41e0|	1	plan9	SUB R0@>$28, R1, R1
-001e51e0|	1	plan9	SUB.S R0<<$28, R1, R1
-201e51e0|	1	plan9	SUB.S R0>>$28, R1, R1
-401e51e0|	1	plan9	SUB.S R0->$28, R1, R1
-601e51e0|	1	plan9	SUB.S R0@>$28, R1, R1
+202e41e0|	1	plan9	SUB R0>>28, R1, R2
+002e41e0|	1	plan9	SUB R0<<28, R1, R2
+402e41e0|	1	plan9	SUB R0->28, R1, R2
+602e41e0|	1	plan9	SUB R0@>28, R1, R2
+202e51e0|	1	plan9	SUB.S R0>>28, R1, R2
+002e51e0|	1	plan9	SUB.S R0<<28, R1, R2
+402e51e0|	1	plan9	SUB.S R0->28, R1, R2
+602e51e0|	1	plan9	SUB.S R0@>28, R1, R2
+001e41e0|	1	plan9	SUB R0<<28, R1, R1
+201e41e0|	1	plan9	SUB R0>>28, R1, R1
+401e41e0|	1	plan9	SUB R0->28, R1, R1
+601e41e0|	1	plan9	SUB R0@>28, R1, R1
+001e51e0|	1	plan9	SUB.S R0<<28, R1, R1
+201e51e0|	1	plan9	SUB.S R0>>28, R1, R1
+401e51e0|	1	plan9	SUB.S R0->28, R1, R1
+601e51e0|	1	plan9	SUB.S R0@>28, R1, R1
 103142e0|	1	plan9	SUB R0<<R1, R2, R3
 303142e0|	1	plan9	SUB R0>>R1, R2, R3
 503142e0|	1	plan9	SUB R0->R1, R2, R3
@@ -500,22 +500,22 @@
 0020d1e0|	1	plan9	SBC.S R0, R1, R2
 0010c1e0|	1	plan9	SBC R0, R1, R1
 0010d1e0|	1	plan9	SBC.S R0, R1, R1
-202ec1e0|	1	plan9	SBC R0>>$28, R1, R2
-002ec1e0|	1	plan9	SBC R0<<$28, R1, R2
-402ec1e0|	1	plan9	SBC R0->$28, R1, R2
-602ec1e0|	1	plan9	SBC R0@>$28, R1, R2
-202ed1e0|	1	plan9	SBC.S R0>>$28, R1, R2
-002ed1e0|	1	plan9	SBC.S R0<<$28, R1, R2
-402ed1e0|	1	plan9	SBC.S R0->$28, R1, R2
-602ed1e0|	1	plan9	SBC.S R0@>$28, R1, R2
-001ec1e0|	1	plan9	SBC R0<<$28, R1, R1
-201ec1e0|	1	plan9	SBC R0>>$28, R1, R1
-401ec1e0|	1	plan9	SBC R0->$28, R1, R1
-601ec1e0|	1	plan9	SBC R0@>$28, R1, R1
-001ed1e0|	1	plan9	SBC.S R0<<$28, R1, R1
-201ed1e0|	1	plan9	SBC.S R0>>$28, R1, R1
-401ed1e0|	1	plan9	SBC.S R0->$28, R1, R1
-601ed1e0|	1	plan9	SBC.S R0@>$28, R1, R1
+202ec1e0|	1	plan9	SBC R0>>28, R1, R2
+002ec1e0|	1	plan9	SBC R0<<28, R1, R2
+402ec1e0|	1	plan9	SBC R0->28, R1, R2
+602ec1e0|	1	plan9	SBC R0@>28, R1, R2
+202ed1e0|	1	plan9	SBC.S R0>>28, R1, R2
+002ed1e0|	1	plan9	SBC.S R0<<28, R1, R2
+402ed1e0|	1	plan9	SBC.S R0->28, R1, R2
+602ed1e0|	1	plan9	SBC.S R0@>28, R1, R2
+001ec1e0|	1	plan9	SBC R0<<28, R1, R1
+201ec1e0|	1	plan9	SBC R0>>28, R1, R1
+401ec1e0|	1	plan9	SBC R0->28, R1, R1
+601ec1e0|	1	plan9	SBC R0@>28, R1, R1
+001ed1e0|	1	plan9	SBC.S R0<<28, R1, R1
+201ed1e0|	1	plan9	SBC.S R0>>28, R1, R1
+401ed1e0|	1	plan9	SBC.S R0->28, R1, R1
+601ed1e0|	1	plan9	SBC.S R0@>28, R1, R1
 1031c2e0|	1	plan9	SBC R0<<R1, R2, R3
 3031c2e0|	1	plan9	SBC R0>>R1, R2, R3
 5031c2e0|	1	plan9	SBC R0->R1, R2, R3
@@ -544,22 +544,22 @@
 002071e0|	1	plan9	RSB.S R0, R1, R2
 001061e0|	1	plan9	RSB R0, R1, R1
 001071e0|	1	plan9	RSB.S R0, R1, R1
-202e61e0|	1	plan9	RSB R0>>$28, R1, R2
-002e61e0|	1	plan9	RSB R0<<$28, R1, R2
-402e61e0|	1	plan9	RSB R0->$28, R1, R2
-602e61e0|	1	plan9	RSB R0@>$28, R1, R2
-202e71e0|	1	plan9	RSB.S R0>>$28, R1, R2
-002e71e0|	1	plan9	RSB.S R0<<$28, R1, R2
-402e71e0|	1	plan9	RSB.S R0->$28, R1, R2
-602e71e0|	1	plan9	RSB.S R0@>$28, R1, R2
-001e61e0|	1	plan9	RSB R0<<$28, R1, R1
-201e61e0|	1	plan9	RSB R0>>$28, R1, R1
-401e61e0|	1	plan9	RSB R0->$28, R1, R1
-601e61e0|	1	plan9	RSB R0@>$28, R1, R1
-001e71e0|	1	plan9	RSB.S R0<<$28, R1, R1
-201e71e0|	1	plan9	RSB.S R0>>$28, R1, R1
-401e71e0|	1	plan9	RSB.S R0->$28, R1, R1
-601e71e0|	1	plan9	RSB.S R0@>$28, R1, R1
+202e61e0|	1	plan9	RSB R0>>28, R1, R2
+002e61e0|	1	plan9	RSB R0<<28, R1, R2
+402e61e0|	1	plan9	RSB R0->28, R1, R2
+602e61e0|	1	plan9	RSB R0@>28, R1, R2
+202e71e0|	1	plan9	RSB.S R0>>28, R1, R2
+002e71e0|	1	plan9	RSB.S R0<<28, R1, R2
+402e71e0|	1	plan9	RSB.S R0->28, R1, R2
+602e71e0|	1	plan9	RSB.S R0@>28, R1, R2
+001e61e0|	1	plan9	RSB R0<<28, R1, R1
+201e61e0|	1	plan9	RSB R0>>28, R1, R1
+401e61e0|	1	plan9	RSB R0->28, R1, R1
+601e61e0|	1	plan9	RSB R0@>28, R1, R1
+001e71e0|	1	plan9	RSB.S R0<<28, R1, R1
+201e71e0|	1	plan9	RSB.S R0>>28, R1, R1
+401e71e0|	1	plan9	RSB.S R0->28, R1, R1
+601e71e0|	1	plan9	RSB.S R0@>28, R1, R1
 103162e0|	1	plan9	RSB R0<<R1, R2, R3
 303162e0|	1	plan9	RSB R0>>R1, R2, R3
 503162e0|	1	plan9	RSB R0->R1, R2, R3
@@ -588,22 +588,22 @@
 0020f1e0|	1	plan9	RSC.S R0, R1, R2
 0010e1e0|	1	plan9	RSC R0, R1, R1
 0010f1e0|	1	plan9	RSC.S R0, R1, R1
-202ee1e0|	1	plan9	RSC R0>>$28, R1, R2
-002ee1e0|	1	plan9	RSC R0<<$28, R1, R2
-402ee1e0|	1	plan9	RSC R0->$28, R1, R2
-602ee1e0|	1	plan9	RSC R0@>$28, R1, R2
-202ef1e0|	1	plan9	RSC.S R0>>$28, R1, R2
-002ef1e0|	1	plan9	RSC.S R0<<$28, R1, R2
-402ef1e0|	1	plan9	RSC.S R0->$28, R1, R2
-602ef1e0|	1	plan9	RSC.S R0@>$28, R1, R2
-001ee1e0|	1	plan9	RSC R0<<$28, R1, R1
-201ee1e0|	1	plan9	RSC R0>>$28, R1, R1
-401ee1e0|	1	plan9	RSC R0->$28, R1, R1
-601ee1e0|	1	plan9	RSC R0@>$28, R1, R1
-001ef1e0|	1	plan9	RSC.S R0<<$28, R1, R1
-201ef1e0|	1	plan9	RSC.S R0>>$28, R1, R1
-401ef1e0|	1	plan9	RSC.S R0->$28, R1, R1
-601ef1e0|	1	plan9	RSC.S R0@>$28, R1, R1
+202ee1e0|	1	plan9	RSC R0>>28, R1, R2
+002ee1e0|	1	plan9	RSC R0<<28, R1, R2
+402ee1e0|	1	plan9	RSC R0->28, R1, R2
+602ee1e0|	1	plan9	RSC R0@>28, R1, R2
+202ef1e0|	1	plan9	RSC.S R0>>28, R1, R2
+002ef1e0|	1	plan9	RSC.S R0<<28, R1, R2
+402ef1e0|	1	plan9	RSC.S R0->28, R1, R2
+602ef1e0|	1	plan9	RSC.S R0@>28, R1, R2
+001ee1e0|	1	plan9	RSC R0<<28, R1, R1
+201ee1e0|	1	plan9	RSC R0>>28, R1, R1
+401ee1e0|	1	plan9	RSC R0->28, R1, R1
+601ee1e0|	1	plan9	RSC R0@>28, R1, R1
+001ef1e0|	1	plan9	RSC.S R0<<28, R1, R1
+201ef1e0|	1	plan9	RSC.S R0>>28, R1, R1
+401ef1e0|	1	plan9	RSC.S R0->28, R1, R1
+601ef1e0|	1	plan9	RSC.S R0@>28, R1, R1
 1031e2e0|	1	plan9	RSC R0<<R1, R2, R3
 3031e2e0|	1	plan9	RSC R0>>R1, R2, R3
 5031e2e0|	1	plan9	RSC R0->R1, R2, R3
@@ -632,22 +632,22 @@
 002091e0|	1	plan9	ADD.S R0, R1, R2
 001081e0|	1	plan9	ADD R0, R1, R1
 001091e0|	1	plan9	ADD.S R0, R1, R1
-202e81e0|	1	plan9	ADD R0>>$28, R1, R2
-002e81e0|	1	plan9	ADD R0<<$28, R1, R2
-402e81e0|	1	plan9	ADD R0->$28, R1, R2
-602e81e0|	1	plan9	ADD R0@>$28, R1, R2
-202e91e0|	1	plan9	ADD.S R0>>$28, R1, R2
-002e91e0|	1	plan9	ADD.S R0<<$28, R1, R2
-402e91e0|	1	plan9	ADD.S R0->$28, R1, R2
-602e91e0|	1	plan9	ADD.S R0@>$28, R1, R2
-001e81e0|	1	plan9	ADD R0<<$28, R1, R1
-201e81e0|	1	plan9	ADD R0>>$28, R1, R1
-401e81e0|	1	plan9	ADD R0->$28, R1, R1
-601e81e0|	1	plan9	ADD R0@>$28, R1, R1
-001e91e0|	1	plan9	ADD.S R0<<$28, R1, R1
-201e91e0|	1	plan9	ADD.S R0>>$28, R1, R1
-401e91e0|	1	plan9	ADD.S R0->$28, R1, R1
-601e91e0|	1	plan9	ADD.S R0@>$28, R1, R1
+202e81e0|	1	plan9	ADD R0>>28, R1, R2
+002e81e0|	1	plan9	ADD R0<<28, R1, R2
+402e81e0|	1	plan9	ADD R0->28, R1, R2
+602e81e0|	1	plan9	ADD R0@>28, R1, R2
+202e91e0|	1	plan9	ADD.S R0>>28, R1, R2
+002e91e0|	1	plan9	ADD.S R0<<28, R1, R2
+402e91e0|	1	plan9	ADD.S R0->28, R1, R2
+602e91e0|	1	plan9	ADD.S R0@>28, R1, R2
+001e81e0|	1	plan9	ADD R0<<28, R1, R1
+201e81e0|	1	plan9	ADD R0>>28, R1, R1
+401e81e0|	1	plan9	ADD R0->28, R1, R1
+601e81e0|	1	plan9	ADD R0@>28, R1, R1
+001e91e0|	1	plan9	ADD.S R0<<28, R1, R1
+201e91e0|	1	plan9	ADD.S R0>>28, R1, R1
+401e91e0|	1	plan9	ADD.S R0->28, R1, R1
+601e91e0|	1	plan9	ADD.S R0@>28, R1, R1
 103182e0|	1	plan9	ADD R0<<R1, R2, R3
 303182e0|	1	plan9	ADD R0>>R1, R2, R3
 503182e0|	1	plan9	ADD R0->R1, R2, R3
@@ -676,22 +676,22 @@
 0020b1e0|	1	plan9	ADC.S R0, R1, R2
 0010a1e0|	1	plan9	ADC R0, R1, R1
 0010b1e0|	1	plan9	ADC.S R0, R1, R1
-202ea1e0|	1	plan9	ADC R0>>$28, R1, R2
-002ea1e0|	1	plan9	ADC R0<<$28, R1, R2
-402ea1e0|	1	plan9	ADC R0->$28, R1, R2
-602ea1e0|	1	plan9	ADC R0@>$28, R1, R2
-202eb1e0|	1	plan9	ADC.S R0>>$28, R1, R2
-002eb1e0|	1	plan9	ADC.S R0<<$28, R1, R2
-402eb1e0|	1	plan9	ADC.S R0->$28, R1, R2
-602eb1e0|	1	plan9	ADC.S R0@>$28, R1, R2
-001ea1e0|	1	plan9	ADC R0<<$28, R1, R1
-201ea1e0|	1	plan9	ADC R0>>$28, R1, R1
-401ea1e0|	1	plan9	ADC R0->$28, R1, R1
-601ea1e0|	1	plan9	ADC R0@>$28, R1, R1
-001eb1e0|	1	plan9	ADC.S R0<<$28, R1, R1
-201eb1e0|	1	plan9	ADC.S R0>>$28, R1, R1
-401eb1e0|	1	plan9	ADC.S R0->$28, R1, R1
-601eb1e0|	1	plan9	ADC.S R0@>$28, R1, R1
+202ea1e0|	1	plan9	ADC R0>>28, R1, R2
+002ea1e0|	1	plan9	ADC R0<<28, R1, R2
+402ea1e0|	1	plan9	ADC R0->28, R1, R2
+602ea1e0|	1	plan9	ADC R0@>28, R1, R2
+202eb1e0|	1	plan9	ADC.S R0>>28, R1, R2
+002eb1e0|	1	plan9	ADC.S R0<<28, R1, R2
+402eb1e0|	1	plan9	ADC.S R0->28, R1, R2
+602eb1e0|	1	plan9	ADC.S R0@>28, R1, R2
+001ea1e0|	1	plan9	ADC R0<<28, R1, R1
+201ea1e0|	1	plan9	ADC R0>>28, R1, R1
+401ea1e0|	1	plan9	ADC R0->28, R1, R1
+601ea1e0|	1	plan9	ADC R0@>28, R1, R1
+001eb1e0|	1	plan9	ADC.S R0<<28, R1, R1
+201eb1e0|	1	plan9	ADC.S R0>>28, R1, R1
+401eb1e0|	1	plan9	ADC.S R0->28, R1, R1
+601eb1e0|	1	plan9	ADC.S R0@>28, R1, R1
 1031a2e0|	1	plan9	ADC R0<<R1, R2, R3
 3031a2e0|	1	plan9	ADC R0>>R1, R2, R3
 5031a2e0|	1	plan9	ADC R0->R1, R2, R3
@@ -710,40 +710,40 @@
 7021b2e0|	1	plan9	ADC.S R0@>R1, R2, R2
 ff0037e3|	1	plan9	TEQ $255, R7
 ff0439e3|	1	plan9	TEQ $4278190080, R9
-090f37e1|	1	plan9	TEQ R9<<$30, R7
-290f37e1|	1	plan9	TEQ R9>>$30, R7
-490f37e1|	1	plan9	TEQ R9->$30, R7
-690f37e1|	1	plan9	TEQ R9@>$30, R7
+090f37e1|	1	plan9	TEQ R9<<30, R7
+290f37e1|	1	plan9	TEQ R9>>30, R7
+490f37e1|	1	plan9	TEQ R9->30, R7
+690f37e1|	1	plan9	TEQ R9@>30, R7
 190837e1|	1	plan9	TEQ R9<<R8, R7
 390837e1|	1	plan9	TEQ R9>>R8, R7
 590837e1|	1	plan9	TEQ R9->R8, R7
 790837e1|	1	plan9	TEQ R9@>R8, R7
 ff0017e3|	1	plan9	TST $255, R7
 ff0419e3|	1	plan9	TST $4278190080, R9
-090f17e1|	1	plan9	TST R9<<$30, R7
-290f17e1|	1	plan9	TST R9>>$30, R7
-490f17e1|	1	plan9	TST R9->$30, R7
-690f17e1|	1	plan9	TST R9@>$30, R7
+090f17e1|	1	plan9	TST R9<<30, R7
+290f17e1|	1	plan9	TST R9>>30, R7
+490f17e1|	1	plan9	TST R9->30, R7
+690f17e1|	1	plan9	TST R9@>30, R7
 190817e1|	1	plan9	TST R9<<R8, R7
 390817e1|	1	plan9	TST R9>>R8, R7
 590817e1|	1	plan9	TST R9->R8, R7
 790817e1|	1	plan9	TST R9@>R8, R7
 ff0057e3|	1	plan9	CMP $255, R7
 ff0459e3|	1	plan9	CMP $4278190080, R9
-090f57e1|	1	plan9	CMP R9<<$30, R7
-290f57e1|	1	plan9	CMP R9>>$30, R7
-490f57e1|	1	plan9	CMP R9->$30, R7
-690f57e1|	1	plan9	CMP R9@>$30, R7
+090f57e1|	1	plan9	CMP R9<<30, R7
+290f57e1|	1	plan9	CMP R9>>30, R7
+490f57e1|	1	plan9	CMP R9->30, R7
+690f57e1|	1	plan9	CMP R9@>30, R7
 190857e1|	1	plan9	CMP R9<<R8, R7
 390857e1|	1	plan9	CMP R9>>R8, R7
 590857e1|	1	plan9	CMP R9->R8, R7
 790857e1|	1	plan9	CMP R9@>R8, R7
 ff0077e3|	1	plan9	CMN $255, R7
 ff0479e3|	1	plan9	CMN $4278190080, R9
-090f77e1|	1	plan9	CMN R9<<$30, R7
-290f77e1|	1	plan9	CMN R9>>$30, R7
-490f77e1|	1	plan9	CMN R9->$30, R7
-690f77e1|	1	plan9	CMN R9@>$30, R7
+090f77e1|	1	plan9	CMN R9<<30, R7
+290f77e1|	1	plan9	CMN R9>>30, R7
+490f77e1|	1	plan9	CMN R9->30, R7
+690f77e1|	1	plan9	CMN R9@>30, R7
 190877e1|	1	plan9	CMN R9<<R8, R7
 390877e1|	1	plan9	CMN R9>>R8, R7
 590877e1|	1	plan9	CMN R9->R8, R7
@@ -800,22 +800,22 @@
 0020d1e1|	1	plan9	BIC.S R0, R1, R2
 0010c1e1|	1	plan9	BIC R0, R1, R1
 0010d1e1|	1	plan9	BIC.S R0, R1, R1
-202ec1e1|	1	plan9	BIC R0>>$28, R1, R2
-002ec1e1|	1	plan9	BIC R0<<$28, R1, R2
-402ec1e1|	1	plan9	BIC R0->$28, R1, R2
-602ec1e1|	1	plan9	BIC R0@>$28, R1, R2
-202ed1e1|	1	plan9	BIC.S R0>>$28, R1, R2
-002ed1e1|	1	plan9	BIC.S R0<<$28, R1, R2
-402ed1e1|	1	plan9	BIC.S R0->$28, R1, R2
-602ed1e1|	1	plan9	BIC.S R0@>$28, R1, R2
-001ec1e1|	1	plan9	BIC R0<<$28, R1, R1
-201ec1e1|	1	plan9	BIC R0>>$28, R1, R1
-401ec1e1|	1	plan9	BIC R0->$28, R1, R1
-601ec1e1|	1	plan9	BIC R0@>$28, R1, R1
-001ed1e1|	1	plan9	BIC.S R0<<$28, R1, R1
-201ed1e1|	1	plan9	BIC.S R0>>$28, R1, R1
-401ed1e1|	1	plan9	BIC.S R0->$28, R1, R1
-601ed1e1|	1	plan9	BIC.S R0@>$28, R1, R1
+202ec1e1|	1	plan9	BIC R0>>28, R1, R2
+002ec1e1|	1	plan9	BIC R0<<28, R1, R2
+402ec1e1|	1	plan9	BIC R0->28, R1, R2
+602ec1e1|	1	plan9	BIC R0@>28, R1, R2
+202ed1e1|	1	plan9	BIC.S R0>>28, R1, R2
+002ed1e1|	1	plan9	BIC.S R0<<28, R1, R2
+402ed1e1|	1	plan9	BIC.S R0->28, R1, R2
+602ed1e1|	1	plan9	BIC.S R0@>28, R1, R2
+001ec1e1|	1	plan9	BIC R0<<28, R1, R1
+201ec1e1|	1	plan9	BIC R0>>28, R1, R1
+401ec1e1|	1	plan9	BIC R0->28, R1, R1
+601ec1e1|	1	plan9	BIC R0@>28, R1, R1
+001ed1e1|	1	plan9	BIC.S R0<<28, R1, R1
+201ed1e1|	1	plan9	BIC.S R0>>28, R1, R1
+401ed1e1|	1	plan9	BIC.S R0->28, R1, R1
+601ed1e1|	1	plan9	BIC.S R0@>28, R1, R1
 1031c2e1|	1	plan9	BIC R0<<R1, R2, R3
 3031c2e1|	1	plan9	BIC R0>>R1, R2, R3
 5031c2e1|	1	plan9	BIC R0->R1, R2, R3
@@ -990,14 +990,14 @@
 ff14e0e3|	1	plan9	MVN $4278190080, R1
 ff10f0e3|	1	plan9	MVN.S $255, R1
 ff14f0e3|	1	plan9	MVN.S $4278190080, R1
-097fe0e1|	1	plan9	MVN R9<<$30, R7
-297fe0e1|	1	plan9	MVN R9>>$30, R7
-497fe0e1|	1	plan9	MVN R9->$30, R7
-697fe0e1|	1	plan9	MVN R9@>$30, R7
-097ff0e1|	1	plan9	MVN.S R9<<$30, R7
-297ff0e1|	1	plan9	MVN.S R9>>$30, R7
-497ff0e1|	1	plan9	MVN.S R9->$30, R7
-697ff0e1|	1	plan9	MVN.S R9@>$30, R7
+097fe0e1|	1	plan9	MVN R9<<30, R7
+297fe0e1|	1	plan9	MVN R9>>30, R7
+497fe0e1|	1	plan9	MVN R9->30, R7
+697fe0e1|	1	plan9	MVN R9@>30, R7
+097ff0e1|	1	plan9	MVN.S R9<<30, R7
+297ff0e1|	1	plan9	MVN.S R9>>30, R7
+497ff0e1|	1	plan9	MVN.S R9->30, R7
+697ff0e1|	1	plan9	MVN.S R9@>30, R7
 1978e0e1|	1	plan9	MVN R9<<R8, R7
 3978e0e1|	1	plan9	MVN R9>>R8, R7
 5978e0e1|	1	plan9	MVN R9->R8, R7
@@ -1581,17 +1581,17 @@
 1155eae6|	1	gnu	usat r5, #10, r1, lsl #10
 5155eae6|	1	gnu	usat r5, #10, r1, asr #10
 335feae6|	1	gnu	usat16 r5, #10, r3
-7788a9e6|	1	plan9	SXTAB R7@>$16, R9, R8
-778889e6|	1	plan9	SXTAB16 R7@>$16, R9, R8
-7788b9e6|	1	plan9	SXTAH R7@>$16, R9, R8
-7784afe6|	1	plan9	MOVBS R7@>$8, R8
-778c8fe6|	1	plan9	SXTB16 R7@>$24, R8
+7788a9e6|	1	plan9	SXTAB R7@>16, R9, R8
+778889e6|	1	plan9	SXTAB16 R7@>16, R9, R8
+7788b9e6|	1	plan9	SXTAH R7@>16, R9, R8
+7784afe6|	1	plan9	MOVBS R7@>8, R8
+778c8fe6|	1	plan9	SXTB16 R7@>24, R8
 7780bf16|	1	plan9	MOVHS.NE R7, R8
-7788e906|	1	plan9	UXTAB.EQ R7@>$16, R9, R8
-7788c9e6|	1	plan9	UXTAB16 R7@>$16, R9, R8
-7788f9e6|	1	plan9	UXTAH R7@>$16, R9, R8
-7784efe6|	1	plan9	MOVBU R7@>$8, R8
-778ccfe6|	1	plan9	UXTB16 R7@>$24, R8
+7788e906|	1	plan9	UXTAB.EQ R7@>16, R9, R8
+7788c9e6|	1	plan9	UXTAB16 R7@>16, R9, R8
+7788f9e6|	1	plan9	UXTAH R7@>16, R9, R8
+7784efe6|	1	plan9	MOVBU R7@>8, R8
+778ccfe6|	1	plan9	UXTB16 R7@>24, R8
 7780ffe6|	1	plan9	MOVHU R7, R8
 11f288e7|	1	gnu	usad8 r8, r1, r2
 112388e7|	1	gnu	usada8 r8, r1, r3, r2