Check jmp_pin specified when JMP PIN opcodes used

NathanY3G · NathanY3G · commit 04ce6a6e8c54 · 2021-07-23T13:35:20.000+02:00
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -367,6 +367,12 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
                 out_loaded = true;
             }
         }
+        if (instruction == pio_instr_bits_jmp) {
+            uint16_t condition = (full_instruction & 0x00e0) >> 5;
+            if ((condition == 0x6) && (jmp_pin == NULL)) {
+                mp_raise_ValueError_varg(translate("Missing jmp_pin. Instruction %d jumps on pin"), i);
+            }
+        }
         if (instruction == pio_instr_bits_wait) {
             uint16_t wait_source = (full_instruction & 0x0060) >> 5;
             uint16_t wait_index = full_instruction & 0x001f;

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,12 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,`
`367`	`367`	`out_loaded = true;`
`368`	`368`	`}`
`369`	`369`	`}`
	`370`	`+ if (instruction == pio_instr_bits_jmp) {`
	`371`	`+ uint16_t condition = (full_instruction & 0x00e0) >> 5;`
	`372`	`+ if ((condition == 0x6) && (jmp_pin == NULL)) {`
	`373`	`+ mp_raise_ValueError_varg(translate("Missing jmp_pin. Instruction %d jumps on pin"), i);`
	`374`	`+ }`
	`375`	`+ }`
`370`	`376`	`if (instruction == pio_instr_bits_wait) {`
`371`	`377`	`uint16_t wait_source = (full_instruction & 0x0060) >> 5;`
`372`	`378`	`uint16_t wait_index = full_instruction & 0x001f;`