Skip to content

Updates to z65 #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidgiven merged 5 commits into from
Jan 29, 2026
Merged

Updates to z65 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b14cff
Added two missing opcodes + optional status bas implementation
venomix666 Jan 25, 2026
8fa79d4
Add another missing opcode
venomix666 Jan 25, 2026
aa543bb
Added DEBUG and STATUS as build flags
venomix666 Jan 26, 2026
37e050f
Allow unchanges blocks of up to 0xFF bytes when saving
venomix666 Jan 26, 2026
c2a736c
Increased number of cached pages to improve performance
venomix666 Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion third_party/z65/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

llvmprogram(
name="z65",
cflags=["-Ithird_party/zmalloc"],
cflags=["-Ithird_party/zmalloc -DDEBUG=0 -DSTATUS=1"],
srcs=["./z65.c"],
deps=["lib+cpm65", "third_party/zmalloc+zmalloc"],
)
128 changes: 108 additions & 20 deletions third_party/z65/z65.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <stdint.h>
#include <cpm.h>
#include "lib/printi.h"
#include "lib/screen.h"
#include "zmalloc.h"

/* ============================================================
Expand Down Expand Up @@ -73,6 +74,7 @@
#define OP0_POP 0x09
#define OP0_QUIT 0x0A
#define OP0_NEW_LINE 0x0B
#define OP0_SHOW_STATUS 0x0C
#define OP0_VERIFY 0x0D

// VAR
Expand All @@ -82,6 +84,7 @@
#define OPV_JG 0x03
#define OPV_DEC_CHK 0x04
#define OPV_INC_CHK 0x05
#define OPV_JIN 0x06
#define OPV_TEST 0x07
#define OPV_STOREW 0x21
#define OPV_STOREB 0x22
Expand All @@ -92,7 +95,8 @@
#define OPV_RANDOM 0x27
#define OPV_AND 0x09
#define OPV_OR 0x08
#define OPV_NOT 0x0B
#define OPV_TEST_ATTR 0x0A
#define OPV_SET_ATTR 0x0B
#define OPV_INSERT_OBJ 0x0E
#define OPV_LOADW 0x0F
#define OPV_STORE 0x0D
Expand All @@ -110,6 +114,7 @@
*/

#define HDR_VERSION 0x00
#define HDR_FLAGS 0x01
#define HDR_PC 0x06
#define HDR_DICT 0x08
#define HDR_OBJ 0x0A
Expand All @@ -123,8 +128,7 @@
*/

#define PAGE_SIZE 512
#define NUM_PAGES 2
#define DYNAMIC_MEM_MAX 12000
#define NUM_PAGES 8

#define STACK_SIZE 512
#define MAX_FRAMES 16
Expand All @@ -134,7 +138,8 @@
#define INPUT_MAX 80
#define MAX_TOKENS 16

// #define DEBUG
#define DEBUG 0
#define STATUS 1

