1 files changed, 12 insertions, 13 deletions
diff --git a/survey.py b/survey.py
index e98dc13..b43d770 100755
--- a/survey.py
+++ b/survey.py
@@ -11,22 +11,22 @@ Resolves label references and substitutes them with literal values.
 ... 37/u 5/rd 10010/imm20
 ... # store 0x48 (H) in UART0+0
 ... 13/i 6/rd 0/funct3 0/rs 48/imm12
-... 23/s 5/rs1 0/imm12 2/funct3 6/rs2
+... 23/s 2/funct3 5/rs1 0/imm12 6/rs2
 ... # store 0x65 (e) in UART0+0
 ... 13/i 6/rd 0/funct3 0/rs 65/imm12
-... 23/s 5/rs1 0/imm12 2/funct3 6/rs2
+... 23/s 2/funct3 5/rs1 0/imm12 6/rs2
 ... # store 0x6c (l) in UART0+0
 ... 13/i 6/rd 0/funct3 0/rs 6c/imm12
-... 23/s 5/rs1 0/imm12 2/funct3 6/rs2
+... 23/s 2/funct3 5/rs1 0/imm12 6/rs2
 ... # store 0x6c (l) in UART0+0
 ... 13/i 6/rd 0/funct3 0/rs 6c/imm12
-... 23/s 5/rs1 0/imm12 2/funct3 6/rs2
+... 23/s 2/funct3 5/rs1 0/imm12 6/rs2
 ... # store 0x6f (o) in UART0+0
 ... 13/i 6/rd 0/funct3 0/rs 6f/imm12
-... 23/s 5/rs1 0/imm12 2/funct3 6/rs2
+... 23/s 2/funct3 5/rs1 0/imm12 6/rs2
 ... # store 0x0a (\\\\n) in UART0+0
 ... 13/i 6/rd 0/funct3 0/rs a/imm12
-... 23/s 5/rs1 0/imm12 2/funct3 6/rs2
+... 23/s 2/funct3 5/rs1 0/imm12 6/rs2
 ... # jump back up to the top
 ... 6f/j 0/rd main/off21
 ... '''[1:-1]))))
@@ -36,22 +36,22 @@ Resolves label references and substitutes them with literal values.
 37/u 5/rd 10010/imm20
 # store 0x48 (H) in UART0+0
 13/i 6/rd 0/funct3 0/rs 48/imm12
-23/s 5/rs1 0/imm12 2/funct3 6/rs2
+23/s 2/funct3 5/rs1 0/imm12 6/rs2
 # store 0x65 (e) in UART0+0
 13/i 6/rd 0/funct3 0/rs 65/imm12
-23/s 5/rs1 0/imm12 2/funct3 6/rs2
+23/s 2/funct3 5/rs1 0/imm12 6/rs2
 # store 0x6c (l) in UART0+0
 13/i 6/rd 0/funct3 0/rs 6c/imm12
-23/s 5/rs1 0/imm12 2/funct3 6/rs2
+23/s 2/funct3 5/rs1 0/imm12 6/rs2
 # store 0x6c (l) in UART0+0
 13/i 6/rd 0/funct3 0/rs 6c/imm12
-23/s 5/rs1 0/imm12 2/funct3 6/rs2
+23/s 2/funct3 5/rs1 0/imm12 6/rs2
 # store 0x6f (o) in UART0+0
 13/i 6/rd 0/funct3 0/rs 6f/imm12
-23/s 5/rs1 0/imm12 2/funct3 6/rs2
+23/s 2/funct3 5/rs1 0/imm12 6/rs2
 # store 0x0a (\\n) in UART0+0
 13/i 6/rd 0/funct3 0/rs a/imm12
-23/s 5/rs1 0/imm12 2/funct3 6/rs2
+23/s 2/funct3 5/rs1 0/imm12 6/rs2
 # jump back up to the top
 6f/j 0/rd -34/imm21
 
@@ -92,7 +92,6 @@ Resolves label references and substitutes them with literal values.
 67/i 0/subop 0/rd/x0 7/rs/t2 -1c/imm12
 """
 import subv
-import bits
 
 
 def observe(word, pc, map):