commit 5ac6ff4313f3a0845d3def14e63d21362f8b9aef
parent 2fb5f560a72a0064bb3638198eeb3523457aa6ea
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sun, 1 Jan 2023 16:13:34 -0800
All devices but audio ported to new devices scheme
Diffstat:
4 files changed, 31 insertions(+), 58 deletions(-)
diff --git a/src/devices/audio.h b/src/devices/audio.h
@@ -15,6 +15,23 @@ typedef signed int Sint32;
#define SAMPLE_FREQUENCY 44100
#define POLYPHONY 4
+#define DEVPEEK16(o, x) \
+ { \
+ (o) = (d->dat[(x)] << 8) + d->dat[(x) + 1]; \
+ }
+#define DEVPOKE16(x, y) \
+ { \
+ d->dat[(x)] = (y) >> 8; \
+ d->dat[(x) + 1] = (y); \
+ }
+
+typedef struct Device {
+ struct Uxn *u;
+ Uint8 dat[16];
+ Uint8 (*dei)(struct Device *d, Uint8);
+ void (*deo)(struct Device *d, Uint8);
+} Device;
+
Uint8 audio_get_vu(int instance);
Uint16 audio_get_position(int instance);
int audio_render(int instance, Sint16 *sample, Sint16 *end);
diff --git a/src/uxn.c b/src/uxn.c
@@ -20,22 +20,15 @@ WITH REGARD TO THIS SOFTWARE.
#define PUSH8(s, x) { if(s->ptr == 0xff) { errcode = 2; goto err; } s->dat[s->ptr++] = (x); }
#define PUSH16(s, x) { if((j = s->ptr) >= 0xfe) { errcode = 2; goto err; } k = (x); s->dat[j] = k >> 8; s->dat[j + 1] = k; s->ptr = j + 2; }
#define PUSH(s, x) { if(bs) { PUSH16(s, (x)) } else { PUSH8(s, (x)) } }
-#define POP8(o) { if(!(j = *sp)) { errcode = 0; goto err; } o = (Uint16)src->dat[--j]; *sp = j; }
-#define POP16(o) { if((j = *sp) <= 1) { errcode = 0; goto err; } o = src->dat[j - 1]; o += src->dat[j - 2] << 8; *sp = j - 2; }
+#define POP8(o) { if(!(j = *sp)) { errcode = 1; goto err; } o = (Uint16)src->dat[--j]; *sp = j; }
+#define POP16(o) { if((j = *sp) <= 1) { errcode = 1; goto err; } o = src->dat[j - 1]; o += src->dat[j - 2] << 8; *sp = j - 2; }
#define POP(o) { if(bs) { POP16(o) } else { POP8(o) } }
#define POKE(x, y) { if(bs) { u->ram[(x)] = (y) >> 8; u->ram[(x) + 1] = (y); } else { u->ram[(x)] = y; } }
#define PEEK16(o, x) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; }
#define PEEK(o, x) { if(bs) { PEEK16(o, x) } else { o = u->ram[(x)]; } }
-
-#define DEVROLD(o, d, x) { dev = (d); o = dev->dei(dev, (x) & 0x0f); if(bs) { o = (o << 8) + dev->dei(dev, ((x) + 1) & 0x0f); } }
-#define DEVW8OLD(x, y) { dev->dat[(x) & 0xf] = y; dev->deo(dev, (x) & 0x0f); }
-#define DEVWOLD(d, x, y) { dev = (d); if(bs) { DEVW8OLD((x), (y) >> 8); DEVW8OLD((x) + 1, (y)); } else { DEVW8OLD((x), (y)) } }
-
#define DEVR(o, x) { o = u->dei(u, x); if (bs) o = (o << 8) + u->dei(u, ((x) + 1) & 0xFF); }
#define DEVW(x, y) { if (bs) { u->deo(u, (x), (y) >> 8); u->deo(u, ((x) + 1) & 0xFF, (y)); } else { u->deo(u, x, (y)); } }
-
-#define WARP(x) { if(bs) pc = (x); else pc += (Sint8)(x); }
-#define LIMIT 0x40000 /* around 3 ms */
+#define JUMP(x) { if(bs) pc = (x); else pc += (Sint8)(x); }
int
uxn_eval(Uxn *u, Uint16 pc)
@@ -46,22 +39,14 @@ uxn_eval(Uxn *u, Uint16 pc)
if(!pc || u->dev[0x0f]) return 0;
while((instr = u->ram[pc++])) {
/* Return Mode */
- if(instr & 0x40) {
- src = u->rst; dst = u->wst;
- } else {
- src = u->wst; dst = u->rst;
- }
+ if(instr & 0x40) { src = u->rst; dst = u->wst; }
+ else { src = u->wst; dst = u->rst; }
/* Keep Mode */
- if(instr & 0x80) {
- kptr = src->ptr;
- sp = &kptr;
- } else {
- sp = &src->ptr;
- }
+ if(instr & 0x80) { kptr = src->ptr; sp = &kptr; }
+ else { sp = &src->ptr; }
/* Short Mode */
bs = instr & 0x20 ? 1 : 0;
switch(instr & 0x1f) {
- /* Stack */
case 0x00: /* LIT */ PEEK(a, pc) PUSH(src, a) pc += 1 + bs; break;
case 0x01: /* INC */ POP(a) PUSH(src, a + 1) break;
case 0x02: /* POP */ POP(a) break;
@@ -70,16 +55,14 @@ uxn_eval(Uxn *u, Uint16 pc)
case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(src, b) PUSH(src, a) PUSH(src, c) break;
case 0x06: /* DUP */ POP(a) PUSH(src, a) PUSH(src, a) break;
case 0x07: /* OVR */ POP(a) POP(b) PUSH(src, b) PUSH(src, a) PUSH(src, b) break;
- /* Logic */
case 0x08: /* EQU */ POP(a) POP(b) PUSH8(src, b == a) break;
case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(src, b != a) break;
case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(src, b > a) break;
case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(src, b < a) break;
- case 0x0c: /* JMP */ POP(a) WARP(a) break;
- case 0x0d: /* JCN */ POP(a) POP8(b) if(b) WARP(a) break;
- case 0x0e: /* JSR */ POP(a) PUSH16(dst, pc) WARP(a) break;
+ case 0x0c: /* JMP */ POP(a) JUMP(a) break;
+ case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
+ case 0x0e: /* JSR */ POP(a) PUSH16(dst, pc) JUMP(a) break;
case 0x0f: /* STH */ POP(a) PUSH(dst, a) break;
- /* Memory */
case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(src, b) break;
case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(src, b) break;
@@ -88,15 +71,14 @@ uxn_eval(Uxn *u, Uint16 pc)
case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(src, b) break;
case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break;
- /* Arithmetic */
case 0x18: /* ADD */ POP(a) POP(b) PUSH(src, b + a) break;
case 0x19: /* SUB */ POP(a) POP(b) PUSH(src, b - a) break;
case 0x1a: /* MUL */ POP(a) POP(b) PUSH(src, (Uint32)b * a) break;
- case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) { errcode = 4; goto err; } PUSH(src, b / a) break;
+ case 0x1b: /* DIV */ POP(a) POP(b) if(a == 0) { errcode = 3; goto err; } PUSH(src, b / a) break;
case 0x1c: /* AND */ POP(a) POP(b) PUSH(src, b & a) break;
case 0x1d: /* ORA */ POP(a) POP(b) PUSH(src, b | a) break;
case 0x1e: /* EOR */ POP(a) POP(b) PUSH(src, b ^ a) break;
- case 0x1f: /* SFT */ POP8(a) POP(b) c = b >> (a & 0x0f) << ((a & 0xf0) >> 4); PUSH(src, c) break;
+ case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(src, b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
}
}
return 1;
@@ -113,10 +95,10 @@ uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo)
char *cptr = (char *)u;
for(i = 0; i < sizeof(*u); i++)
cptr[i] = 0x00;
- u->ram = ram;
u->wst = (Stack *)(ram + 0x10000);
u->rst = (Stack *)(ram + 0x10100);
u->dev = (Uint8 *)(ram + 0x10200);
+ u->ram = ram;
u->dei = dei;
u->deo = deo;
return 1;
diff --git a/src/uxn.h b/src/uxn.h
@@ -1,6 +1,3 @@
-#ifndef UXN_UXN_H
-#define UXN_UXN_H
-
/*
Copyright (c) 2021 Devine Lu Linvega
@@ -20,24 +17,6 @@ typedef unsigned int Uint32;
#define PAGE_PROGRAM 0x0100
-#define DEVPEEK16(o, x) \
- { \
- (o) = (d->dat[(x)] << 8) + d->dat[(x) + 1]; \
- }
-#define DEVPOKE16(x, y) \
- { \
- d->dat[(x)] = (y) >> 8; \
- d->dat[(x) + 1] = (y); \
- }
-#define GETVECTOR(d) ((d)->dat[0] << 8 | (d)->dat[1])
-
-typedef struct Device {
- struct Uxn *u;
- Uint8 dat[16];
- Uint8 (*dei)(struct Device *d, Uint8);
- void (*deo)(struct Device *d, Uint8);
-} Device;
-
/* clang-format off */
#define GETVEC(d) ((d)[0] << 8 | (d)[1])
@@ -63,8 +42,3 @@ typedef void Deo(Uxn *u, Uint8 addr, Uint8 value);
int uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo);
int uxn_eval(Uxn *u, Uint16 pc);
int uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
-
-/* TODO: remove */
-
-Device *uxn_port(Uxn *u, Uint8 id, Uint8 (*deifn)(Device *, Uint8), void (*deofn)(Device *, Uint8));
-#endif /* UXN_UXN_H */
diff --git a/src/uxnemu.c b/src/uxnemu.c
@@ -48,7 +48,7 @@ static SDL_Thread *stdin_thread;
/* devices */
-static Device *devaudio0;
+static Device *devaudio0;
static Uint8 zoom = 1;
static Uint32 stdin_event, audio0_event;
static Uint64 exec_deadline, deadline_interval, ms_interval;
