From d01df862dc27a704ea7c37f41df215a2bf70eb2f Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 19 Feb 2024 11:04:46 -0800
Subject: [PATCH] uxnmin restored classic abc core

---
 ref/uxnmin.c | 94 +++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 49 deletions(-)

diff --git a/ref/uxnmin.c b/ref/uxnmin.c
index f322a25..07edd92 100644
--- a/ref/uxnmin.c
+++ b/ref/uxnmin.c
@@ -43,65 +43,61 @@ emu_deo(Uxn *u, Uint8 addr, Uint8 value)
 #define POKE(x, y, r) { if(m2) { r = (x); ram[r++] = y >> 8; ram[r] = y; } else ram[(x)] = (y); }
 #define DEVR(o, p)    { if(m2) { o = (emu_dei(u, p) << 8) | emu_dei(u, p + 1); } else o = emu_dei(u, p); }
 #define DEVW(p, y)    { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); }
-#define next { ins = ram[pc++]; \
-	m2 = ins & 0x20; \
-	s = ins & 0x40 ? &u->rst : &u->wst; \
-	if(ins & 0x80) kp = s->ptr, sp = &kp; else sp = &s->ptr; \
-	goto *lut[ins & 0x1f]; }
 
 int
 uxn_eval(Uxn *u, Uint16 pc)
 {
-	Uint8 t, kp, *sp, ins, m2, *ram = u->ram;
-	Uint16 tt, a, b, c;
-	Stack *s;
-	static void* lut[] = {
-		&&_imm, &&_inc, &&_pop, &&_nip, &&_swp, &&_rot, &&_dup, &&_ovr,
-		&&_equ, &&_neq, &&_gth, &&_lth, &&_jmp, &&_jcn, &&_jsr, &&_sth,
-		&&_ldz, &&_stz, &&_ldr, &&_str, &&_lda, &&_sta, &&_dei, &&_deo,
-		&&_add, &&_sub, &&_mul, &&_div, &&_and, &&_ora, &&_eor, &&_sft };
+	Uint8 *ram = u->ram;
 	if(!pc || u->dev[0x0f]) return 0;
-	next
-	_imm: 
+	for(;;) {
+		Uint16 tt, a, b, c;
+		Uint8 t, kp, *sp, ins = ram[pc++];
+		/* 2 */ Uint8 m2 = ins & 0x20;
+		/* r */ Stack *s = ins & 0x40 ? &u->rst : &u->wst;
+		/* k */ if(ins & 0x80) kp = s->ptr, sp = &kp; else sp = &s->ptr;
+		switch(ins & 0x1f) {
+		case 0x00:
 		switch(ins) {
 			case 0x00: /* BRK */ return 1;
-			case 0x20: /* JCI */ POP1(b) if(!b) { pc += 2; break; }
+			case 0x20: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* fall */
 			case 0x40: /* JMI */ a = ram[pc++] << 8 | ram[pc++]; pc += a; break;
 			case 0x60: /* JSI */ PUSH2(pc + 2) a = ram[pc++] << 8 | ram[pc++]; pc += a; break;
+			case 0xa0: case 0xe0: /* LIT2 */ PUSH1(ram[pc++]) /* fall */
 			case 0x80: case 0xc0: /* LIT  */ PUSH1(ram[pc++]) break;
-			case 0xa0: case 0xe0: /* LIT2 */ PUSH1(ram[pc++]) PUSH1(ram[pc++]) break;
-		} next
-	_inc: POPx(a) PUSHx(a + 1) next
-	_pop: POPx(a) next
-	_nip: POPx(a) POPx(b) PUSHx(a) next
-	_swp: POPx(a) POPx(b) PUSHx(a) PUSHx(b) next
-	_rot: POPx(a) POPx(b) POPx(c) PUSHx(b) PUSHx(a) PUSHx(c) next
-	_dup: POPx(a) PUSHx(a) PUSHx(a) next
-	_ovr: POPx(a) POPx(b) PUSHx(b) PUSHx(a) PUSHx(b) next
-	_equ: POPx(a) POPx(b) PUSH1(b == a) next
-	_neq: POPx(a) POPx(b) PUSH1(b != a) next
-	_gth: POPx(a) POPx(b) PUSH1(b > a) next
-	_lth: POPx(a) POPx(b) PUSH1(b < a) next
-	_jmp: POPx(a) JUMP(a) next
-	_jcn: POPx(a) POP1(b) if(b) JUMP(a) next
-	_jsr: POPx(a) FLIP PUSH2(pc) JUMP(a) next
-	_sth: POPx(a) FLIP PUSHx(a) next
-	_ldz: POP1(a) PEEK(b, a, t) PUSHx(b) next
-	_stz: POP1(a) POPx(b) POKE(a, b, t) next
-	_ldr: POP1(a) PEEK(b, pc + (Sint8)a, tt) PUSHx(b) next
-	_str: POP1(a) POPx(b) POKE(pc + (Sint8)a, b, tt) next
-	_lda: POP2(a) PEEK(b, a, tt) PUSHx(b) next
-	_sta: POP2(a) POPx(b) POKE(a, b, tt) next
-	_dei: POP1(a) DEVR(b, a) PUSHx(b) next
-	_deo: POP1(a) POPx(b) DEVW(a, b) next
-	_add: POPx(a) POPx(b) PUSHx(b + a) next
-	_sub: POPx(a) POPx(b) PUSHx(b - a) next
-	_mul: POPx(a) POPx(b) PUSHx(b * a) next
-	_div: POPx(a) POPx(b) PUSHx(a ? b / a : 0) next
-	_and: POPx(a) POPx(b) PUSHx(b & a) next
-	_ora: POPx(a) POPx(b) PUSHx(b | a) next
-	_eor: POPx(a) POPx(b) PUSHx(b ^ a) next
-	_sft: POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) next
+		} break;
+		case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
+		case 0x02: /* POP */ POPx(a) break;
+		case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break;
+		case 0x04: /* SWP */ POPx(a) POPx(b) PUSHx(a) PUSHx(b) break;
+		case 0x05: /* ROT */ POPx(a) POPx(b) POPx(c) PUSHx(b) PUSHx(a) PUSHx(c) break;
+		case 0x06: /* DUP */ POPx(a) PUSHx(a) PUSHx(a) break;
+		case 0x07: /* OVR */ POPx(a) POPx(b) PUSHx(b) PUSHx(a) PUSHx(b) break;
+		case 0x08: /* EQU */ POPx(a) POPx(b) PUSH1(b == a) break;
+		case 0x09: /* NEQ */ POPx(a) POPx(b) PUSH1(b != a) break;
+		case 0x0a: /* GTH */ POPx(a) POPx(b) PUSH1(b > a) break;
+		case 0x0b: /* LTH */ POPx(a) POPx(b) PUSH1(b < a) break;
+		case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
+		case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
+		case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
+		case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
+		case 0x10: /* LDZ */ POP1(a) PEEK(b, a, t) PUSHx(b) break;
+		case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b, t) break;
+		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a, tt) PUSHx(b) break;
+		case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b, tt) break;
+		case 0x14: /* LDA */ POP2(a) PEEK(b, a, tt) PUSHx(b) break;
+		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b, tt) break;
+		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
+		case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
+		case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;
+		case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break;
+		case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx(b * a) break;
+		case 0x1b: /* DIV */ POPx(a) POPx(b) PUSHx(a ? b / a : 0) break;
+		case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break;
+		case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break;
+		case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break;
+		case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
+		}
+	}
 }
 
 void