fix JUMPS for all "single instruction" conditions

JUMPS can only do LT, LE and GE comparisons. GT and EQ can be emulated
by the assembler generating 2 instructions using supported conditions
to achieve the desired effect.

For now only the "natively-supported" comparisons are supported.
Support for the dual-instruction jumps will be added in an upcoming
commit.

In other words this change temporarily removes support for the GT and
EQ conditions, given they resulted in incorrect instructions anyway.
Implementing them correctly requires the upcoming dual-instruction
approach.

Author: wnienhaus

esp32_ulp/opcodes.py

@@ -301,7 +301,7 @@ def arg_qualify(arg):
             if 0 <= reg <= 3:
                 return ARG(REG, reg, arg)
             raise ValueError('arg_qualify: valid registers are r0, r1, r2, r3. Given: %s' % arg)
-        if arg_lower in ['--', 'eq', 'ov', 'lt', 'gt', 'ge']:
+        if arg_lower in ['--', 'eq', 'ov', 'lt', 'gt', 'ge', 'le']:
             return ARG(COND, arg_lower, arg)
     try:
         return ARG(IMM, int(arg), arg)
@@ -661,10 +661,10 @@ def i_jumps(offset, threshold, condition):
     condition = get_cond(condition)
     if condition == 'lt':
         cmp_op = BRCOND_LT
-    elif condition == 'gt':
-        cmp_op = BRCOND_GT
-    elif condition == 'eq':
-        cmp_op = BRCOND_EQ
+    elif condition == 'le':
+        cmp_op = BRCOND_LE
+    elif condition == 'ge':
+        cmp_op = BRCOND_GE
     else:
         raise ValueError("invalid comparison condition")
     _bs.imm = threshold

tests/compat/jumps.S

@@ -6,6 +6,10 @@ entry:
   jumps entry, 42, lt
   jumps entry, 42, lt
   jumps later, 42, lt
+  jumps entry, 42, le
+  jumps later, 42, le
+  jumps entry, 42, ge
+  jumps later, 42, ge
 
   jumpr entry, 42, lt
   jumpr later, 42, lt