A problem with jumps over next instruction fixed.

Author: dmitry1945

gas/config/tc-esp32ulp.c

@@ -1127,26 +1127,37 @@ INSTR_T esp32ulp_cmd_jump_relr(Expr_Node* step, Expr_Node* thresh, int cond)
 	unsigned int local_op = I_JUMP_RELR(thresh_val, cond, step_val>>2);
 	return conscode(gencode(local_op), conctcode(Expr_Node_Gen_Reloc(step, BFD_RELOC_ESP32ULP_JUMPR_STEP), Expr_Node_Gen_Reloc(thresh, BFD_RELOC_ESP32ULP_JUMPR_THRESH)));
 }
+
+// Conditions for JUMPS instructions
+#define JUMPS_EQ 3 
+#define JUMPS_GT 4
+#define JUMPS_LE 2
+#define JUMPS_LT 0
+#define JUMPS_GE 1
+
+// Step to reach next instruction
+#define NEXT_INSTRUCTION_STEP  4
+
 INSTR_T esp32ulp_cmd_jump_rels(Expr_Node* step, Expr_Node* thresh, int cond)
 {
 	int step_val = EXPR_VALUE(step);
 	int thresh_val = EXPR_VALUE(thresh);
 
-	if ((cond == 3) || (cond == 4)) // EQ == 3, GT = 4
+	if ((cond == JUMPS_EQ) || (cond == JUMPS_GT)) // EQ == 3, GT = 4
 	{
-
+		// Conditions for multiple instructions
 		unsigned int walk_cond = 0;
 		unsigned int result_cond = 0;
 
-		if (cond == 3) // EQ
+		if (cond == JUMPS_EQ) // EQ
 		{
 			//	Jumps   Next, threshold, LT
 			//	Jumps   step, threshold, LE
 			//Next : something
 			walk_cond = 0;
 			result_cond = 2;
 		}
-		if (cond == 4) // GT
+		if (cond == JUMPS_GT) // GT
 		{
 			//	Jumps   Next,  threshold, LE
 			//	Jumps   step, threshold,  GE
@@ -1155,14 +1166,21 @@ INSTR_T esp32ulp_cmd_jump_rels(Expr_Node* step, Expr_Node* thresh, int cond)
 			walk_cond = 2;
 			result_cond = 1;
 		}
-		unsigned int local_walk = I_JUMP_RELS(thresh_val, walk_cond, 4 >> 2);
+		// Step over next jumps
+		unsigned int local_walk = I_JUMP_RELS(thresh_val, walk_cond, (NEXT_INSTRUCTION_STEP*2) >> 2);
+		// In case of back jump, we have to add additional jumps instruction to the step value
+		if (step_val < 0) step_val = step_val - 4;
+
+		// Step to the target instruction
 		unsigned int local_result = I_JUMP_RELS(thresh_val, result_cond, step_val >> 2);
 
+		// Main instruction that makes jump
 		INSTR_T result = conscode(gencode(local_result),
 			conctcode(Expr_Node_Gen_Reloc(step, BFD_RELOC_ESP32ULP_JUMPR_STEP),
 			Expr_Node_Gen_Reloc(thresh, BFD_RELOC_ESP32ULP_JUMPS_THRESH)
 			)
 			);
+		// Additional instructiion for add additional check of the condition
 		INSTR_T walk1 = conscode(gencode(local_walk),
 			conctcode(Expr_Node_Gen_Reloc(thresh, BFD_RELOC_ESP32ULP_JUMPS_THRESH), NULL
 			)

gas/testsuite/gas/esp32ulp/compare/esp32ulp_all.lst

@@ -136,7 +136,7 @@ ESP32ULP GAS  ./gas/testsuite/gas/esp32ulp/esp32ulp_all.s 			page 1
  127              	
  128              	//jumps
  129              	
- 130 00e8 14000284 	         JUMPS     4, 20, EQ                    //Jump to address “position + 16” if value in S
+ 130 00e8 14000484 	         JUMPS     4, 20, EQ                    //Jump to address “position + 16” if value in S
  130      14000384 
  131 00f0 00000040 	         nop
  132 00f4 00000040 	         nop
@@ -168,7 +168,7 @@ ESP32ULP GAS  ./gas/testsuite/gas/esp32ulp/esp32ulp_all.s 			page 1
  158 012c 00010074 	        STAGE_INC  16                           // set stage_cnt to 16
  159 0130 10002074 	labelsd:  STAGE_DEC  1                          // stage_cnt--;
  160 0134 00000040 	        NOP                                     // do something
- 161 0138 00000384 	        JUMPS       labelsd,0,GT                // jump to address label if stage_cnt > 0
+ 161 0138 00000584 	        JUMPS       labelsd,0,GT                // jump to address label if stage_cnt > 0
  161      00800685 
  162              	
  163              	// Sleep

gas/testsuite/gas/esp32ulp/compare/esp32ulp_ranges.lst

@@ -74,14 +74,14 @@ ESP32ULP GAS  ./gas/testsuite/gas/esp32ulp/esp32ulp_ranges.s 			page 1
   68 0038 00001C83 		JUMPR min_jumpr2, min_thresh2, LT	
   69 003c 00001E83 		JUMPR max_jumpr2, max_thresh2, LT	
   70              	
-  71 0040 00000284 		JUMPS min_jumpr2, min_threshs3, EQ	
+  71 0040 00000484 		JUMPS min_jumpr2, min_threshs3, EQ	
   71      00002385 
-  72 0048 00000284 		JUMPS max_jumpr2, max_threshs3, EQ	
+  72 0048 00000484 		JUMPS max_jumpr2, max_threshs3, EQ	
   72      00002785 
   73              	
-  74 0050 00000284 		JUMPS min_jumpr2, min_threshs3, EQ	
+  74 0050 00000484 		JUMPS min_jumpr2, min_threshs3, EQ	
   74      00002B85 
-  75 0058 00000284 		JUMPS max_jumpr2, max_threshs3, EQ	
+  75 0058 00000484 		JUMPS max_jumpr2, max_threshs3, EQ	
   75      00002F85 
   76              	
   77