fix validate.py tests

1 files changed, 10 insertions, 10 deletions

diff --git a/validate.py b/validate.py
index 955608b..2b3cf92 100755
--- a/validate.py
+++ b/validate.py
@@ -326,31 +326,31 @@ def validate_opi(inputs):
     [(19, 'i'), (5, 'rd'), (0, 'funct3'), (10, 'rs'), (66, 'imm12')]
     >>> validate_opi(subv.parse('13/opi 5/rd/t0 3/subop/sltu 5/rs/t0 8/imm12')['instr'])
     [(19, 'i'), (5, 'rd'), (3, 'funct3'), (5, 'rs'), (8, 'imm12')]
-    >>> validate_opi(subv.parse('13/opi 5/rd/t0 1/subop/sll 0/imm7 5/rs/t0 8/imm5')['instr'])
+    >>> validate_opi(subv.parse('13/opi 5/rd/t0 1/subop/sll 0/mode/norm 5/rs/t0 8/imm5')['instr'])
     [(19, 'i'), (5, 'rd'), (1, 'funct3'), (5, 'rs'), (8, 'imm12')]
     >>> validate_opi(subv.parse('13/opi 5/rd/t0 1/subop/sll 5/rs/t0 8/imm12')['instr'])
     [(19, 'i'), (5, 'rd'), (1, 'funct3'), (5, 'rs'), (8, 'imm12')]
-    >>> validate_opi(subv.parse('13/opi 5/rd/t0 5/subop/sra 20/imm7 5/rs/t0 8/imm5')['instr'])
+    >>> validate_opi(subv.parse('13/opi 5/rd/t0 5/subop/sra 20/mode/alt 5/rs/t0 8/imm5')['instr'])
     [(19, 'i'), (5, 'rd'), (5, 'funct3'), (5, 'rs'), (1032, 'imm12')]
     >>> validate_opi(subv.parse('13/opi 5/rd/t0 5/subop/sra 5/rs/t0 408/imm12')['instr'])
     [(19, 'i'), (5, 'rd'), (5, 'funct3'), (5, 'rs'), (1032, 'imm12')]
 
-    >>> validate_opi(subv.parse('13/opi 5/rd/t0 1/subop/sll 12/imm7 5/rs/t0 8/imm5')['instr'])
+    >>> validate_opi(subv.parse('13/opi 5/rd/t0 1/subop/sll 20/mode/alt 5/rs/t0 8/imm5')['instr'])
     Traceback (most recent call last):
         ...
-    ValueError: comp-op 1/funct3/sll needs to go with comp-mode 0/imm7/norm
+    ValueError: comp-op 1/funct3/sll needs to go with comp-mode 0/funct7/norm
     >>> validate_opi(subv.parse('13/opi 5/rd/t0 1/subop/sll 5/rs/t0 108/imm12')['instr'])
     Traceback (most recent call last):
         ...
-    ValueError: comp-op 1/funct3/sll needs to go with comp-mode 0/imm7/norm
-    >>> validate_opi(subv.parse('13/opi 5/rd/t0 5/subop/sra 10/imm7 5/rs/t0 8/imm5')['instr'])
+    ValueError: comp-op 1/funct3/sll needs to go with comp-mode 0/funct7/norm
+    >>> validate_opi(subv.parse('13/opi 5/rd/t0 5/subop/sra 0/mode/norm 5/rs/t0 8/imm5')['instr'])
     Traceback (most recent call last):
         ...
-    ValueError: comp-op 5/funct3/sra needs to go with comp-mode 20/imm7/alt
+    ValueError: comp-op 5/funct3/sra needs to go with comp-mode 20/funct7/alt
     >>> validate_opi(subv.parse('13/opi 5/rd/t0 5/subop/sra 5/rs/t0 208/imm12')['instr'])
     Traceback (most recent call last):
         ...
-    ValueError: comp-op 5/funct3/sra needs to go with comp-mode 20/imm7/alt
+    ValueError: comp-op 5/funct3/sra needs to go with comp-mode 20/funct7/alt
     """
     op = inputs.pop(0)
 
@@ -369,7 +369,7 @@ def validate_opi(inputs):
         except ValueError:
             imm = pop_immediate(inputs, 12)
             shamt = ((imm[0] & 0b11111), 'imm5')
-            mode = (imm[0] >> 5, 'imm7')
+            mode = (imm[0] >> 5, 'funct7')
 
         expect_mode = "alt" if funct[2] == "sra" else "norm"
         expect_val = 32 if expect_mode == "alt" else 0
@@ -378,7 +378,7 @@ def validate_opi(inputs):
             raise ValueError(
                 "comp-op {} needs to go with comp-mode {}".format(
                     subv.format_part(funct),
-                    subv.format_part((expect_val, "imm7", expect_mode)),
+                    subv.format_part((expect_val, "funct7", expect_mode)),
                 )
             )