diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/chip8.c | 7 | ||||
| -rw-r--r-- | sources/iui.c | 306 | ||||
| -rw-r--r-- | sources/main.c | 454 | ||||
| -rw-r--r-- | sources/mem.c | 139 | ||||
| -rw-r--r-- | sources/meta/exec.c | 26 | ||||
| -rw-r--r-- | sources/plat.c | 24 | ||||
| -rw-r--r-- | sources/x11.c | 8 |
7 files changed, 672 insertions, 292 deletions
diff --git a/sources/chip8.c b/sources/chip8.c index 1c5f907..836b9ef 100644 --- a/sources/chip8.c +++ b/sources/chip8.c @@ -7,7 +7,7 @@ #define C8_RESET_VECTOR 0x200 -#define C8_CYCLES_PER_FRAME 1000 +#define C8_CYCLES_PER_FRAME 20 static const u8 fnt[] = { @@ -36,6 +36,7 @@ typedef struct u8 sp; u16 i; + u16 prevkeys; u16 keys; u64 cycles; @@ -137,8 +138,8 @@ void c8_dump_state(chip8* c8, bool stack) printf("V%x: %02X (%3d)\n", i+3, c8->V[i+3], c8->V[i+3]); } - printf(" I:%04X SP: %02X DT: %02X ST: %02X CYCLES: %llu\n", - c8->i, c8->sp, c8->dt, c8->st, c8->cycles); + printf(" I:%04X SP: %02X DT: %02X ST: %02X CYCLES: %llu, KEYS: %X\n", + c8->i, c8->sp, c8->dt, c8->st, c8->cycles, c8->keys); if(stack) { diff --git a/sources/iui.c b/sources/iui.c new file mode 100644 index 0000000..4e656c6 --- /dev/null +++ b/sources/iui.c @@ -0,0 +1,306 @@ +/* + * Copyright (C) 2025 dwlr <dweller@cabin.digital> + * + * BSD 3-Clause License (BSD-3-Clause) + * See LICENSE for details + */ + + +#define IUI_TXT_CENTER bit(0) +#define IUI_CLIP_CLEAR bit(0) + +typedef struct +{ + enum + { + IUI_ILL, + IUI_BOX, + IUI_FILL, + IUI_LINE, + IUI_TEXT, + IUI_CLIP, + + } type; + + u32 color; + u16 x, y, w, h; + u16 size; + u16 flags; + char* text; + +} iui_cmd; + +#define IUI_CMDBUF_LEN 512 +typedef struct +{ + arena* ar; + void* usr; + + usize hot; + usize active; + usize kbdfocus; + + /* mouse */ + u16 x; + u16 y; + + u8 pbtns; + u8 btns; + + /* TODO: event pump */ + + usize ncmds; + iui_cmd cmds[IUI_CMDBUF_LEN]; /* TODO: arena? */ + +} iui; + + +void iui_init(iui* ui, arena* ar, void* usr) +{ + if(!ui) + { + report(WARN, "iui: iui_init() ui == NULL!\n"); + return; + } + + ui->ar = ar; + ui->usr = usr; +} + +void iui_start(iui* ui) +{ + assert(ui); + ui->hot = 0; + + ar_clear(ui->ar); +} + +void iui_end(iui* ui) +{ + assert(ui); + + if(!ui->btns) ui->active = 0; + else if(!ui->active) ui->kbdfocus = 0; + + ui->pbtns = ui->btns; +} + +bool iui_mouse_inside(iui* ui, u16 x, u16 y, u16 w, u16 h) +{ + return !(ui->x < x || ui->y < y || ui->x >= x + w || ui->y >= y + h); +} + +int iui_button(iui* ui, u16 x, u16 y, int w, int h, char* label) +{ + xctx* x11 = (xctx*)ui->usr; + usize id = (usize)label; + bool imhot, imactive; + + if(iui_mouse_inside(ui, x, y, w, h)) + { + bool click = ui->btns & bit(1) && !(ui->pbtns & bit(1)); + if(!ui->active && click) ui->active = id; + ui->hot = id; + } + + imhot = ui->hot == id; + imactive = ui->active == id; + + { + iui_cmd cmd = {0}; + cmd.type = IUI_FILL; + + cmd.x = x; + cmd.y = y; + cmd.w = w; + cmd.h = h; + + if(imhot) cmd.size = 2; + else cmd.size = 1; + + if(imactive) cmd.color = x11->cols.as.fg; + else cmd.color = x11->cols.as.bg; + + ui->cmds[ui->ncmds++] = cmd; + + cmd.type = IUI_BOX; + cmd.color = x11->cols.as.fg; + ui->cmds[ui->ncmds++] = cmd; + + cmd.type = IUI_TEXT; + cmd.size = 14; + cmd.text = label; + cmd.flags = IUI_TXT_CENTER; + + if(imactive) cmd.color = x11->cols.as.bg; + else cmd.color = x11->cols.as.fg; + + ui->cmds[ui->ncmds++] = cmd; + } + + return imhot && imactive && !(ui->btns & bit(1)); +} + +void iui_label(iui* ui, u16 x, u16 y, int w, int h, char* fmt, ...) +{ + int len = 0; + char* buf = NULL; + va_list ap = {0}; + xctx* x11 = (xctx*)ui->usr; + + + va_start(ap, fmt); + len = vsnprintf(NULL, 0, fmt, ap); + va_end(ap); + + if(len) len++; + buf = ar_push(ui->ar, len); + + va_start(ap, fmt); + len = vsnprintf(buf, len, fmt, ap); + va_end(ap); + + { + iui_cmd cmd = {0}; + cmd.type = IUI_FILL; + + cmd.x = x; + cmd.y = y; + cmd.w = w; + cmd.h = h; + + { + iui_cmd clip = cmd; + clip.type = IUI_CLIP; + clip.flags = 0; + clip.x++; + clip.y++; + clip.w--; + clip.h--; + + ui->cmds[ui->ncmds++] = clip; + } + + { + cmd.type = IUI_TEXT; + cmd.size = 14; + cmd.text = buf; + cmd.flags = 0; + + cmd.x = x + 6; + cmd.y = y; + cmd.w = w; + cmd.h = h; + + cmd.color = x11->cols.as.fg; + + ui->cmds[ui->ncmds++] = cmd; + } + + cmd.type = IUI_CLIP; + cmd.flags = IUI_CLIP_CLEAR; + ui->cmds[ui->ncmds++] = cmd; + } +} + +int iui_editbox(iui* ui, u16 x, u16 y, int w, int h, char* buf, usize buflen) +{ + xctx* x11 = (xctx*)ui->usr; + usize id = (usize)buf; + bool imhot, imactive; + usize len; + + len = strlen(buf); + + if(iui_mouse_inside(ui, x, y, w, h)) + { + bool click = ui->btns & bit(1) && !(ui->pbtns & bit(1)); + if(!ui->active && click) ui->active = id; + ui->hot = id; + } + + imhot = ui->hot == id; + imactive = ui->active == id; + + { + iui_cmd cmd = {0}; + cmd.type = IUI_FILL; + + cmd.x = x; + cmd.y = y; + cmd.w = w; + cmd.h = h; + + if(imhot) cmd.size = 2; + else cmd.size = 1; + + cmd.color = x11->cols.as.bg; + ui->cmds[ui->ncmds++] = cmd; + + cmd.type = IUI_BOX; + cmd.color = x11->cols.as.fg; + ui->cmds[ui->ncmds++] = cmd; + + { + iui_cmd clip = cmd; + clip.type = IUI_CLIP; + clip.flags = 0; + clip.x++; + clip.y++; + clip.w--; + clip.h--; + + ui->cmds[ui->ncmds++] = clip; + } + + if(imactive) ui->kbdfocus = id; + if(ui->kbdfocus == id) + { + cmd.type = IUI_FILL; + cmd.x = x + 6 + 6 * len; + cmd.y = y + 6; + cmd.w = 10; + cmd.h = h - 12; + cmd.color = x11->cols.as.fg; + + ui->cmds[ui->ncmds++] = cmd; + } + else + { + cmd.type = IUI_BOX; + cmd.x = x + 6 + 6 * len; + cmd.y = y + 6; + cmd.w = 9; + cmd.h = h - 13; + cmd.color = x11->cols.as.fg; + cmd.size = 1; + + ui->cmds[ui->ncmds++] = cmd; + } + + { + cmd.type = IUI_TEXT; + cmd.size = 14; + cmd.text = buf; + cmd.flags = 0; + + cmd.x = x + 6; + cmd.y = y; + cmd.w = w; + cmd.h = h; + + cmd.color = x11->cols.as.fg; + + ui->cmds[ui->ncmds++] = cmd; + } + + cmd.type = IUI_CLIP; + cmd.flags = IUI_CLIP_CLEAR; + ui->cmds[ui->ncmds++] = cmd; + } + + return imhot && imactive && !(ui->btns & bit(1)); +} + + +void iui_draw(iui* ui); diff --git a/sources/main.c b/sources/main.c index 4049a30..7027451 100644 --- a/sources/main.c +++ b/sources/main.c @@ -21,6 +21,8 @@ #include <sys/stat.h> #include <fcntl.h> +#include <pthread.h> + #include <X11/Xlib.h> #include <X11/Xatom.h> #include <X11/Xutil.h> @@ -28,209 +30,17 @@ #include "bits.c" #include "log.c" +#include "plat.c" +#include "mem.c" #include "tga.c" #include "x11.c" +#include "iui.c" #include "chip8.c" #include "meta/disasm.c" #include "meta/exec.c" -typedef struct -{ - enum - { - IUI_ILL, - IUI_BOX, - IUI_FILL, - IUI_LINE, - IUI_TEXT, - - } type; - - u32 color; - u16 x, y, w, h; - u16 size; - char* text; - -} iui_cmd; - -#define IUI_CMDBUF_LEN 512 -typedef struct -{ - void* usr; - - usize hot; - usize active; - usize kbdfocus; - - /* mouse */ - u16 x; - u16 y; - - u8 pbtns; - u8 btns; - - usize ncmds; - iui_cmd cmds[IUI_CMDBUF_LEN]; /* TODO: arena? */ - -} iui; - - -void iui_start(iui* ui, void* usr) -{ - assert(ui); - - ui->usr = usr; - ui->hot = 0; -} - -void iui_end(iui* ui) -{ - assert(ui); - - if(!ui->btns) ui->active = 0; - else - { - if(!ui->active) ui->kbdfocus = 0; - } - - ui->pbtns = ui->btns; -} - -bool iui_mouse_inside(iui* ui, u16 x, u16 y, u16 w, u16 h) -{ - return !(ui->x < x || ui->y < y || ui->x >= x + w || ui->y >= y + h); -} - -int iui_button(iui* ui, u16 x, u16 y, int w, int h, char* label) -{ - xctx* x11 = (xctx*)ui->usr; - usize id = (usize)label; - bool imhot, imactive; - - if(iui_mouse_inside(ui, x, y, w, h)) - { - bool click = ui->btns & bit(1) && !(ui->pbtns & bit(1)); - if(!ui->active && click) ui->active = id; - ui->hot = id; - } - - imhot = ui->hot == id; - imactive = ui->active == id; - - { - iui_cmd cmd = {0}; - cmd.type = IUI_FILL; - - cmd.x = x; - cmd.y = y; - cmd.w = w; - cmd.h = h; - - if(imhot) cmd.size = 2; - else cmd.size = 1; - - if(imactive) cmd.color = x11->cols.as.fg; - else cmd.color = x11->cols.as.bg; - - ui->cmds[ui->ncmds++] = cmd; - - cmd.type = IUI_BOX; - cmd.color = x11->cols.as.fg; - ui->cmds[ui->ncmds++] = cmd; - - cmd.type = IUI_TEXT; - cmd.size = 14; - cmd.text = label; - - if(imactive) cmd.color = x11->cols.as.bg; - else cmd.color = x11->cols.as.fg; - - ui->cmds[ui->ncmds++] = cmd; - } - - return imhot && imactive && !(ui->btns & bit(1)); -} - -int iui_textbox(iui* ui, u16 x, u16 y, int w, int h, char* buf, usize buflen) -{ - xctx* x11 = (xctx*)ui->usr; - usize id = (usize)buf; - bool imhot, imactive; - usize len; - - len = strlen(buf); - - if(iui_mouse_inside(ui, x, y, w, h)) - { - bool click = ui->btns & bit(1) && !(ui->pbtns & bit(1)); - if(!ui->active && click) ui->active = id; - ui->hot = id; - } - - imhot = ui->hot == id; - imactive = ui->active == id; - - { - XGCValues gcvals = {0}; - - if(imhot) gcvals.line_width = 2; - else gcvals.line_width = 1; - - gcvals.foreground = x11->cols.as.bg; - - XChangeGC(x11->disp, x11->gc, GCForeground | GCLineWidth, &gcvals); - XFillRectangle(x11->disp, x11->wnd, x11->gc, x, y, w, h); - - XSetForeground(x11->disp, x11->gc, x11->cols.as.fg); - XDrawLine(x11->disp, x11->wnd, x11->gc, x, y, x, y + h); - XDrawLine(x11->disp, x11->wnd, x11->gc, x + w, y, x, y); - XDrawLine(x11->disp, x11->wnd, x11->gc, x, y + h, x + w, y + h); - XDrawLine(x11->disp, x11->wnd, x11->gc, x + w, y + h, x + w, y); - } - - if(imactive) ui->kbdfocus = id; - if(ui->kbdfocus == id) - { - - XGCValues gcvals = {0}; - gcvals.foreground = x11->cols.as.fg; - - XChangeGC(x11->disp, x11->gc, GCForeground, &gcvals); - XFillRectangle(x11->disp, x11->wnd, x11->gc, x + 6 + (6 * len), y + 6, 10, h - 12); - } - else - { - XGCValues gcvals = {0}; - gcvals.foreground = x11->cols.as.fg; - gcvals.line_width = 1; - - XChangeGC(x11->disp, x11->gc, GCForeground | GCLineWidth, &gcvals); - XDrawRectangle(x11->disp, x11->wnd, x11->gc, x + 6 + (6 * len), y + 6, 9, h - 13); - } - - { - int xx, yy; - int di, fa, fd; - int width, height; - XCharStruct chs = {0}; - - XTextExtents(x11->xfs, buf, buflen, &di, &fa, &fd, &chs); - height = chs.ascent + chs.descent; - - xx = x + 6; - yy = y + h / 2 + height / 2; - - - if(imactive) XSetForeground(x11->disp, x11->gc, x11->cols.as.bg); - else XSetForeground(x11->disp, x11->gc, x11->cols.as.fg); - XDrawString(x11->disp, x11->wnd, x11->gc, xx, yy, buf, len); - } - - return imhot && imactive && !(ui->btns & bit(1)); -} - void iui_draw(iui* ui) { usize i; @@ -283,7 +93,10 @@ void iui_draw(iui* ui) width = chs.rbearing - chs.lbearing; height = chs.ascent + chs.descent; - xx = cmd->x + cmd->w / 2 - width / 2; + if(cmd->flags & IUI_TXT_CENTER) + xx = cmd->x + cmd->w / 2 - width / 2; + else + xx = cmd->x; yy = cmd->y + cmd->h / 2 + height / 2; XSetForeground(x11->disp, x11->gc, cmd->color); @@ -291,6 +104,22 @@ void iui_draw(iui* ui) } break; + case IUI_CLIP: + { + if(cmd->flags & IUI_CLIP_CLEAR) XSetClipMask(x11->disp, x11->gc, None); + else + { + XRectangle clip_region = {0}; + clip_region.x = cmd->x; + clip_region.y = cmd->y; + clip_region.width = cmd->w; + clip_region.height = cmd->h; + + XSetClipRectangles(x11->disp, x11->gc, 0, 0, &clip_region, 1, Unsorted); + } + } + break; + default: report(WARN, "IUI: Unknown draw command %u\n", cmd->type); break; @@ -300,15 +129,106 @@ void iui_draw(iui* ui) ui->ncmds = 0; } +void c8_dump_state_iui(chip8* c8, bool stack, iui* ui, u16 x, u16 y) +{ + int i = 0; + + u16 dx = x, dy = y; + u16 w = 80, h = 10, p = 5; + + for(i = 0; i < (int)sizeof(c8->V); i += 4) + { + iui_label(ui, dx, dy, w, h, "V%x: %02X (%3d)", i+0, c8->V[i+0], c8->V[i+0]); + dx += w + p; + + iui_label(ui, dx, dy, w, h, "V%x: %02X (%3d)", i+1, c8->V[i+1], c8->V[i+1]); + dx += w + p; + + iui_label(ui, dx, dy, w, h, "V%x: %02X (%3d)", i+2, c8->V[i+2], c8->V[i+2]); + dx += w + p; + + iui_label(ui, dx, dy, w, h, "V%x: %02X (%3d)", i+3, c8->V[i+3], c8->V[i+3]); + + dx = x; + dy += h + p; + } + + iui_label(ui, dx, dy, 1000, h, "I:%04X SP: %02X DT: %02X ST: %02X CYCLES: %llu KEYS: %X", + c8->i, c8->sp, c8->dt, c8->st, c8->cycles, c8->keys); +#if 0 + if(stack) + { + iui_label(ui, "stack:\n"); + for(i = 0; i < (int)sizeof(c8->STACK); i += 2) + { + iui_label(ui, " %-2d: %04X ", i+0, c8->STACK[i+0]); + iui_label(ui, "%-2d: %04X\n", i+1, c8->STACK[i+1]); + } + } +#endif +} + int main(int argc, char** argv) { + chip8 c8 = {0}; xctx x11 = {0}; + arena ar = {0}; iui ui = {0}; bool run = true; - char txtbuf[256] = {0}; + + u64 sz = 0; + FILE* f = NULL; + char buf[512] = {0}; + + srand(time(NULL)); + + if(argc > 1) + { + u64 got = 0; + + f = fopen(argv[1], "r"); + if(!f) return 1; + + fseek(f, 0, SEEK_END); + sz = (u64)ftell(f); + rewind(f); + + if(sz >= (sizeof(c8.RAM) - 512)) return 2; + + got = fread(c8.RAM + C8_RESET_VECTOR, 1, sz, f); + if(got != sz) return 3; + + fclose(f); + } + else + { + c8.RAM[C8_RESET_VECTOR + iota] = 0x60; + c8.RAM[C8_RESET_VECTOR + iota] = 0x04; + + c8.RAM[C8_RESET_VECTOR + iota] = 0x61; + c8.RAM[C8_RESET_VECTOR + iota] = 0x03; + + c8.RAM[C8_RESET_VECTOR + iota] = 0x72; + c8.RAM[C8_RESET_VECTOR + iota] = 0x01; + + c8.RAM[C8_RESET_VECTOR + iota] = 0x80; + c8.RAM[C8_RESET_VECTOR + iota] = 0x14; + + c8.RAM[C8_RESET_VECTOR + iota] = 0x30; + c8.RAM[C8_RESET_VECTOR + iota] = 0x10; + + c8.RAM[C8_RESET_VECTOR + iota] = 0x12; + c8.RAM[C8_RESET_VECTOR + iota] = 0x04; + + sz = iota; + } x11_init(800, 600, "xip-8", argc, argv, &x11); + ar_create(4*MB, true, &ar); + iui_init(&ui, &ar, &x11); + c8_reset(&c8); + c8.running = false; while(run) { @@ -337,6 +257,35 @@ int main(int argc, char** argv) len = XLookupString(&ev.xkey, name, sizeof(name) - 1, &ks, NULL); if(keyup && ks == XK_Escape) run = false; + + if(!ui.kbdfocus) + { + u16 bits = 0; + switch(name[0]) + { + case 'x': bits = bit(0); break; + case '1': bits = bit(1); break; + case '2': bits = bit(2); break; + case '3': bits = bit(3); break; + case 'q': bits = bit(4); break; + case 'w': bits = bit(5); break; + case 'e': bits = bit(6); break; + case 'd': bits = bit(7); break; + case 's': bits = bit(8); break; + case 'a': bits = bit(9); break; + case 'z': bits = bit(10); break; + case 'c': bits = bit(11); break; + case '4': bits = bit(12); break; + case 'r': bits = bit(13); break; + case 'f': bits = bit(14); break; + case 'v': bits = bit(15); break; + default: break; + } + + if(keyup) c8.keys &= ~bits; + else c8.keys |= bits; + } + if(!keyup && len == 1) { if(ui.kbdfocus && (isgraph(name[0]) || name[0] == ' ')) @@ -395,6 +344,12 @@ int main(int argc, char** argv) } } + if(c8.running) + { + c8_disasm(c8.RAM, c8.pc, buf); + c8_exec(c8.RAM, c8.pc, &c8); + } + { int len = 0; char buf[512] = {0}; @@ -414,8 +369,6 @@ int main(int argc, char** argv) len = snprintf(buf, lengthof(buf), "cur: %dx%d", ui.x, ui.y); XDrawString(x11.disp, x11.wnd, x11.gc, 650, 65, buf, len); - iui_draw(&ui); - len = snprintf(buf, lengthof(buf), "btn: %d%d%d", ui.btns & bit(1) ? 1 : 0, ui.btns & bit(2) ? 2 : 0, @@ -430,98 +383,35 @@ int main(int argc, char** argv) len = snprintf(buf, lengthof(buf), "kbd: %p", (void*)ui.kbdfocus); XDrawString(x11.disp, x11.wnd, x11.gc, 650, 125, buf, len); - } - - iui_start(&ui, &x11); - if(iui_button(&ui, 25, 25, 100, 35, "Click ME!")) report(DBG, "CLICK!\n"); - if(iui_button(&ui, 150, 25, 100, 35, "NOT ME!!!")) report(DBG, "WHYYYYYY!\n"); - - iui_textbox(&ui, 25, 75, 225, 35, txtbuf, lengthof(txtbuf)); - if(iui_button(&ui, 275, 75, 100, 35, "OK")) report(DBG, "textbox: '%s'!\n", txtbuf); - iui_end(&ui); - usleep(10000); - } + len = snprintf(buf, lengthof(buf), "ar: %lu bytes", ar.cursor - ar.base); + XDrawString(x11.disp, x11.wnd, x11.gc, 650, 145, buf, len); - x11_cleanup(&x11); - return 0; -} - -int main2(int argc, char** argv) -{ - u64 sz = 0; - FILE* f = NULL; - chip8 c8 = {0}; - - srand(time(NULL)); - - c8_reset(&c8); - - if(argc > 1) - { - u64 got = 0; - - f = fopen(argv[1], "r"); - if(!f) return 1; - - fseek(f, 0, SEEK_END); - sz = (u64)ftell(f); - rewind(f); - - if(sz >= (sizeof(c8.RAM) - 512)) return 2; - - got = fread(c8.RAM + C8_RESET_VECTOR, 1, sz, f); - if(got != sz) return 3; - - fclose(f); - } - else - { - c8.RAM[C8_RESET_VECTOR + iota] = 0x60; - c8.RAM[C8_RESET_VECTOR + iota] = 0x04; - - c8.RAM[C8_RESET_VECTOR + iota] = 0x61; - c8.RAM[C8_RESET_VECTOR + iota] = 0x03; - - c8.RAM[C8_RESET_VECTOR + iota] = 0x72; - c8.RAM[C8_RESET_VECTOR + iota] = 0x01; - - c8.RAM[C8_RESET_VECTOR + iota] = 0x80; - c8.RAM[C8_RESET_VECTOR + iota] = 0x14; - - c8.RAM[C8_RESET_VECTOR + iota] = 0x30; - c8.RAM[C8_RESET_VECTOR + iota] = 0x10; - - c8.RAM[C8_RESET_VECTOR + iota] = 0x12; - c8.RAM[C8_RESET_VECTOR + iota] = 0x04; - - sz = iota; - } + iui_draw(&ui); + } - printf("Disasm:\n"); - { - u64 i; - char buf[512] = {0}; + iui_start(&ui); + c8_dump_state_iui(&c8, false, &ui, 25, 25); + iui_editbox(&ui, 25, 600 - 45, 225, 35, buf, lengthof(buf)); + if(!c8.running && iui_button(&ui, 270, 600 - 45, 100, 35, "Go")) c8.running = true; + else if(c8.running && iui_button(&ui, 270, 600 - 45, 100, 35, "Stop")) c8.running = false; + iui_end(&ui); - for(i = 0; i < sz; i += 2) { - u16 pc = C8_RESET_VECTOR + i; - c8_disasm(c8.RAM, pc, buf); - printf("%04X: %s\n", pc, buf); - } - } + usize x, y, s = 12; - printf("\nExec:\n"); - while(c8.running) - { - char buf[512] = {0}; + XSetForeground(x11.disp, x11.gc, x11.cols.as.fg); + XSetBackground(x11.disp, x11.gc, x11.cols.as.bg); - c8_disasm(c8.RAM, c8.pc, buf); - printf("%04X: %s\n", c8.pc, buf); + for(y = 0; y < 32; y++) + for(x = 0; x < 64; x++) + if(c8.DISPLAY[y] & bit(x)) + XFillRectangle(x11.disp, x11.wnd, x11.gc, 25 + x*s, 128 + y*s, s, s); + } - c8_exec(c8.RAM, c8.pc, &c8); - c8_dump_state(&c8, false); + usleep(100); } + x11_cleanup(&x11); return 0; } diff --git a/sources/mem.c b/sources/mem.c new file mode 100644 index 0000000..3b111f7 --- /dev/null +++ b/sources/mem.c @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2025 dwlr <dweller@cabin.digital> + * + * BSD 3-Clause License (BSD-3-Clause) + * See LICENSE for details + */ + + +typedef struct +{ + u8* base; + u8* cursor; + usize size; + +} arena; + + +typedef struct +{ + u8* base; + ssize pages; + +} do_pagefault_args; +void* do_pagefault(void* arg) +{ + ssize i = 0; + ssize p = mm_pagesize(); + do_pagefault_args* args = (do_pagefault_args*)arg; + if(!args) + { + report(ERR, "do_pagefault() with NULL args!\n"); + return NULL; + } + + for(i = 0; i < args->pages; i++) args->base[p * i] = 0; + + return NULL; +} + +bool ar_create(usize size, bool prefault, arena* ar) +{ + ssize p = mm_pagesize(); + + if(!ar) return false; + if(size <= 0) return false; + + size += (size % p) ? (p - (size % p)) : 0; + + ar->base = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); + if(ar->base == MAP_FAILED) return false; + ar->size = size; + ar->cursor = ar->base; + + if(prefault) + { + ssize i = 0; + ssize cpus = cpu_count(); + pthread_t* t = NULL; + do_pagefault_args* args = NULL; + + t = calloc(cpus, sizeof(t[0])); + if(!t) report(FATAL, "ar_create()/prefault/calloc(t) failed!\n"); + else + { + args = calloc(cpus, sizeof(args[0])); + if(!args) + { + free(t); + report(FATAL, "ar_create()/prefault/calloc(args) failed!\n"); + } + } + + for(i = 1; i < cpus; i++) + { + args[i].base = ar->base + ((size / cpus) * i); + args[i].pages = ((size / p) / cpus); + pthread_create(&t[i], NULL, do_pagefault, &args[i]); + } + + args[0].base = ar->base; + args[0].pages = ((size / p) / cpus); + do_pagefault(&args[0]); + + for(i = 1; i < cpus; i++) pthread_join(t[i], NULL); + + free(args); + free(t); + } + + return true; +} + +#define ar_push(ar, sz) ar_pusha((ar), (sz), sizeof(int), true) +void* ar_pusha(arena* ar, usize size, usize alignment, bool zero) +{ + usize cur, ovfl; + + if(!ar) return NULL; + else + { + cur = align((usize)ar->cursor, alignment); + ovfl = (cur + size); + if(ovfl < cur) return NULL; + + if(ovfl <= (usize)(ar->base + ar->size)) + { + ar->cursor = (u8*)ovfl; + + if(zero) memset((u8*)cur, 0, size); + return (u8*)cur; + } + else + { + report(ERR, "arena(%P): overflow @ %P x %llu\n", ar, cur, size); + return NULL; + } + } +} + +void ar_pop(arena* ar, usize size) +{ + if(!ar) return; + else ar->cursor = min(ar->base, ar->cursor - size); +} + +void ar_clear(arena* ar) +{ + if(ar) ar->cursor = ar->base; +} + +void ar_destroy(arena* ar) +{ + if(!ar) return; + + munmap(ar->base, ar->size); + ar->base = ar->cursor = NULL; + ar->size = 0; +} + diff --git a/sources/meta/exec.c b/sources/meta/exec.c index b5aaba4..663a2ae 100644 --- a/sources/meta/exec.c +++ b/sources/meta/exec.c @@ -34,6 +34,7 @@ BEGIN \ if(c8->st) c8->st--; \ } \ c8->pc += 2; \ + c8->prevkeys = c8->keys; \ END #define X_C8_ILL \ @@ -104,12 +105,12 @@ END #define X_C8_SKP \ BEGIN \ - if(c8->keys & c8->V[x]) c8->pc += 2; \ + if(c8->keys & bit(c8->V[x])) c8->pc += 2; \ END #define X_C8_SKNP \ BEGIN \ - if(!(c8->keys & c8->V[x])) c8->pc += 2; \ + if(!(c8->keys & bit(c8->V[x]))) c8->pc += 2; \ END #define X_C8_MVDT \ @@ -117,10 +118,19 @@ BEGIN \ c8->V[x] = c8->dt; \ END -/* TODO: implement */ #define X_C8_LDK \ BEGIN \ - if(!c8->keys) c8->pc -= 2; \ + int i; \ + if(c8->keys == c8->prevkeys) c8->pc -= 2; \ + else \ + { \ + for(i = 7; i >= 0; i--) \ + if(c8->keys & bit(i)) \ + { \ + c8->V[x] = i; \ + break; \ + } \ + } \ END #define X_C8_LDDT \ @@ -227,8 +237,6 @@ BEGIN \ if(c8->V[x] != c8->V[y]) c8->pc += 2; \ END - -/* TODO: actually implement */ #define X_C8_DRW \ BEGIN \ u8 l; \ @@ -236,7 +244,11 @@ BEGIN \ u8 cy = c8->V[y]; \ \ for(l = 0; l < n; l++) \ - c8->DISPLAY[cy + l * cx] ^= c8->RAM[c8->i + l]; \ + { \ + u64 pix = (u64)c8->RAM[c8->i + l]; \ + pix = (pix << (64 - cx)) | (pix >> cx); \ + c8->DISPLAY[(cy + l) % 32] ^= pix; \ + } \ END c8_decode_generate(exec) diff --git a/sources/plat.c b/sources/plat.c new file mode 100644 index 0000000..afa0f21 --- /dev/null +++ b/sources/plat.c @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2025 dwlr <dweller@cabin.digital> + * + * BSD 3-Clause License (BSD-3-Clause) + * See LICENSE for details + */ + + +ssize cpu_count(void) +{ + static ssize cpus = 0; + if(!cpus) cpus = sysconf(_SC_NPROCESSORS_ONLN); + + return cpus; +} + +ssize mm_pagesize(void) +{ + static ssize page_size = 0; + if(!page_size) page_size = sysconf(_SC_PAGE_SIZE); + + return page_size; +} + diff --git a/sources/x11.c b/sources/x11.c index b9f27b3..7d353cb 100644 --- a/sources/x11.c +++ b/sources/x11.c @@ -1,3 +1,11 @@ +/* + * Copyright (C) 2025 dwlr <dweller@cabin.digital> + * + * BSD 3-Clause License (BSD-3-Clause) + * See LICENSE for details + */ + + #if true != True #error "true != Xlib's True" #endif |