Dariaceli's Git
Browse code

Remove goto/label for jumps.

Andrew Alderwick authored on 12/01/2022 13:09:45
Showing 1 changed files
src/uxn.c
History View file @ 696ef03
... ... 
@@ -59,45 +59,44 @@ uxn_eval(Uxn *u, Uint16 pc)
59 59 
 		switch(instr & 0x1f) {
60 60 
 		/* Stack */
61 61 
 		case 0x00: /* LIT */ if(bs) { PEEK16(a, pc) PUSH16(src, a) pc += 2; }
62 
-		                     else   { a = u->ram[pc]; PUSH8(src, a) pc++; } break;
63 
-		case 0x01: /* INC */ POP(a) PUSH(src, a + 1) break;
64 
-		case 0x02: /* POP */ POP(a) break;
65 
-		case 0x03: /* DUP */ POP(a) PUSH(src, a) PUSH(src, a) break;
66 
-		case 0x04: /* NIP */ POP(a) POP(b) PUSH(src, a) break;
67 
-		case 0x05: /* SWP */ POP(a) POP(b) PUSH(src, a) PUSH(src, b) break;
68 
-		case 0x06: /* OVR */ POP(a) POP(b) PUSH(src, b) PUSH(src, a) PUSH(src, b) break;
69 
-		case 0x07: /* ROT */ POP(a) POP(b) POP(c) PUSH(src, b) PUSH(src, a) PUSH(src, c) break;
62 
+		                     else   { a = u->ram[pc]; PUSH8(src, a) pc++; } continue;
63 
+		case 0x01: /* INC */ POP(a) PUSH(src, a + 1) continue;
64 
+		case 0x02: /* POP */ POP(a) continue;
65 
+		case 0x03: /* DUP */ POP(a) PUSH(src, a) PUSH(src, a) continue;
66 
+		case 0x04: /* NIP */ POP(a) POP(b) PUSH(src, a) continue;
67 
+		case 0x05: /* SWP */ POP(a) POP(b) PUSH(src, a) PUSH(src, b) continue;
68 
+		case 0x06: /* OVR */ POP(a) POP(b) PUSH(src, b) PUSH(src, a) PUSH(src, b) continue;
69 
+		case 0x07: /* ROT */ POP(a) POP(b) POP(c) PUSH(src, b) PUSH(src, a) PUSH(src, c) continue;
70 70 
 		/* Logic */
71 
-		case 0x08: /* EQU */ POP(a) POP(b) PUSH8(src, b == a) break;
72 
-		case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(src, b != a) break;
73 
-		case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(src, b > a) break;
74 
-		case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(src, b < a) break;
75 
-		case 0x0c: /* JMP */ POP(a) goto warp;
76 
-		case 0x0d: /* JCN */ POP(a) POP8(b) if(b) goto warp; break;
77 
-		case 0x0e: /* JSR */ POP(a) PUSH16(dst, pc) goto warp;
78 
-		case 0x0f: /* STH */ POP(a) PUSH(dst, a) break;
71 
+		case 0x08: /* EQU */ POP(a) POP(b) PUSH8(src, b == a) continue;
72 
+		case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(src, b != a) continue;
73 
+		case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(src, b > a) continue;
74 
+		case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(src, b < a) continue;
75 
+		case 0x0c: /* JMP */ POP(a) break;
76 
+		case 0x0d: /* JCN */ POP(a) POP8(b) if(b) break; continue;
77 
+		case 0x0e: /* JSR */ POP(a) PUSH16(dst, pc) break;
78 
+		case 0x0f: /* STH */ POP(a) PUSH(dst, a) continue;
79 79 
 		/* Memory */
80 
-		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(src, b) break;
81 
-		case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
82 
-		case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(src, b) break;
83 
-		case 0x13: /* STR */ POP8(a) POP(b) c = pc + (Sint8)a; POKE(c, b) break;
84 
-		case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(src, b) break;
85 
-		case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
86 
-		case 0x16: /* DEI */ POP8(a) DEVR(b, &u->dev[a >> 4], a) PUSH(src, b) break;
87 
-		case 0x17: /* DEO */ POP8(a) POP(b) DEVW(&u->dev[a >> 4], a, b) break;
80 
+		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(src, b) continue;
81 
+		case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) continue;
82 
+		case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(src, b) continue;
83 
+		case 0x13: /* STR */ POP8(a) POP(b) c = pc + (Sint8)a; POKE(c, b) continue;
84 
+		case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(src, b) continue;
85 
+		case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) continue;
86 
+		case 0x16: /* DEI */ POP8(a) DEVR(b, &u->dev[a >> 4], a) PUSH(src, b) continue;
87 
+		case 0x17: /* DEO */ POP8(a) POP(b) DEVW(&u->dev[a >> 4], a, b) continue;
88 88 
 		/* Arithmetic */
89 
-		case 0x18: /* ADD */ POP(a) POP(b) PUSH(src, b + a) break;
90 
-		case 0x19: /* SUB */ POP(a) POP(b) PUSH(src, b - a) break;
91 
-		case 0x1a: /* MUL */ POP(a) POP(b) PUSH(src, (Uint32)b * a) break;
92 
-		case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) { errcode = 4; goto err; } PUSH(src, b / a) break;
93 
-		case 0x1c: /* AND */ POP(a) POP(b) PUSH(src, b & a) break;
94 
-		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(src, b | a) break;
95 
-		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(src, b ^ a) break;
96 
-		case 0x1f: /* SFT */ POP8(a) POP(b) c = b >> (a & 0x0f) << ((a & 0xf0) >> 4); PUSH(src, c) break;
89 
+		case 0x18: /* ADD */ POP(a) POP(b) PUSH(src, b + a) continue;
90 
+		case 0x19: /* SUB */ POP(a) POP(b) PUSH(src, b - a) continue;
91 
+		case 0x1a: /* MUL */ POP(a) POP(b) PUSH(src, (Uint32)b * a) continue;
92 
+		case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) { errcode = 4; goto err; } PUSH(src, b / a) continue;
93 
+		case 0x1c: /* AND */ POP(a) POP(b) PUSH(src, b & a) continue;
94 
+		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(src, b | a) continue;
95 
+		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(src, b ^ a) continue;
96 
+		case 0x1f: /* SFT */ POP8(a) POP(b) c = b >> (a & 0x0f) << ((a & 0xf0) >> 4); PUSH(src, c) continue;
97 97 
 		}
98 
-		continue;
99 98
100 
-		warp:
99 
+		/* Jump to a */
101 100 
 		if(bs) pc = a; else pc += (Sint8)(a);
102 101 
 		if(!++warp_count && uxn_interrupt(u)) return uxn_halt(u, 6, pc - 1);
103 102 
 	}