From 06011e2902a6bcc9ce58e35b4f7b2b5a1fbe8ab5 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sat, 3 Jan 2015 13:11:56 -0800
Subject: [PATCH] New disk tests and improvements

    - Exercise various TRACING codepaths
    - Adds ProDOS-order tests
---
 disks/blank.nib.gz    | Bin 12982 -> 12844 bytes
 disks/blank.po.gz     | Bin 0 -> 7420 bytes
 src/test/testcommon.c |   2 +-
 src/test/testdisk.c   | 780 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 781 insertions(+), 1 deletion(-)
 create mode 100644 disks/blank.po.gz

diff --git a/disks/blank.nib.gz b/disks/blank.nib.gz
index 7c2dab77dd96305a1db31a37be633a0436b495d2..06fefc48eaa2b9ff909d19ce40e81ad03fa0aa66 100644
GIT binary patch
literal 12844
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

literal 12982
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

diff --git a/disks/blank.po.gz b/disks/blank.po.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5da13302f1e171ce08555743d86804e27cbf928d
GIT binary patch
literal 7420
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
F{{g*TfG7X}

literal 0
HcmV?d00001

diff --git a/src/test/testcommon.c b/src/test/testcommon.c
index bd53356e..1375cac4 100644
--- a/src/test/testcommon.c
+++ b/src/test/testcommon.c
@@ -100,7 +100,7 @@ void test_breakpoint(void *arg) {
 #if !HEADLESS
     if (!is_headless) {
         fprintf(GREATEST_STDOUT, "DISPLAY NOTE: busy-spinning, needs gdb/lldb intervention to continue...\n");
-        static volatile bool debug_continue = false;
+        volatile bool debug_continue = false;
         while (!debug_continue) {
             struct timespec ts = { .tv_sec=0, .tv_nsec=33333333 };
             nanosleep(&ts, NULL);
diff --git a/src/test/testdisk.c b/src/test/testdisk.c
index bd1c0737..1d374be5 100644
--- a/src/test/testdisk.c
+++ b/src/test/testdisk.c
@@ -16,8 +16,10 @@
 #define TESTING_DISK "testvm1.dsk.gz"
 #define BLANK_DSK "blank.dsk.gz"
 #define BLANK_NIB "blank.nib.gz"
+#define BLANK_PO  "blank.po.gz"
 #define REBOOT_TO_DOS() \
     do { \
+        apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; \
         apple_ii_64k[0][TESTOUT_ADDR] = 0x00; \
         joy_button0 = 0xff; \
         cpu65_interrupt(ResetSig); \
@@ -47,6 +49,8 @@ static void testdisk_teardown(void *arg) {
 #define EXPECTED_DISK_TRACE_FILE_SIZE 141350
 #define EXPECTED_DISK_TRACE_SHA "471EB3D01917B1C6EF9F13C5C7BC1ACE4E74C851"
 TEST test_boot_disk_bytes() {
+    srandom(0);
+
     char *homedir = getenv("HOME");
     char *disk = NULL;
     asprintf(&disk, "%s/a2_read_disk_test.txt", homedir);
@@ -65,6 +69,12 @@ TEST test_boot_disk_bytes() {
         char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
 
         FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_DISK_TRACE_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
         unsigned char *buf = malloc(EXPECTED_DISK_TRACE_FILE_SIZE);
         if (fread(buf, 1, EXPECTED_DISK_TRACE_FILE_SIZE, fp) != EXPECTED_DISK_TRACE_FILE_SIZE) {
             ASSERT(false);
@@ -83,6 +93,102 @@ TEST test_boot_disk_bytes() {
     PASS();
 }
 
+#define EXPECTED_DISK_TRACE_NIB_FILE_SIZE 147368
+#define EXPECTED_DISK_TRACE_NIB_SHA "DE92EABF6C9747353E9C8A367706D70E520CC2C1"
+TEST test_boot_disk_bytes_nib() {
+    test_setup_boot_disk(BLANK_NIB, 0);
+    srandom(0);
+
+    char *homedir = getenv("HOME");
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_read_disk_test_nib.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        c_begin_disk_trace_6(disk, NULL);
+    }
+
+    BOOT_TO_DOS();
+
+    c_end_disk_trace_6();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_DISK_TRACE_NIB_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_DISK_TRACE_NIB_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_DISK_TRACE_NIB_FILE_SIZE, fp) != EXPECTED_DISK_TRACE_NIB_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_DISK_TRACE_NIB_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_DISK_TRACE_NIB_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    PASS();
+}
+
+#define EXPECTED_DISK_TRACE_PO_FILE_SIZE 141350
+#define EXPECTED_DISK_TRACE_PO_SHA "6C2170D3AA82F87DD34E177309808199BDCCB018"
+TEST test_boot_disk_bytes_po() {
+    test_setup_boot_disk(BLANK_PO, 0);
+    srandom(0);
+
+    char *homedir = getenv("HOME");
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_read_disk_test_po.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        c_begin_disk_trace_6(disk, NULL);
+    }
+
+    BOOT_TO_DOS();
+
+    c_end_disk_trace_6();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_DISK_TRACE_PO_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_DISK_TRACE_PO_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_DISK_TRACE_PO_FILE_SIZE, fp) != EXPECTED_DISK_TRACE_PO_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_DISK_TRACE_PO_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_DISK_TRACE_PO_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    PASS();
+}
+
 // This test is majorly abusive ... it creates an ~800MB file in $HOME
 // ... but if it's correct, you're fairly assured the cpu/vm is working =)
 #if ABUSIVE_TESTS
@@ -131,6 +237,156 @@ TEST test_boot_disk_cputrace() {
 }
 #endif
 
+#define EXPECTED_CPUTRACE_HELLO_DSK_FILE_SIZE 107523409
+#define EXPECTED_CPUTRACE_HELLO_DSK_SHA "586F218EC3C368C73DE1945B7EF441919E0D5B0F"
+TEST test_cputrace_hello_dsk() {
+    test_setup_boot_disk(BLANK_DSK, 0);
+
+    BOOT_TO_DOS();
+
+    char *homedir = getenv("HOME");
+    char *output = NULL;
+    asprintf(&output, "%s/a2_cputrace_hello_dsk.txt", homedir);
+    if (output) {
+        unlink(output);
+        cpu65_trace_begin(output);
+    }
+
+    srandom(0);
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
+    test_type_input("RUN HELLO\r");
+    c_debugger_go();
+
+    cpu65_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(output, "r");
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_DSK_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_DSK_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_DSK_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_DSK_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_CPUTRACE_HELLO_DSK_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_DSK_SHA) == 0);
+    } while(0);
+
+    unlink(output);
+    FREE(output);
+
+    PASS();
+}
+
+#define EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE 12888005
+#define EXPECTED_CPUTRACE_HELLO_NIB_SHA "539A628524ACCF066A82FA67D0A488C8D3DC01BF"
+TEST test_cputrace_hello_nib() {
+    test_setup_boot_disk(BLANK_NIB, 0);
+
+    BOOT_TO_DOS();
+
+    char *homedir = getenv("HOME");
+    char *output = NULL;
+    asprintf(&output, "%s/a2_cputrace_hello_nib.txt", homedir);
+    if (output) {
+        unlink(output);
+        cpu65_trace_begin(output);
+    }
+
+    srandom(0);
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
+    test_type_input("RUN HELLO\r");
+    c_debugger_go();
+
+    cpu65_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(output, "r");
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_NIB_SHA) == 0);
+    } while(0);
+
+    unlink(output);
+    FREE(output);
+
+    PASS();
+}
+
+#define EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE 107523284
+#define EXPECTED_CPUTRACE_HELLO_PO_SHA "A99C1D02B898E02662DEDBF235C55B175D01D05D"
+TEST test_cputrace_hello_po() {
+    test_setup_boot_disk(BLANK_PO, 0);
+
+    BOOT_TO_DOS();
+
+    char *homedir = getenv("HOME");
+    char *output = NULL;
+    asprintf(&output, "%s/a2_cputrace_hello_po.txt", homedir);
+    if (output) {
+        unlink(output);
+        cpu65_trace_begin(output);
+    }
+
+    srandom(0);
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
+    test_type_input("RUN HELLO\r");
+    c_debugger_go();
+
+    cpu65_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(output, "r");
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_PO_SHA) == 0);
+    } while(0);
+
+    unlink(output);
+    FREE(output);
+
+    PASS();
+}
+
 #define EXPECTED_VM_TRACE_FILE_SIZE 2830810
 #define EXPECTED_VM_TRACE_SHA "8B7A8169E34354773F82442DB6A0C3D6B69741D9"
 TEST test_boot_disk_vmtrace() {
@@ -153,6 +409,12 @@ TEST test_boot_disk_vmtrace() {
         char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
 
         FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_VM_TRACE_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
         unsigned char *buf = malloc(EXPECTED_VM_TRACE_FILE_SIZE);
         if (fread(buf, 1, EXPECTED_VM_TRACE_FILE_SIZE, fp) != EXPECTED_VM_TRACE_FILE_SIZE) {
             ASSERT(false);
@@ -171,11 +433,473 @@ TEST test_boot_disk_vmtrace() {
     PASS();
 }
 
+#define EXPECTED_VM_TRACE_NIB_FILE_SIZE 2930074
+#define EXPECTED_VM_TRACE_NIB_SHA "BD2BA2B9C8E7712F9E6ABF1049ED8D2C4D979934"
+TEST test_boot_disk_vmtrace_nib() {
+    test_setup_boot_disk(BLANK_NIB, 0);
+
+    char *homedir = getenv("HOME");
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_vmtrace_nib.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        vm_trace_begin(disk);
+    }
+
+    srandom(0);
+    BOOT_TO_DOS();
+
+    vm_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_VM_TRACE_NIB_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_VM_TRACE_NIB_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_VM_TRACE_NIB_FILE_SIZE, fp) != EXPECTED_VM_TRACE_NIB_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_VM_TRACE_NIB_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_NIB_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    PASS();
+}
+
+#define EXPECTED_VM_TRACE_PO_FILE_SIZE 2830810
+#define EXPECTED_VM_TRACE_PO_SHA "3432149815E9142FDAD6D9DF94C8621FEB56F7D7"
+TEST test_boot_disk_vmtrace_po() {
+    test_setup_boot_disk(BLANK_PO, 0);
+
+    char *homedir = getenv("HOME");
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_vmtrace_po.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        vm_trace_begin(disk);
+    }
+
+    srandom(0);
+    BOOT_TO_DOS();
+
+    vm_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_VM_TRACE_PO_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_VM_TRACE_PO_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_VM_TRACE_PO_FILE_SIZE, fp) != EXPECTED_VM_TRACE_PO_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_VM_TRACE_PO_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_PO_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    PASS();
+}
+
 TEST test_boot_disk() {
     BOOT_TO_DOS();
     PASS();
 }
 
