From 1fd0206de58614e00d3180e67df1271d26c26a17 Mon Sep 17 00:00:00 2001 From: Stefan Arentz Date: Wed, 16 Nov 2016 21:05:31 -0500 Subject: [PATCH] Fixes #16 - Move WOZ Monitor to separate file --- ewm.c | 37 +------------------------------------ roms/apple1.rom | Bin 0 -> 256 bytes 2 files changed, 1 insertion(+), 36 deletions(-) create mode 100755 roms/apple1.rom diff --git a/ewm.c b/ewm.c index 759ee98..a208683 100644 --- a/ewm.c +++ b/ewm.c @@ -30,41 +30,6 @@ #include "mem.h" #include "pia.h" -static uint8_t woz_monitor[256] = { - 0xD8, 0x58, 0xA0, 0x7F, 0x8C, 0x12, 0xD0, 0xA9, - 0xA7, 0x8D, 0x11, 0xD0, 0x8D, 0x13, 0xD0, 0xC9, - 0xDF, 0xF0, 0x13, 0xC9, 0x9B, 0xF0, 0x03, 0xC8, - 0x10, 0x0F, 0xA9, 0xDC, 0x20, 0xEF, 0xFF, 0xA9, - 0x8D, 0x20, 0xEF, 0xFF, 0xA0, 0x01, 0x88, 0x30, - 0xF6, 0xAD, 0x11, 0xD0, 0x10, 0xFB, 0xAD, 0x10, - 0xD0, 0x99, 0x00, 0x02, 0x20, 0xEF, 0xFF, 0xC9, - 0x8D, 0xD0, 0xD4, 0xA0, 0xFF, 0xA9, 0x00, 0xAA, - 0x0A, 0x85, 0x2B, 0xC8, 0xB9, 0x00, 0x02, 0xC9, - 0x8D, 0xF0, 0xD4, 0xC9, 0xAE, 0x90, 0xF4, 0xF0, - 0xF0, 0xC9, 0xBA, 0xF0, 0xEB, 0xC9, 0xD2, 0xF0, - 0x3B, 0x86, 0x28, 0x86, 0x29, 0x84, 0x2A, 0xB9, - 0x00, 0x02, 0x49, 0xB0, 0xC9, 0x0A, 0x90, 0x06, - 0x69, 0x88, 0xC9, 0xFA, 0x90, 0x11, 0x0A, 0x0A, - 0x0A, 0x0A, 0xA2, 0x04, 0x0A, 0x26, 0x28, 0x26, - 0x29, 0xCA, 0xD0, 0xF8, 0xC8, 0xD0, 0xE0, 0xC4, - 0x2A, 0xF0, 0x97, 0x24, 0x2B, 0x50, 0x10, 0xA5, - 0x28, 0x81, 0x26, 0xE6, 0x26, 0xD0, 0xB5, 0xE6, - 0x27, 0x4C, 0x44, 0xFF, 0x6C, 0x24, 0x00, 0x30, - 0x2B, 0xA2, 0x02, 0xB5, 0x27, 0x95, 0x25, 0x95, - 0x23, 0xCA, 0xD0, 0xF7, 0xD0, 0x14, 0xA9, 0x8D, - 0x20, 0xEF, 0xFF, 0xA5, 0x25, 0x20, 0xDC, 0xFF, - 0xA5, 0x24, 0x20, 0xDC, 0xFF, 0xA9, 0xBA, 0x20, - 0xEF, 0xFF, 0xA9, 0xA0, 0x20, 0xEF, 0xFF, 0xA1, - 0x24, 0x20, 0xDC, 0xFF, 0x86, 0x2B, 0xA5, 0x24, - 0xC5, 0x28, 0xA5, 0x25, 0xE5, 0x29, 0xB0, 0xC1, - 0xE6, 0x24, 0xD0, 0x02, 0xE6, 0x25, 0xA5, 0x24, - 0x29, 0x07, 0x10, 0xC8, 0x48, 0x4A, 0x4A, 0x4A, - 0x4A, 0x20, 0xE5, 0xFF, 0x68, 0x29, 0x0F, 0x09, - 0xB0, 0xC9, 0xBA, 0x90, 0x02, 0x69, 0x06, 0x2C, - 0x12, 0xD0, 0x30, 0xFB, 0x8D, 0x12, 0xD0, 0x60, - 0x00, 0x00, 0x00, 0x0F, 0x00, 0xFF, 0x00, 0x00 -}; - // Apple 1 / 8K RAM / WOZ Monitor static int setup_apple1(struct cpu_t *cpu) { @@ -72,7 +37,7 @@ static int setup_apple1(struct cpu_t *cpu) { pia_init(pia); pia_trace(pia, 0); cpu_add_ram(cpu, 0x0000, 8 * 1024); - cpu_add_rom_data(cpu, 0xff00, 0x0100, woz_monitor); + cpu_add_rom_file(cpu, 0xff00, "roms/apple1.com"); cpu_add_iom(cpu, EWM_A1_PIA6820_ADDR, EWM_A1_PIA6820_LENGTH, pia, pia_read, pia_write); return 0; } diff --git a/roms/apple1.rom b/roms/apple1.rom new file mode 100755 index 0000000000000000000000000000000000000000..7280907226f38c9243aa42bcba245bf5824b764e GIT binary patch literal 256 zcmcZ+v7o+3=)%h7y@D5dg)f}E|3UcV><`Q*1o&6pQF#AMm0|CJ1@xLUPO>||g%+56$j$#oOHeE4v3*N4|9FMY6X(`eId(E>_& zZaB#`fi1J+WTtKjhg-cCCP4m=+A15w6IHL7ox{7vyz*3DywP$J