/* ============================================================
* Structures
Expand Down Expand Up @@ -208,7 +213,9 @@ static void z_ret(uint16_t v);

static uint8_t w_addr;

#ifdef DEBUG
static uint8_t status = 0;

#if DEBUG
static long int opcnt = 0;
#endif

Expand All @@ -232,7 +239,7 @@ static void spc(void)
cpm_conout(' ');
}

#ifdef DEBUG
#if DEBUG
static void print_hex(uint16_t val)
{
cpm_printstring("0x");
Expand Down Expand Up @@ -386,7 +393,7 @@ static uint16_t get_var(uint8_t v, uint8_t indirect)
}
uint16_t a = (hdr[HDR_GLB] << 8) + hdr[HDR_GLB + 1] + 2 * (v - 16);
uint16_t ret_data = zm_read16(a);
#ifdef DEBUG
#if DEBUG
cpm_printstring("Read global variable ");
print_hex(v);
cpm_printstring(" data: ");
Expand Down Expand Up @@ -920,7 +927,7 @@ uint8_t save_game(void)
enc++;
} else {
zero_cnt++;
if (zero_cnt == 0x80) {
if (zero_cnt == 0xff) {
write_zero_block(&saveFile, writeSector, zero_cnt);
enc += zero_cnt;
zero_cnt = 0;
Expand Down Expand Up @@ -1137,21 +1144,71 @@ static uint16_t rng_next(void)

static void unimplemented(uint8_t opcode)
{
#ifdef DEBUG
crlf();
printi(op);
spc();
print_hex(pc);
printi(opcode);
#if DEBUG
spc();
print_hex(pc);
#endif
fatal("Non-implemented opcode");
fatal(" Non-implemented opcode");
}

#if STATUS
static void update_status(void) {
if(!status) return;

uint8_t save_x, save_y;
screen_getcursor(&save_x, &save_y);
screen_setcursor(0, 0);
screen_setstyle(1);

// Score/turn mode
uint16_t room = get_var(16,0);
uint16_t v1 = get_var(17,0);
uint16_t v2 = get_var(18,0);

if (room) {
uint16_t entry = obj_addr(room);
uint16_t prop_table = zm_read16(entry + 7);
uint8_t name_len = zm_read8(prop_table);
if (name_len != 0)
print_zstring(prop_table + 1);
}
spc();
if((hdr[HDR_FLAGS] & 0x02) == 0) {
// Score/turn mode
cpm_printstring("Score: ");
printi(v1);
cpm_printstring(" Turns: ");
printi(v2);
} else {
// Time mode
if(v1<10)
putc('0');
printi(v1);
putc(':');
if(v2<10)
putc('0');
printi(v2);
}
uint8_t xsize, ysize,x,y;
screen_getsize(&xsize, &ysize);
screen_getcursor(&x,&y);
while(x<=xsize) {
putc(' ');
x++;
}
screen_setstyle(0);
screen_setcursor(save_x, save_y);

}
#endif

static void step(void)
{
uint8_t op = zm_read8(pc++);

#ifdef DEBUG
#if DEBUG
printi(opcnt++);
spc();
cpm_printstring("OP: ");
Expand Down Expand Up @@ -1303,7 +1360,7 @@ static void step(void)
}

default:
#ifdef DEBUG
#if DEBUG
crlf();
printi(op);
spc();
Expand Down Expand Up @@ -1475,7 +1532,11 @@ static void step(void)
case OP0_NEW_LINE:
crlf();
break;

case OP0_SHOW_STATUS:
#if STATUS
update_status();
#endif
break;
case OP0_QUIT:
cpm_warmboot();
break;
Expand Down Expand Up @@ -1580,7 +1641,10 @@ static void step(void)
uint16_t text = operands[0];
uint16_t parse = operands[1];
char line[INPUT_MAX] = { 0 };
uint8_t len = read_line(line);
#if STATUS
update_status();
#endif
uint8_t len = read_line(line);
uint8_t max = zm_read8(text);
if (len > max)
len = max;
Expand All @@ -1589,7 +1653,9 @@ static void step(void)
zm_write8(text + 1 + i, line[i]);

zm_write8(text + 1 + len, 0);

#if STATUS
update_status();
#endif
tokenize(line, parse, text);
break;
}
Expand Down Expand Up @@ -1650,10 +1716,23 @@ static void step(void)
branch(value < (int16_t)operands[1]);
break;
}
case OP2_INSERT_OBJ:
case OPV_INSERT_OBJ:
obj_insert(operands[0], operands[1]);
break;

case OPV_JIN: {
uint8_t parent;
parent = obj_parent(operands[0]);
branch(parent == operands[1]);
break;
}
case OPV_TEST_ATTR:
branch(obj_test_attr(operands[0], operands[1]));
break;
case OPV_SET_ATTR:
obj_set_attr(operands[0], operands[1]);
break;

default:
unimplemented(op);
}
Expand All @@ -1666,7 +1745,16 @@ static void step(void)

int main(int agrv, char **argv)
{
cpm_printstring("z65 - Z-machine v3 interpreter");
#if STATUS
// Initate screen driver for status bar if available
if(screen_init()) {
status = 1;
screen_clear();
screen_setcursor(0,1);
}
#endif

cpm_printstring("z65 - Z-machine v3 interpreter");
crlf();
crlf();

Expand Down