Refactoring macros.
h3rald h3rald@h3rald.com
Fri, 05 Dec 2025 15:03:12 +0100
1 files changed,
14 insertions(+),
46 deletions(-)
jump to
M
xywrun.c
→
xywrun.c
@@ -207,20 +207,6 @@ }
// clang-format off -#define UNUSED(x) (void)(x) - -//// Operations that support stack and all registers -#define OPC_SR2_old(opc, body) { \ - case opc: { const int w = 0, rx=0, ry=0; xyw_byte a = us_pop(), b = us_pop(); body; } break; \ - case XYW_MODE_X|opc: { const int w = 0, rx=1, ry=0; xyw_byte a = *x, b = us_pop(); body; } break; \ - case XYW_MODE_Y|opc: { const int w = 0, rx=0, ry=1; xyw_byte a = *y, b = us_pop(); body; } break; \ - case XYW_MODE_X|XYW_MODE_Y|opc: { const int w = 0, rx=1, ry=1; xyw_byte a = *x, b = *y; body; } break; \ - case XYW_MODE_W|opc: { const int w = 1, rx=0, ry=0; xyw_word a = us_popw(); xyw_word b = us_popw(); body; } break; \ - case XYW_MODE_X|XYW_MODE_W|opc: { const int w = 1, rx=1, ry=0; xyw_word a = *xw; xyw_word b = us_popw(); body; } break; \ - case XYW_MODE_Y|XYW_MODE_W|opc: { const int w = 1, rx=0, ry=1; xyw_word a = *yw; xyw_word b = us_popw(); body; } break; \ - case XYW_MODE_X|XYW_MODE_Y|XYW_MODE_W|opc: { const int w = 1, rx=1, ry=1; xyw_word a = *xw; xyw_word b = *yw; body; } break; \ -} - //// Operations that support stack and all registers #define OPC_SR2(opc, body) { \ case opc: { const int w = 0; xyw_byte a = us_pop(), b = us_pop(); body; } break; \@@ -234,28 +220,13 @@ case XYW_MODE_X|XYW_MODE_Y|XYW_MODE_W|opc: { const int w = 1; xyw_word a = *xw; xyw_word b = *yw; body; } break; \
} //// Operations that support stack and one register -#define OPC_SR1_old(opc, body) { \ - case opc: { const int w=0, rx=0, ry=0; body; } break; \ - case XYW_MODE_X|opc: { const int w=0, rx=1, ry=0; body; } break; \ - case XYW_MODE_Y|opc: { const int w=0, rx=0, ry=1; body; } break; \ - case XYW_MODE_W|opc: { const int w=1, rx=0, ry=0; body; } break; \ - case XYW_MODE_X|XYW_MODE_W|opc: { const int w=1, rx=1, ry=0; body; } break; \ - case XYW_MODE_Y|XYW_MODE_W|opc: { const int w=1, rx=0, ry=1; body; } break; \ -} - #define OPC_SR1(opc, body) { \ - case opc: { const int w=0, r=0; xyw_byte a = us_pop(); body; } break; \ - case XYW_MODE_X|opc: { const int w=0, r=1; xyw_byte a = *x; body; } break; \ - case XYW_MODE_Y|opc: { const int w=0, r=0; xyw_byte a = *y; body; } break; \ - case XYW_MODE_W|opc: { const int w=1, r=0; xyw_word a = us_popw(); body; } break; \ - case XYW_MODE_X|XYW_MODE_W|opc: { const int w=1, r=1; xyw_word a = *xw; body; } break; \ - case XYW_MODE_Y|XYW_MODE_W|opc: { const int w=1, r=0; xyw_word a = *yw; body; } break; \ -} - -//// Operations that support stack only -#define OPC_S(opc, body) { \ - case opc: { const xyw_byte w = 0; body; } break; \ - case XYW_MODE_W|opc: { const xyw_byte w = 1; body; } break; \ + case opc: { const int w=0; xyw_byte a = us_pop(); body; } break; \ + case XYW_MODE_X|opc: { const int w=0; xyw_byte a = *x; body; } break; \ + case XYW_MODE_Y|opc: { const int w=0; xyw_byte a = *y; body; } break; \ + case XYW_MODE_W|opc: { const int w=1; xyw_word a = us_popw(); body; } break; \ + case XYW_MODE_X|XYW_MODE_W|opc: { const int w=1; xyw_word a = *xw; body; } break; \ + case XYW_MODE_Y|XYW_MODE_W|opc: { const int w=1; xyw_word a = *yw; body; } break; \ } //// POP operations@@ -299,10 +270,6 @@ case XYW_MODE_X|XYW_MODE_Y|opc: { xyw_byte a = *x; xyw_byte b = *y; *x = b; *y = a; } break; \
case XYW_MODE_X|XYW_MODE_Y|XYW_MODE_W|opc: { xyw_word a = *xw; xyw_word b = *yw; *xw = b; *yw = a; } break; \ } -//// "Microcode" similar to Uxn's, to be used with above macros -// Get argument from x/y or stack -//#define ARG rx ? (rx ? (w ? *xw : *x) : (w ? us_popw() : us_pop())) : (ry ? (w ? *yw : *y) : (w ? us_popw() : us_pop())) -//#define ARG r ? (w ? (*xw) : (*x)) : (w ? us_popw() : us_pop()) // Create address based on direct page or full address #define ADDR(ad) w ? ad : (DIRECT_PAGE | ad) // Push a value to stack@@ -310,7 +277,6 @@ #define PUSH(n) do { if (w) { us_pushw(n); } else { us_push(n); } } while(0)
// Pop value from stack #define POP() (w ? us_popw() : (xyw_word)us_pop()) - //// Initialize devices xyw_device xyw_devices[XYW_TOTAL_DEVICES] = {@@ -320,6 +286,8 @@ // Console device
{&xyw_memory[0xff10], 0, console_output}, // ... }; + +//// Main run function // clang-format on int xyw_run(const char *input)@@ -350,10 +318,10 @@ // clang-format off
/* BRK */ case 0x00: return 0; // Halting execution for now /* PSH */ OPC_PSH(0x01); /* POP */ OPC_POP(0x02); - /* LDB */ OPC_SR1(0x04, UNUSED(r); us_push(read( ADDR(a)) )); - /* LDW */ OPC_SR1(0x05, UNUSED(r); us_pushw(readw( ADDR(a)) )); - /* STB */ OPC_SR1(0x06, UNUSED(r); write( ADDR(a), us_pop() )); - /* STW */ OPC_SR1(0x07, UNUSED(r); writew( ADDR(a), us_popw() )); + /* LDB */ OPC_SR1(0x04, us_push(read( ADDR(a)) )); + /* LDW */ OPC_SR1(0x05, us_pushw(readw( ADDR(a)) )); + /* STB */ OPC_SR1(0x06, write( ADDR(a), us_pop() )); + /* STW */ OPC_SR1(0x07, writew( ADDR(a), us_popw() )); /* INC */ OPC_IDC(0x08, +1); /* DEC */ OPC_IDC(0x09, -1); /* SHL */ OPC_SR2(0x0A, PUSH(b << a));@@ -369,9 +337,9 @@ /* LTH */ OPC_SR2(0x13, PUSH(b < a));
/* AND */ OPC_SR2(0x14, PUSH(b & a)); /* IOR */ OPC_SR2(0x15, PUSH(b | a)); /* XOR */ OPC_SR2(0x16, PUSH(b ^ a)); - /* NOT */ OPC_SR1(0x17, UNUSED(r); PUSH(~a)); + /* NOT */ OPC_SR1(0x17, PUSH(~a)); /* SWP */ OPC_SWP(0x18); - /* DUP */ OPC_SR1(0x19, UNUSED(r); PUSH(a)); + /* DUP */ OPC_SR1(0x19, PUSH(a)); /* OVR */ OPC_SR2(0x1A, PUSH(b); PUSH(a); PUSH(b)); /* ROT */ OPC_SR2(0x1B, PUSH(b); PUSH(POP()); PUSH(a)); /* JMP */ case 0x1C: *pc = us_popw()-1; break;