+#define SAVE_SHA1 "B721C61BD10E28F9B833C5F661AA60C73B2D9F74"
+TEST test_savehello_dsk() {
+
+    test_setup_boot_disk(BLANK_DSK, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+    ASSERT(apple_ii_64k[0][TESTOUT_ADDR]    == 0x00);
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    test_type_input("SAVE HELLO\r");
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(SAVE_SHA1);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+TEST test_savehello_nib() {
+
+    test_setup_boot_disk(BLANK_NIB, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    test_type_input("SAVE HELLO\r");
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(SAVE_SHA1);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+TEST test_savehello_po() {
+
+    test_setup_boot_disk(BLANK_PO, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    test_type_input("SAVE HELLO\r");
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(SAVE_SHA1);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+#define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 63675
+#define EXPECTED_DISKWRITE_TRACE_DSK_SHA "CFA1C3AB2CA4F245D291DFC8C277773C5275946C"
+TEST test_disk_bytes_savehello_dsk() {
+    test_setup_boot_disk(BLANK_DSK, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+    ASSERT(apple_ii_64k[0][TESTOUT_ADDR]    == 0x00);
+
+    srandom(0);
+    char *homedir = getenv("HOME");
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_write_disk_test_dsk.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        c_begin_disk_trace_6(NULL, disk);
+    }
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    test_type_input("SAVE HELLO\r");
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(SAVE_SHA1);
+
+    c_end_disk_trace_6();
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE, fp) != EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_DISKWRITE_TRACE_DSK_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+#define EXPECTED_DISKWRITE_TRACE_NIB_FILE_SIZE 2409
+#define EXPECTED_DISKWRITE_TRACE_NIB_SHA "332EA76D8BCE45ACA6F805B978E6A3327386ABD6"
+TEST test_disk_bytes_savehello_nib() {
+    test_setup_boot_disk(BLANK_NIB, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+    ASSERT(apple_ii_64k[0][TESTOUT_ADDR]    == 0x00);
+
+    srandom(0);
+    char *homedir = getenv("HOME");
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_write_disk_test_nib.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        c_begin_disk_trace_6(NULL, disk);
+    }
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    test_type_input("SAVE HELLO\r");
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(SAVE_SHA1);
+
+    c_end_disk_trace_6();
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_DISKWRITE_TRACE_NIB_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_DISKWRITE_TRACE_NIB_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_DISKWRITE_TRACE_NIB_FILE_SIZE, fp) != EXPECTED_DISKWRITE_TRACE_NIB_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_DISKWRITE_TRACE_NIB_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_DISKWRITE_TRACE_NIB_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+#define EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE 63675
+#define EXPECTED_DISKWRITE_TRACE_PO_SHA "CFA1C3AB2CA4F245D291DFC8C277773C5275946C"
+TEST test_disk_bytes_savehello_po() {
+    test_setup_boot_disk(BLANK_PO, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+    ASSERT(apple_ii_64k[0][TESTOUT_ADDR]    == 0x00);
+
+    srandom(0);
+    char *homedir = getenv("HOME");
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_write_disk_test_po.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        c_begin_disk_trace_6(NULL, disk);
+    }
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    test_type_input("SAVE HELLO\r");
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(SAVE_SHA1);
+
+    c_end_disk_trace_6();
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE, fp) != EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_DISKWRITE_TRACE_PO_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+#define EAT_UP_DISK_SPACE() \
+    do { \
+        test_type_input("CALL-151\r"); \
+        test_type_input("BSAVEJUNK0,A$2000,L$4000\r"); \
+        test_type_input("BSAVEJUNK1,A$2000,L$4000\r"); \
+        test_type_input("BSAVEJUNK2,A$2000,L$4000\r"); \
+        test_type_input("BSAVEJUNK3,A$2000,L$4000\r"); \
+        test_type_input("BSAVEJUNK4,A$2000,L$4000\r"); \
+        test_type_input("BSAVEJUNK5,A$2000,L$4000\r"); \
+        test_type_input("BSAVEJUNK6,A$2000,L$4000\r"); \
+        test_type_input("BSAVEJUNK7,A$2000,L$4000\r"); \
+    } while (0)
+
+#define NOSPACE_SHA1 "2EA4D4B9F1C6797E476CD0FE59970CC243263B16"
+TEST test_outofspace_dsk() {
+    test_setup_boot_disk(BLANK_DSK, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+    ASSERT(apple_ii_64k[0][TESTOUT_ADDR]    == 0x00);
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    EAT_UP_DISK_SPACE();
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(NOSPACE_SHA1);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+TEST test_outofspace_nib() {
+    test_setup_boot_disk(BLANK_NIB, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+    ASSERT(apple_ii_64k[0][TESTOUT_ADDR]    == 0x00);
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    EAT_UP_DISK_SPACE();
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(NOSPACE_SHA1);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+TEST test_outofspace_po() {
+    test_setup_boot_disk(BLANK_PO, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+    ASSERT(apple_ii_64k[0][TESTOUT_ADDR]    == 0x00);
+
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0;
+    EAT_UP_DISK_SPACE();
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(NOSPACE_SHA1);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
 
 #define INIT_SHA1 "10F15B516E4CF2FC5B1712951A6F9C3D90BF595C"
 TEST test_inithello_dsk() {
@@ -195,6 +919,10 @@ TEST test_inithello_dsk() {
     ASSERT_SHA(INIT_SHA1);
 
     REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
     c_eject_6(0);
 
     PASS();
@@ -216,6 +944,35 @@ TEST test_inithello_nib() {
     ASSERT_SHA(INIT_SHA1);
 
     REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
+    c_eject_6(0);
+
+    PASS();
+}
+
+TEST test_inithello_po() {
+
+    test_setup_boot_disk(BLANK_PO, 0);
+    BOOT_TO_DOS();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED);
+
+    test_type_input("INIT HELLO\r");
+    TYPE_TRIGGER_WATCHPT();
+
+    c_debugger_go();
+
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(INIT_SHA1);
+
+    REBOOT_TO_DOS();
+    c_debugger_go();
+    ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
+    ASSERT_SHA(BOOT_SCREEN);
+
     c_eject_6(0);
 
     PASS();
@@ -235,14 +992,37 @@ GREATEST_SUITE(test_suite_disk) {
     begin_video=!is_headless;
 
     RUN_TESTp(test_boot_disk_bytes);
+    RUN_TESTp(test_boot_disk_bytes_nib);
+    RUN_TESTp(test_boot_disk_bytes_po);
+
 #if ABUSIVE_TESTS
     RUN_TESTp(test_boot_disk_cputrace);
 #endif
+    RUN_TESTp(test_cputrace_hello_dsk);
+    RUN_TESTp(test_cputrace_hello_nib);
+    RUN_TESTp(test_cputrace_hello_po);
+
     RUN_TESTp(test_boot_disk_vmtrace);
+    RUN_TESTp(test_boot_disk_vmtrace_nib);
+    RUN_TESTp(test_boot_disk_vmtrace_po);
+
     RUN_TESTp(test_boot_disk);
 
+    RUN_TESTp(test_savehello_dsk);
+    RUN_TESTp(test_savehello_nib);
+    RUN_TESTp(test_savehello_po);
+
+    RUN_TESTp(test_disk_bytes_savehello_dsk);
+    RUN_TESTp(test_disk_bytes_savehello_nib);
+    RUN_TESTp(test_disk_bytes_savehello_po);
+
+    RUN_TESTp(test_outofspace_dsk);
+    RUN_TESTp(test_outofspace_nib);
+    RUN_TESTp(test_outofspace_po);
+
     RUN_TESTp(test_inithello_dsk);
     RUN_TESTp(test_inithello_nib);
+    RUN_TESTp(test_inithello_po);
 
     // ...
     c_eject_6(0);