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

Starting cleanup

This commit is contained in:
neauoire 2021-03-22 16:51:12 -07:00
parent 118afe5fb4
commit 1db61376a2
5 changed files with 242 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sh
View File

@ -17,12 +17,12 @@ clang-format -i uxn.c
clang-format -i emulator.c clang-format -i emulator.c
rm -f ./bin/emulator rm -f ./bin/emulator
cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined uxn.c emulator.c -L/usr/local/lib -lSDL2 -o bin/emulator cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined uxn.c emulator.c -L/usr/local/lib -lSDL2 -o bin/emulator
cc -std=c89 -DNO_SDL -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined uxn.c emulator.c -L/usr/local/lib -lSDL2 -o bin/emulator-nosdl
# 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
# Emulator(CLI)
clang-format -i emulator-cli.c
rm -f ./bin/emulator-cli
# run # run
if [ "${#}" -gt 0 ]; then ./bin/assembler projects/software/nasu.usm bin/boot.rom
exec ./run.sh "${@}"
fi
./bin/assembler projects/software/noodle.usm bin/boot.rom
./bin/emulator bin/boot.rom ./bin/emulator bin/boot.rom

236
emulator-cli.c Normal file
View File

@ -0,0 +1,236 @@
#include <stdio.h>
/*
Copyright (c) 2021 Devine Lu Linvega
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE.
*/
#include "uxn.h"
#pragma mark - Core
int
error(char *msg, const char *err)
{
printf("Error %s: %s\n", msg, err);
return 0;
}
#pragma mark - Devices
Uint8
console_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
{
Uint8 *m = u->ram.dat;
switch(b0) {
case 0x08: printf("%c", b1); break;
case 0x09: printf("0x%02x\n", b1); break;
case 0x0b: printf("0x%04x\n", (m[ptr + 0x0a] << 8) + b1); break;
}
fflush(stdout);
(void)m;
(void)ptr;
(void)b0;
return b1;
}
Uint8
file_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
{
Uint8 *m = u->ram.dat;
char *name = (char *)&m[(m[ptr + 8] << 8) + m[ptr + 8 + 1]];
Uint16 length = (m[ptr + 8 + 2] << 8) + m[ptr + 8 + 3];
if(b0 == 0x0d) {
Uint16 addr = (m[ptr + 8 + 4] << 8) + b1;
FILE *f = fopen(name, "r");
if(f && fread(&m[addr], length, 1, f)) {
fclose(f);
printf("Loaded %d bytes, at %04x from %s\n", length, addr, name);
}
} else if(b0 == 0x0f) {
Uint16 addr = (m[ptr + 8 + 6] << 8) + b1;
FILE *f = fopen(name, "w");
if(fwrite(&m[addr], length, 1, f)) {
fclose(f);
printf("Saved %d bytes, at %04x from %s\n", length, addr, name);
}
}
return b1;
}
static void
stack_diff(Stack *old, Stack *new, char *title)
{
size_t i;
printf("%6s: ", title);
for(i = 0;; ++i) {
if(i < old->ptr) {
if(i < new->ptr) {
if(old->dat[i] == new->dat[i]) {
printf(" \033[0m%02x", new->dat[i]);
} else {
printf(" \033[0;31m%02x\033[33;1m%02x", old->dat[i], new->dat[i]);
}
} else { /* only in old stack */
printf(" \033[0;31m%02x", old->dat[i]);
}
} else {
if(i < new->ptr) { /* only in new stack */
printf(" \033[33;1m%02x", new->dat[i]);
} else { /* in neither stack, end of loop */
break;
}
}
}
printf("\033[0m\n");
}
static void
memory_diff(Uint8 *old, Uint8 *new, size_t start, size_t end)
{
size_t i, j;
for(i = start; i < end; i += 0x10) {
int changes = 0;
for(j = i; j < i + 0x10; ++j) {
if(old[j] != new[j]) {
changes = 1;
break;
}
}
if(!changes) continue;
printf("0x%04lx: ", i);
for(j = i; j < i + 0x10; ++j) {
printf("\033[%sm%02x", old[j] == new[j] ? "0" : "33;1", new[j]);
if(j % 2) putchar(' ');
}
printf(" ");
for(j = i; j < i + 0x10; ++j) {
printf("\033[%sm%c", old[j] == new[j] ? "0" : "33;1", (new[j] < ' ' || new[j] > '~') ? '.' : new[j]);
}
printf("\033[0m\n");
}
}
Uint8
debug_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
{
size_t i;
(void)ptr;
switch(b0) {
case 0x08: /* stack */
printf("pc %04x working stack:", u->ram.ptr);
for(i = 0; i < u->wst.ptr; ++i) {
printf(" %02x", u->wst.dat[i]);
}
printf(", return stack: ");
for(i = 0; i < u->rst.ptr; ++i) {
printf(" %02x", u->rst.dat[i]);
}
printf("\n");
if(b1 && b1 != u->wst.ptr) {
printf("length %d failed to match %d!\n", b1, u->wst.ptr);
exit(1);
}
break;
case 0x09: /* snapshot */
if(u->snapshot != NULL) {
if(!(b1 & 0x01)) {
stack_diff(&u->snapshot->wst, &u->wst, "work");
}
if(!(b1 & 0x02)) {
stack_diff(&u->snapshot->rst, &u->rst, "return");
}
if(!(b1 & 0x04)) {
memory_diff(u->snapshot->ram.dat, u->ram.dat, 0, PAGE_DEVICE);
memory_diff(u->snapshot->ram.dat, u->ram.dat, PAGE_DEVICE + 0x0100, 0x10000);
}
}
{
int want_snapshot = !(b1 & 0x80);
if(want_snapshot) {
if(u->snapshot == NULL) {
u->snapshot = malloc(sizeof(*u));
}
for(i = 0; i < sizeof(*u); ++i) {
((char *)u->snapshot)[i] = ((char *)u)[i];
}
}
printf("pc 0x%04x snapshot%s taken\n", u->counter, want_snapshot ? "" : " not");
}
break;
case 0x0a: /* exit */
printf("Exited after 0x%04x cycles.\n", u->counter);
exit(b1);
break;
case 0x0f: /* test mode */
u->test_mode = b1;
printf("Test mode is now 0x%02x: ", u->test_mode);
if(b1 & 0x01) {
printf("BRK resets stacks to zero length");
} else {
printf("all test mode features disabled");
}
printf("\n");
break;
}
fflush(stdout);
return b1;
}
Uint8
ppnil(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
{
(void)u;
(void)ptr;
(void)b0;
return b1;
}
#pragma mark - Generics
int
start(Uxn *u)
{
evaluxn(u, u->vreset);
evaluxn(u, u->vframe);
}
int
main(int argc, char **argv)
{
Uxn u;
if(argc < 2)
return error("Input", "Missing");
if(!bootuxn(&u))
return error("Boot", "Failed");
if(!loaduxn(&u, argv[1]))
return error("Load", "Failed");
if(!init())
return error("Init", "Failed");
portuxn(&u, "console", console_poke);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "file", file_poke);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil);
portuxn(&u, "debug", debug_poke);
portuxn(&u, "system", system_poke);
return 0;
}

