@@ -19,23 +19,31 @@ WITH REGARD TO THIS SOFTWARE.

 #pragma mark - Operations

 /* clang-format off */

+

+/* Utilities */

+static void   (*push)(Stack *s, Uint16 a);

+static Uint16 (*pop8)(Stack *s);

+static Uint16 (*pop)(Stack *s);

+static void   (*poke)(Uint8 *m, Uint16 a, Uint16 b);

+static Uint16 (*peek)(Uint8 *m, Uint16 a);

+

 static void   push8(Stack *s, Uint16 a) { if(s->ptr == 0xff) { s->error = 2; return; } s->dat[s->ptr++] = a; }

 static Uint16  pop8_keep(Stack *s) { if(s->kptr == 0) { s->error = 1; return 0; } return s->dat[--s->kptr]; }

 static Uint16  pop8_nokeep(Stack *s) { if(s->ptr == 0) { s->error = 1; return 0; } return s->dat[--s->ptr]; }

-static Uint16 (*pop8)(Stack *s);

-static void   poke8(Uint8 *m, Uint16 a, Uint8 b) { m[a] = b; }

-static Uint8  peek8(Uint8 *m, Uint16 a) { return m[a]; }

-static void   devw8(Device *d, Uint8 a, Uint8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }

-static Uint8  devr8(Device *d, Uint8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }

-static void   push16(Stack *s, Uint16 a) { push8(s, a >> 8); push8(s, a); }

-static Uint16 pop16(Stack *s) { Uint8 a = pop8(s), b = pop8(s); return a + (b << 8); }

+

+static void   poke8(Uint8 *m, Uint16 a, Uint16 b) { m[a] = b; }

+static Uint16 peek8(Uint8 *m, Uint16 a) { return m[a]; }

 void   poke16(Uint8 *m, Uint16 a, Uint16 b) { poke8(m, a, b >> 8); poke8(m, a + 1, b); }

 Uint16 peek16(Uint8 *m, Uint16 a) { return (peek8(m, a) << 8) + peek8(m, a + 1); }

+

+static void   push16(Stack *s, Uint16 a) { push8(s, a >> 8); push8(s, a); }

+static Uint16 pop16(Stack *s) { Uint8 a = pop8(s), b = pop8(s); return a + (b << 8); }

+

+static void   devw8(Device *d, Uint8 a, Uint8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }

+static Uint8  devr8(Device *d, Uint8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }

 static void   devw16(Device *d, Uint8 a, Uint16 b) { devw8(d, a, b >> 8); devw8(d, a + 1, b); }

 static Uint16 devr16(Device *d, Uint16 a) { return (devr8(d, a) << 8) + devr8(d, a + 1); }

-/* Utilities */

-static Uint16 (*pop)(Stack *s);

-static void (*push)(Stack *s, Uint16 a);

+

 /* Stack */

 static void op_lit(Uxn *u) { push8(u->src, peek8(u->ram.dat, u->ram.ptr++)); }

 static void op_inc(Uxn *u) { Uint8 a = pop8(u->src); push8(u->src, a + 1); }

