d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

About to move the device page

This commit is contained in:
neauoire 2021-03-21 13:52:38 -07:00
parent c60dbfe872
commit 465b85d579
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -20,5 +20,5 @@ cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werr
# cc uxn.c emulator.c -std=c89 -Os -DNDEBUG -g0 -s -Wall -Wno-unknown-pragmas -L/usr/local/lib -lSDL2 -o bin/emulator # cc uxn.c emulator.c -std=c89 -Os -DNDEBUG -g0 -s -Wall -Wno-unknown-pragmas -L/usr/local/lib -lSDL2 -o bin/emulator
# run # run
./bin/assembler projects/software/left.usm bin/boot.rom ./bin/assembler projects/software/noodle.usm bin/boot.rom
./bin/emulator bin/boot.rom ./bin/emulator bin/boot.rom

4
emulator.c
View File

@ -409,7 +409,7 @@ file_poke(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1)
Uint8 Uint8
system_poke(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1) system_poke(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1)
{ {
loadtheme(&m[0xfff8]); loadtheme(&m[PAGE_DEVICE + 0x00f8]);
(void)ptr; (void)ptr;
(void)b0; (void)b0;
return b1; return b1;
@ -431,7 +431,7 @@ start(Uxn *u)
{ {
int ticknext = 0; int ticknext = 0;
evaluxn(u, u->vreset); evaluxn(u, u->vreset);
loadtheme(u->ram.dat + 0xfff8); loadtheme(u->ram.dat + PAGE_DEVICE + 0x00f8);
if(screen.reqdraw) if(screen.reqdraw)
redraw(pixels, u); redraw(pixels, u);
while(1) { while(1) {

12
uxn.c
View File

@ -18,8 +18,8 @@ WITH REGARD TO THIS SOFTWARE.
/* clang-format off */ /* clang-format off */
void setflag(Uint8 *a, char flag, int b) { if(b) *a |= flag; else *a &= (~flag); } void setflag(Uint8 *a, char flag, int b) { if(b) *a |= flag; else *a &= (~flag); }
int getflag(Uint8 *a, char flag) { return *a & flag; } int getflag(Uint8 *a, char flag) { return *a & flag; }
Uint8 devpoke8(Uxn *u, Uint8 id, Uint8 b0, Uint8 b1){ return id < u->devices ? u->dev[id].poke(u->ram.dat, 0xff00 + id * 0x10, b0, b1) : b1; } Uint8 devpoke8(Uxn *u, Uint8 id, Uint8 b0, Uint8 b1){ return id < u->devices ? u->dev[id].poke(u->ram.dat, PAGE_DEVICE + id * 0x10, b0, b1) : b1; }
void mempoke8(Uxn *u, Uint16 a, Uint8 b) { u->ram.dat[a] = a >= 0xff00 ? devpoke8(u, (a & 0xff) >> 4, a & 0xf, b) : b; } void mempoke8(Uxn *u, Uint16 a, Uint8 b) { u->ram.dat[a] = a >= PAGE_DEVICE ? devpoke8(u, (a & 0xff) >> 4, a & 0xf, b) : b; }
Uint8 mempeek8(Uxn *u, Uint16 a) { return u->ram.dat[a]; } Uint8 mempeek8(Uxn *u, Uint16 a) { return u->ram.dat[a]; }
void mempoke16(Uxn *u, Uint16 a, Uint16 b) { mempoke8(u, a, b >> 8); mempoke8(u, a + 1, b); } void mempoke16(Uxn *u, Uint16 a, Uint16 b) { mempoke8(u, a, b >> 8); mempoke8(u, a + 1, b); }
Uint16 mempeek16(Uxn *u, Uint16 a) { return (mempeek8(u, a) << 8) + mempeek8(u, a + 1); } Uint16 mempeek16(Uxn *u, Uint16 a) { return (mempeek8(u, a) << 8) + mempeek8(u, a + 1); }
@ -212,9 +212,9 @@ loaduxn(Uxn *u, char *filepath)
if(!(f = fopen(filepath, "rb"))) if(!(f = fopen(filepath, "rb")))
return haltuxn(u, "Missing input rom.", 0); return haltuxn(u, "Missing input rom.", 0);
fread(u->ram.dat, sizeof(u->ram.dat), 1, f); fread(u->ram.dat, sizeof(u->ram.dat), 1, f);
u->vreset = mempeek16(u, 0xfff0); u->vreset = mempeek16(u, PAGE_DEVICE + 0x00f0);
u->vframe = mempeek16(u, 0xfff2); u->vframe = mempeek16(u, PAGE_DEVICE + 0x00f2);
u->verror = mempeek16(u, 0xfff4); u->verror = mempeek16(u, PAGE_DEVICE + 0x00f4);
printf("Uxn loaded[%s] vrst:%04x vfrm:%04x verr:%04x.\n", printf("Uxn loaded[%s] vrst:%04x vfrm:%04x verr:%04x.\n",
filepath, filepath,
u->vreset, u->vreset,
@ -227,7 +227,7 @@ Device *
portuxn(Uxn *u, char *name, Uint8 (*pofn)(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1)) portuxn(Uxn *u, char *name, Uint8 (*pofn)(Uint8 *m, Uint16 ptr, Uint8 b0, Uint8 b1))
{ {
Device *d = &u->dev[u->devices++]; Device *d = &u->dev[u->devices++];
d->addr = 0xff00 + (u->devices - 1) * 0x10; d->addr = PAGE_DEVICE + (u->devices - 1) * 0x10;
d->poke = pofn; d->poke = pofn;
printf("Device #%d: %s, at 0x%04x \n", u->devices - 1, name, d->addr); printf("Device #%d: %s, at 0x%04x \n", u->devices - 1, name, d->addr);
return d; return d;

1
uxn.h
View File

@ -20,6 +20,7 @@ typedef signed short Sint16;
#define FLAG_SHORT 0x02 #define FLAG_SHORT 0x02
#define FLAG_RETURN 0x04 #define FLAG_RETURN 0x04
#define FLAG_COND 0x08 #define FLAG_COND 0x08
#define PAGE_DEVICE 0xff00
typedef struct { typedef struct {
Uint8 ptr; Uint8 ptr;