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

Return stack is now St8

This commit is contained in:
neauoire 2021-02-11 09:45:35 -08:00
parent 4e9ca47e38
commit 8671c98771
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli.c
View File

@ -38,7 +38,7 @@ consolew(Device *d, Uint8 b)
}
void
echos(Stack8 *s, Uint8 len, char *name)
echos(St8 *s, Uint8 len, char *name)
{
int i;
printf("\n%s\n", name);

2
emulator.c
View File

@ -106,7 +106,7 @@ init(void)
}
void
echos(Stack8 *s, Uint8 len, char *name)
echos(St8 *s, Uint8 len, char *name)
{
int i;
printf("\n%s\n", name);

27
uxn.c
View File

@ -19,15 +19,32 @@ WITH REGARD TO THIS SOFTWARE.
void setflag(Uint8 *st, char flag, int b) { if(b) *st |= flag; else *st &= (~flag); }
int getflag(Uint8 *st, char flag) { return *st & flag; }
Uint8 mempeek8(Uxn *u, Uint16 s) { return u->ram.dat[s]; }
Uint16 mempeek16(Uxn *u, Uint16 s) { return (u->ram.dat[s] << 8) + (u->ram.dat[s + 1] & 0xff); }
void wspush8(Uxn *u, Uint8 b) { u->wst.dat[u->wst.ptr++] = b; }
Uint8 wspop8(Uxn *u) { return u->wst.dat[--u->wst.ptr]; }
Uint8 wspeek8(Uxn *u, Uint8 o) { return u->wst.dat[u->wst.ptr - o]; }
Uint8 mempeek8(Uxn *u, Uint16 s) { return u->ram.dat[s]; }
void wspush16(Uxn *u, Uint16 s) { wspush8(u,s >> 8); wspush8(u,s & 0xff); }
Uint16 wspop16(Uxn *u) { return wspop8(u) + (wspop8(u) << 8); }
Uint16 wspeek16(Uxn *u, Uint8 o) { return (u->wst.dat[u->wst.ptr - o] << 8) + u->wst.dat[u->wst.ptr - o + 1]; }
void rspush16(Uxn *u, Uint16 a) { u->rst.dat[u->rst.ptr++] = a; }
Uint16 mempeek16(Uxn *u, Uint16 s) { return (u->ram.dat[s] << 8) + (u->ram.dat[s + 1] & 0xff); }
Uint8 rspop8(Uxn *u){
return u->rst.dat[--u->rst.ptr];
}
void rspush16(Uxn *u, Uint16 a) {
u->rst.dat[u->rst.ptr++] = (a >> 8) & 0xff;
u->rst.dat[u->rst.ptr++] = a & 0xff;
}
Uint16 rspop16(Uxn *u) {
return rspop8(u) + (rspop8(u) << 8);
}
/* I/O */
void op_brk(Uxn *u) { setflag(&u->status,FLAG_HALT, 1); }
@ -40,8 +57,8 @@ void op_ldr(Uxn *u) { Uint16 a = wspop16(u); wspush8(u, u->ram.dat[a]); }
void op_str(Uxn *u) { Uint16 a = wspop16(u); Uint8 b = wspop8(u); u->ram.dat[a] = b; }
/* Logic */
void op_jmp(Uxn *u) { u->ram.ptr = wspop16(u); }
void op_jsr(Uxn *u) { u->rst.dat[u->rst.ptr++] = u->ram.ptr; u->ram.ptr = wspop16(u); }
void op_rts(Uxn *u) { u->ram.ptr = u->rst.dat[--u->rst.ptr]; }
void op_jsr(Uxn *u) { rspush16(u, u->ram.ptr); u->ram.ptr = wspop16(u); }
void op_rts(Uxn *u) { u->ram.ptr = rspop16(u); }
/* Stack */
void op_pop(Uxn *u) { wspop8(u); }
void op_dup(Uxn *u) { wspush8(u, wspeek8(u, 1)); }

10
uxn.h
View File

@ -22,12 +22,7 @@ typedef unsigned short Uint16;
typedef struct {
Uint8 ptr;
Uint8 dat[256];
} Stack8;
typedef struct {
Uint8 ptr;
Uint16 dat[256];
} Stack16;
} St8;
typedef struct {
Uint16 ptr;
@ -43,8 +38,7 @@ typedef struct Device {
typedef struct {
Uint8 literal, status, devices;
Uint16 counter, devr, devw, vreset, vframe, verror;
Stack8 wst;
Stack16 rst;
St8 wst, rst;
Memory ram;
Device dev[256];
} Uxn;