@@ -55,12 +63,12 @@ static void op_jnz(Uxn *u) { Uint8 a = pop8(u->src); if(pop8(u->src)) u->ram.ptr

 static void op_jsr(Uxn *u) { Uint8 a = pop8(u->src); push16(u->dst, u->ram.ptr); u->ram.ptr += (Sint8)a; }

 static void op_sth(Uxn *u) { Uint8 a = pop8(u->src); push8(u->dst, a); }

 /* Memory */

-static void op_ldz(Uxn *u) { Uint8 a = pop8(u->src); push8(u->src, peek8(u->ram.dat, a)); }

-static void op_stz(Uxn *u) { Uint8 a = pop8(u->src); Uint8 b = pop8(u->src); poke8(u->ram.dat, a, b); }

+static void op_ldz(Uxn *u) { Uint8 a = pop8(u->src); push(u->src, peek(u->ram.dat, a)); }

+static void op_stz(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop(u->src); poke(u->ram.dat, a, b); }

 static void op_ldr(Uxn *u) { Uint8 a = pop8(u->src); push8(u->src, peek8(u->ram.dat, u->ram.ptr + (Sint8)a)); }

 static void op_str(Uxn *u) { Uint8 a = pop8(u->src); Uint8 b = pop8(u->src); poke8(u->ram.dat, u->ram.ptr + (Sint8)a, b); }

-static void op_lda(Uxn *u) { Uint16 a = pop16(u->src); push8(u->src, peek8(u->ram.dat, a)); }

-static void op_sta(Uxn *u) { Uint16 a = pop16(u->src); Uint8 b = pop8(u->src); poke8(u->ram.dat, a, b); }

+static void op_lda(Uxn *u) { Uint16 a = pop16(u->src); push(u->src, peek(u->ram.dat, a)); }

+static void op_sta(Uxn *u) { Uint16 a = pop16(u->src); Uint16 b = pop(u->src); poke(u->ram.dat, a, b); }

 static void op_dei(Uxn *u) { Uint8 a = pop8(u->src); push8(u->src, devr8(&u->dev[a >> 4], a)); }

 static void op_deo(Uxn *u) { Uint8 a = pop8(u->src), b = pop8(u->src); devw8(&u->dev[a >> 4], a, b); }

 /* Arithmetic */

@@ -87,12 +95,8 @@ static void op_jnz16(Uxn *u) { Uint16 a = pop16(u->src); if(pop8(u->src)) u->ram

 static void op_jsr16(Uxn *u) { push16(u->dst, u->ram.ptr); u->ram.ptr = pop16(u->src); }

 static void op_sth16(Uxn *u) { Uint16 a = pop16(u->src); push16(u->dst, a); }

 /* Memory(16-bits) */

-static void op_ldz16(Uxn *u) { Uint8 a = pop8(u->src); push16(u->src, peek16(u->ram.dat, a)); }

-static void op_stz16(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop16(u->src); poke16(u->ram.dat, a, b); }

 static void op_ldr16(Uxn *u) { Uint8 a = pop8(u->src); push16(u->src, peek16(u->ram.dat, u->ram.ptr + (Sint8)a)); }

 static void op_str16(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop16(u->src); poke16(u->ram.dat, u->ram.ptr + (Sint8)a, b); }

-static void op_lda16(Uxn *u) { Uint16 a = pop16(u->src); push16(u->src, peek16(u->ram.dat, a)); }

-static void op_sta16(Uxn *u) { Uint16 a = pop16(u->src); Uint16 b = pop16(u->src); poke16(u->ram.dat, a, b); }

 static void op_dei16(Uxn *u) { Uint8 a = pop8(u->src); push16(u->src, devr16(&u->dev[a >> 4], a)); }

 static void op_deo16(Uxn *u) { Uint8 a = pop8(u->src); Uint16 b = pop16(u->src); devw16(&u->dev[a >> 4], a, b); }

@@ -104,7 +108,7 @@ static void (*ops[])(Uxn *u) = {

 	/* 16-bit */

 	op_lit16, op_inc16, op_pop16, op_dup16, op_nip16, op_swp16, op_ovr16, op_rot16,

 	op_equ, op_neq, op_gth, op_lth, op_jmp16, op_jnz16, op_jsr16, op_sth16, 

-	op_ldz16, op_stz16, op_ldr16, op_str16, op_lda16, op_sta16, op_dei16, op_deo16, 

+	op_ldz, op_stz, op_ldr16, op_str16, op_lda, op_sta, op_dei16, op_deo16, 

 	op_add, op_sub, op_mul, op_div, op_and, op_ora, op_eor, op_sft

 };

@@ -140,9 +144,13 @@ uxn_eval(Uxn *u, Uint16 vec)

 		if(instr & MODE_SHORT) {

 			pop = pop16;

 			push = push16;

+			peek = peek16;

+			poke = poke16;

 		} else {

 			pop = pop8;

 			push = push8;

+			peek = peek8;

+			poke = poke8;

 		}

 		(*ops[(instr & 0x1f) | ((instr & MODE_SHORT) >> 1)])(u);

 		if(u->wst.error)