commit 7616af7

Devine Lu Linvega  ·  2023-01-12 17:45:19 +0000 UTC
parent 256b7ca 
Swapped JCI and JMI
2 files changed,  +4, -4
M src/uxn.c
M src/uxnasm.c
M src/uxn.c
+2, -2 
 1@@ -50,8 +50,8 @@ uxn_eval(Uxn *u, Uint16 pc)
 2 		switch(opcode - (!opcode * (instr >> 5))) {
 3 		/* Literals/Calls */
 4 		case -0x0: /* BRK */ return 1;
 5-		case -0x1: /* JMI */ PEEK16(a, pc) pc += a + 2; break;
 6-		case -0x2: /* JCI */ sp = &u->wst->ptr; src = u->wst; POP8(b) if(b) { PEEK16(a, pc) pc += a + 2; } else pc += 2; break;
 7+		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
 8+		case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break;
 9 		case -0x3: /* JSI */ PUSH16(u->rst, pc + 2) PEEK16(a, pc) pc += a + 2; break;
10 		case -0x4: /* LIT */
11 		case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(src, a) break;
M src/uxnasm.c
+2, -2 
 1@@ -317,10 +317,10 @@ parse(char *w, FILE *f)
 2 	case ';': /* literal short absolute */
 3 		makereference(p.scope, w, p.ptr + 1);
 4 		return writeshort(0xffff, 1);
 5-	case '!': /* JMI */
 6+	case '?': /* JCI */
 7 		makereference(p.scope, w, p.ptr + 1);
 8 		return writebyte(0x20) && writeshort(0xffff, 0);
 9-	case '?': /* JCI */
10+	case '!': /* JMI */
11 		makereference(p.scope, w, p.ptr + 1);
12 		return writebyte(0x40) && writeshort(0xffff, 0);
13 	case '"': /* raw string */