refactor: rename sub_opcode and condition constants for JUMPR/JUMPS instructions as per latest binutils-esp32ulp naming

Only renames. No change in behaviour/functionality.

Author: wnienhaus

esp32_ulp/opcodes.py

@@ -47,17 +47,19 @@
 ALU_SEL_RST = 2
 
 OPCODE_BRANCH = 8
+# https://github.com/espressif/binutils-esp32ulp/blob/d61f86f97eda43fc118df30d019fc062aaa6bc8d/include/opcode/esp32ulp_esp32.h#L85
 SUB_OPCODE_BX = 0
+SUB_OPCODE_BR = 1
+SUB_OPCODE_BS = 2
 BX_JUMP_TYPE_DIRECT = 0
 BX_JUMP_TYPE_ZERO = 1
 BX_JUMP_TYPE_OVF = 2
-SUB_OPCODE_B = 1
-B_CMP_L = 0
-B_CMP_GE = 1
-SUB_OPCODE_BC = 2
-BC_CMP_LT = 0
-BC_CMP_GT = 1
-BC_CMP_EQ = 2
+# https://github.com/espressif/binutils-esp32ulp/blob/d61f86f97eda43fc118df30d019fc062aaa6bc8d/gas/config/tc-esp32ulp.h#L91
+BRCOND_LT = 0
+BRCOND_GE = 1
+BRCOND_LE = 2
+BRCOND_EQ = 3
+BRCOND_GT = 4
 
 OPCODE_END = 9
 SUB_OPCODE_END = 0
@@ -210,23 +212,23 @@ def make_ins(layout):
 """)
 
 
-_b = make_ins("""
+_br = make_ins("""
     imm : 16        # Immediate value to compare against
-    cmp : 1         # Comparison to perform: B_CMP_L or B_CMP_GE
+    cmp : 1         # Comparison to perform: BRCOND_LT or BRCOND_GE
     offset : 7      # Absolute value of target PC offset w.r.t. current PC, expressed in words
     sign : 1        # Sign of target PC offset: 0: positive, 1: negative
-    sub_opcode : 3  # Sub opcode (SUB_OPCODE_B)
+    sub_opcode : 3  # Sub opcode (SUB_OPCODE_BR)
     opcode : 4      # Opcode (OPCODE_BRANCH)
 """)
 
 
-_bc = make_ins("""
+_bs = make_ins("""
     imm : 8         # Immediate value to compare against
     unused : 7      # Unused
-    cmp : 2         # Comparison to perform: BC_CMP_LT, GT or EQ
+    cmp : 2         # Comparison to perform: BRCOND_LT, GT or EQ
     offset : 7      # Absolute value of target PC offset w.r.t. current PC, expressed in words
     sign : 1        # Sign of target PC offset: 0: positive, 1: negative
-    sub_opcode : 3  # Sub opcode (SUB_OPCODE_BC)
+    sub_opcode : 3  # Sub opcode (SUB_OPCODE_BS)
     opcode : 4      # Opcode (OPCODE_BRANCH)
 """)
 
@@ -639,36 +641,36 @@ def i_jumpr(offset, threshold, condition):
     threshold = get_imm(threshold)
     condition = get_cond(condition)
     if condition == 'lt':
-        cmp_op = B_CMP_L
+        cmp_op = BRCOND_LT
     elif condition == 'ge':
-        cmp_op = B_CMP_GE
+        cmp_op = BRCOND_GE
     else:
         raise ValueError("invalid comparison condition")
-    _b.imm = threshold
-    _b.cmp = cmp_op
-    _b.offset = abs(offset)
-    _b.sign = 0 if offset >= 0 else 1
-    _b.sub_opcode = SUB_OPCODE_B
-    _b.opcode = OPCODE_BRANCH
-    return _b.all
+    _br.imm = threshold
+    _br.cmp = cmp_op
+    _br.offset = abs(offset)
+    _br.sign = 0 if offset >= 0 else 1
+    _br.sub_opcode = SUB_OPCODE_BR
+    _br.opcode = OPCODE_BRANCH
+    return _br.all
 
 
 def i_jumps(offset, threshold, condition):
     offset = get_rel(offset)
     threshold = get_imm(threshold)
     condition = get_cond(condition)
     if condition == 'lt':
-        cmp_op = BC_CMP_LT
+        cmp_op = BRCOND_LT
     elif condition == 'gt':
-        cmp_op = BC_CMP_GT
+        cmp_op = BRCOND_GT
     elif condition == 'eq':
-        cmp_op = BC_CMP_EQ
+        cmp_op = BRCOND_EQ
     else:
         raise ValueError("invalid comparison condition")
-    _bc.imm = threshold
-    _bc.cmp = cmp_op
-    _bc.offset = abs(offset)
-    _bc.sign = 0 if offset >= 0 else 1
-    _bc.sub_opcode = SUB_OPCODE_BC
-    _bc.opcode = OPCODE_BRANCH
-    return _bc.all
+    _bs.imm = threshold
+    _bs.cmp = cmp_op
+    _bs.offset = abs(offset)
+    _bs.sign = 0 if offset >= 0 else 1
+    _bs.sub_opcode = SUB_OPCODE_BS
+    _bs.opcode = OPCODE_BRANCH
+    return _bs.all