140
emulator.c
View File

@ -238,7 +238,6 @@ quit(void)
int int
init(void) init(void)
{ {
#ifndef NO_SDL
if(SDL_Init(SDL_INIT_VIDEO) < 0) if(SDL_Init(SDL_INIT_VIDEO) < 0)
return error("Init", SDL_GetError()); return error("Init", SDL_GetError());
gWindow = SDL_CreateWindow("Uxn", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH * ZOOM, HEIGHT * ZOOM, SDL_WINDOW_SHOWN); gWindow = SDL_CreateWindow("Uxn", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH * ZOOM, HEIGHT * ZOOM, SDL_WINDOW_SHOWN);
@ -255,7 +254,6 @@ init(void)
clear(pixels); clear(pixels);
SDL_StartTextInput(); SDL_StartTextInput();
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
#endif
screen.bounds.x1 = PAD * 8; screen.bounds.x1 = PAD * 8;
screen.bounds.x2 = WIDTH - PAD * 8 - 1; screen.bounds.x2 = WIDTH - PAD * 8 - 1;
screen.bounds.y1 = PAD * 8; screen.bounds.y1 = PAD * 8;
@ -412,131 +410,6 @@ file_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
return b1; return b1;
} }
static void
stack_diff(Stack *old, Stack *new, char *title)
{
size_t i;
printf("%6s: ", title);
for (i = 0;; ++i) {
if (i < old->ptr) {
if (i < new->ptr) {
if (old->dat[i] == new->dat[i]) {
printf(" \033[0m%02x", new->dat[i]);
}
else {
printf(" \033[0;31m%02x\033[33;1m%02x", old->dat[i], new->dat[i]);
}
}
else { /* only in old stack */
printf(" \033[0;31m%02x", old->dat[i]);
}
}
else {
if (i < new->ptr) { /* only in new stack */
printf(" \033[33;1m%02x", new->dat[i]);
}
else { /* in neither stack, end of loop */
break;
}
}
}
printf("\033[0m\n");
}
static void
memory_diff(Uint8 *old, Uint8 *new, size_t start, size_t end)
{
size_t i, j;
for (i = start; i < end; i += 0x10) {
int changes = 0;
for (j = i; j < i + 0x10; ++j ) {
if (old[j] != new[j]) {
changes = 1;
break;
}
}
if (!changes) continue;
printf("0x%04lx: ", i);
for (j = i; j < i + 0x10; ++j) {
printf("\033[%sm%02x", old[j] == new[j] ? "0" : "33;1", new[j]);
if (j % 2) putchar(' ');
}
printf(" ");
for (j = i; j < i + 0x10; ++j) {
printf("\033[%sm%c", old[j] == new[j] ? "0" : "33;1",
(new[j] < ' ' || new[j] > '~') ? '.' : new[j]);
}
printf("\033[0m\n");
}
}
Uint8
debug_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
{
size_t i;
(void)ptr;
switch (b0) {
case 0x08: /* stack */
printf("pc %04x working stack:", u->ram.ptr);
for (i = 0; i < u->wst.ptr; ++i) {
printf(" %02x", u->wst.dat[i]);
}
printf(", return stack: ");
for (i = 0; i < u->rst.ptr; ++i) {
printf(" %02x", u->rst.dat[i]);
}
printf("\n");
if (b1 && b1 != u->wst.ptr) {
printf("length %d failed to match %d!\n", b1, u->wst.ptr);
exit(1);
}
break;
case 0x09: /* snapshot */
if (u->snapshot != NULL) {
if (!(b1 & 0x01)) {
stack_diff(&u->snapshot->wst, &u->wst, "work");
}
if (!(b1 & 0x02)) {
stack_diff(&u->snapshot->rst, &u->rst, "return");
}
if (!(b1 & 0x04)) {
memory_diff(u->snapshot->ram.dat, u->ram.dat, 0, PAGE_DEVICE);
memory_diff(u->snapshot->ram.dat, u->ram.dat, PAGE_DEVICE + 0x0100, 0x10000);
}
}
{
int want_snapshot = !(b1 & 0x80);
if (want_snapshot) {
if (u->snapshot == NULL) {
u->snapshot = malloc(sizeof(*u));
}
for (i = 0; i < sizeof(*u); ++i) {
((char *) u->snapshot)[i] = ((char *) u)[i];
}
}
printf("pc 0x%04x snapshot%s taken\n", u->counter, want_snapshot ? "" : " not");
}
break;
case 0x0a: /* exit */
printf("Exited after 0x%04x cycles.\n", u->counter);
exit(b1);
break;
case 0x0f: /* test mode */
u->test_mode = b1;
printf("Test mode is now 0x%02x: ", u->test_mode);
if (b1 & 0x01) {
printf("BRK resets stacks to zero length");
}
else {
printf("all test mode features disabled");
}
printf("\n");
break;
}
fflush(stdout);
return b1;
}
Uint8 Uint8
system_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1) system_poke(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
{ {
@ -561,17 +434,12 @@ ppnil(Uxn *u, Uint16 ptr, Uint8 b0, Uint8 b1)
int int
start(Uxn *u) start(Uxn *u)
{ {
#ifndef NO_SDL
int ticknext = 0; int ticknext = 0;
#endif
evaluxn(u, u->vreset); evaluxn(u, u->vreset);
loadtheme(u->ram.dat + PAGE_DEVICE + 0x00f8); loadtheme(u->ram.dat + PAGE_DEVICE + 0x00f8);
#ifndef NO_SDL
if(screen.reqdraw) if(screen.reqdraw)
redraw(pixels, u); redraw(pixels, u);
#endif
while(1) { while(1) {
#ifndef NO_SDL
int tick = SDL_GetTicks(); int tick = SDL_GetTicks();
SDL_Event event; SDL_Event event;
if(tick < ticknext) if(tick < ticknext)
@ -592,16 +460,9 @@ start(Uxn *u)
break; break;
} }
} }
#endif
if (u->test_mode & 0x01) {
u->wst.ptr = 0;
u->rst.ptr = 0;
}
evaluxn(u, u->vframe); evaluxn(u, u->vframe);
#ifndef NO_SDL
if(screen.reqdraw) if(screen.reqdraw)
redraw(pixels, u); redraw(pixels, u);
#endif
} }
} }
@ -633,7 +494,6 @@ main(int argc, char **argv)
portuxn(&u, "empty", ppnil); portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil); portuxn(&u, "empty", ppnil);
portuxn(&u, "empty", ppnil); portuxn(&u, "empty", ppnil);
portuxn(&u, "debug", debug_poke);
portuxn(&u, "system", system_poke); portuxn(&u, "system", system_poke);
/* Write screen size to dev/screen */ /* Write screen size to dev/screen */

31
projects/text.txt
View File

@ -1,31 +0,0 @@
This is the first line.
This is a tabbed line.
The previous line is blank.
This is another tabbed line.
This is a very long line, This is a very long line, This is a very long line, This is a very long line.
This is a text block This is
is a text block This is a te
This is a text block This is
is a text block This is a te
This is a text block This is
is a text block This is a te
This is a text block This is
is a text block This is a te
oneword
two words
( parens )
[ block ]
{ curlies }
Depth1
Depth2
Depth3
Depth4
Depth5
This is the last line.

3
uxn.h
View File

@ -40,12 +40,11 @@ typedef struct Device {
} Device; } Device;
typedef struct Uxn { typedef struct Uxn {
Uint8 literal, status, devices, test_mode; Uint8 literal, status, devices;
Uint16 counter, vreset, vframe, verror; Uint16 counter, vreset, vframe, verror;
Stack wst, rst, *src, *dst; Stack wst, rst, *src, *dst;
Memory ram; Memory ram;
Device dev[16]; Device dev[16];
struct Uxn *snapshot;
} Uxn; } Uxn;
void setflag(Uint8 *status, char flag, int b); void setflag(Uint8 *status, char flag, int b);