From 9e8a5e21344f547e4f903c2e14d40bd08a33bf6f Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Sun, 24 Mar 2019 15:50:16 -0700 Subject: [PATCH] Rename some debugger functions and mark as TESTING --- src/meta/debug.h | 19 +++-- src/meta/debugger.c | 25 +++--- src/test/testcommon.c | 4 +- src/test/testcommon.h | 2 +- src/test/testdisk.c | 118 +++++++++++++------------- src/test/testdisplay.c | 58 ++++++------- src/test/testtrace.c | 40 ++++----- src/test/testui.c | 40 ++++----- src/test/testvm.c | 186 ++++++++++++++++++++--------------------- src/timing.c | 2 +- 10 files changed, 250 insertions(+), 244 deletions(-) diff --git a/src/meta/debug.h b/src/meta/debug.h index 50e74875..9d738848 100644 --- a/src/meta/debug.h +++ b/src/meta/debug.h @@ -14,8 +14,8 @@ */ -#ifndef A2_DEBUG_H -#define A2_DEBUG_H +#ifndef _A2_DEBUG_H_ +#define _A2_DEBUG_H_ #include "common.h" @@ -52,12 +52,15 @@ extern const char* const disasm_templates[NUM_ADDRESSING_MODES]; void c_interface_debugging(void); #endif +bool debugger_shouldBreak(void) CALL_ON_CPU_THREAD; + +#if TESTING void debugger_setInputText(const char *text, const bool deterministically); void debugger_setBreakCallback(bool(*cb)(void)); -void c_debugger_go(void); -bool c_debugger_should_break(void); -void c_debugger_set_timeout(const unsigned int secs); -bool c_debugger_set_watchpoint(const uint16_t addr); -void c_debugger_clear_watchpoints(void); - +void debugger_go(void); +void debugger_setTimeout(const unsigned int secs); +bool debugger_setWatchpoint(const uint16_t addr); +void debugger_clearWatchpoints(void); #endif + +#endif // _A2_DEBUG_H_ diff --git a/src/meta/debugger.c b/src/meta/debugger.c index 47826bad..d89003fa 100644 --- a/src/meta/debugger.c +++ b/src/meta/debugger.c @@ -59,7 +59,9 @@ int arg1, arg2, arg3; /* command arguments */ int breakpoints[MAX_BRKPTS]; /* memory breakpoints */ int watchpoints[MAX_BRKPTS]; /* memory watchpoints */ +#if TESTING static bool(*shouldBreakCallback)(void) = NULL; +#endif #ifdef INTERFACE_CLASSIC /* debugger globals */ @@ -1179,18 +1181,17 @@ static int begin_cpu_stepping() { return ch; } -/* ------------------------------------------------------------------------- - c_debugger_should_break() - ------------------------------------------------------------------------- */ -bool c_debugger_should_break() { +bool debugger_shouldBreak(void) { ASSERT_ON_CPU_THREAD(); bool break_stepping = false; if (at_haltpt()) { stepping_struct.should_break = true; +#if TESTING } else if (shouldBreakCallback && shouldBreakCallback()) { stepping_struct.should_break = true; +#endif } else { uint8_t op = get_last_opcode(); @@ -1492,15 +1493,16 @@ void c_interface_debugging(void) { } #endif -/* ------------------------------------------------------------------------- - debugger testing-driven API - ------------------------------------------------------------------------- */ +#if TESTING +// ---------------------------------------------------------------------------- +// debugger testing-driven API + void debugger_setInputText(const char *text, const bool deterministically) { strcat(input_str, text); input_deterministically = deterministically; } -void c_debugger_go(void) { +void debugger_go(void) { void *buf = NULL; if (strlen(input_str)) { buf = STRDUP(input_str); @@ -1527,11 +1529,11 @@ void c_debugger_go(void) { num_buffer_lines = 0; } -void c_debugger_set_timeout(const unsigned int secs) { +void debugger_setTimeout(const unsigned int secs) { stepping_timeout = secs; } -bool c_debugger_set_watchpoint(const uint16_t addr) { +bool debugger_setWatchpoint(const uint16_t addr) { return set_halt(watchpoints, addr); } @@ -1539,7 +1541,8 @@ void debugger_setBreakCallback(bool(*cb)(void)) { shouldBreakCallback = cb; } -void c_debugger_clear_watchpoints(void) { +void debugger_clearWatchpoints(void) { clear_halt(watchpoints, 0); } +#endif diff --git a/src/test/testcommon.c b/src/test/testcommon.c index c8c7ae34..5a9543b7 100644 --- a/src/test/testcommon.c +++ b/src/test/testcommon.c @@ -59,10 +59,10 @@ void test_common_init(void) { prefs_setFloatValue(PREF_DOMAIN_VM, PREF_CPU_SCALE_ALT, (CPU_SCALE_FASTEST * 100.)); prefs_save(); - c_debugger_set_watchpoint(WATCHPOINT_ADDR); + debugger_setWatchpoint(WATCHPOINT_ADDR); fprintf(stderr, "Break in test_breakpoint() to catch and diagnose test failures...\n"); - c_debugger_set_timeout(0); + debugger_setTimeout(0); } #if (TARGET_OS_MAC || TARGET_OS_PHONE) diff --git a/src/test/testcommon.h b/src/test/testcommon.h index 7d4ff855..4dae81ca 100644 --- a/src/test/testcommon.h +++ b/src/test/testcommon.h @@ -107,7 +107,7 @@ static inline int ASSERT_SHA_BIN(const char *SHA_STR, const uint8_t * const buf, static inline int BOOT_TO_DOS(void) { if (test_do_reboot) { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; } diff --git a/src/test/testdisk.c b/src/test/testdisk.c index 9df72f9e..f4cea71e 100644 --- a/src/test/testdisk.c +++ b/src/test/testdisk.c @@ -232,7 +232,7 @@ TEST test_read_null_bytes() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 0xFF); @@ -253,13 +253,13 @@ TEST test_savehello_dsk() { test_type_input("SAVE HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(SAVE_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -279,13 +279,13 @@ TEST test_savehello_nib() { test_type_input("SAVE HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(SAVE_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -305,13 +305,13 @@ TEST test_savehello_po() { test_type_input("SAVE HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(SAVE_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -347,7 +347,7 @@ TEST test_disk_bytes_savehello_dsk() { test_type_input("SAVE HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(SAVE_SHA1); @@ -381,7 +381,7 @@ TEST test_disk_bytes_savehello_dsk() { FREE(disk); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -440,7 +440,7 @@ TEST test_disk_bytes_savehello_nib() { test_type_input("SAVE HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(SAVE_SHA1); @@ -474,7 +474,7 @@ TEST test_disk_bytes_savehello_nib() { FREE(disk); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -533,7 +533,7 @@ TEST test_disk_bytes_savehello_po() { test_type_input("SAVE HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(SAVE_SHA1); @@ -567,7 +567,7 @@ TEST test_disk_bytes_savehello_po() { FREE(disk); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -645,7 +645,7 @@ TEST test_outofspace_dsk() { EAT_UP_DISK_SPACE(); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(NOSPACE_SHA1); @@ -679,7 +679,7 @@ TEST test_outofspace_dsk() { FREE(disk); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -728,13 +728,13 @@ TEST test_outofspace_nib() { EAT_UP_DISK_SPACE(); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(NOSPACE_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -783,13 +783,13 @@ TEST test_outofspace_po() { EAT_UP_DISK_SPACE(); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(NOSPACE_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -857,7 +857,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK0,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -865,7 +865,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK1,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -873,7 +873,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK2,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -881,7 +881,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK3,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -889,7 +889,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK4,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -897,7 +897,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK5,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -905,7 +905,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK6,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -913,7 +913,7 @@ TEST test_bload_trace_dsk() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK7,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_END_SHA1, 0x2000, 0x4000); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -974,7 +974,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK0,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -982,7 +982,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK1,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -990,7 +990,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK2,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -998,7 +998,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK3,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1006,7 +1006,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK4,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1014,7 +1014,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK5,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1022,7 +1022,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK6,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1030,7 +1030,7 @@ TEST test_bload_trace_nib() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK7,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_END_SHA1, 0x2000, 0x4000); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1091,7 +1091,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK0,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1099,7 +1099,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK1,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1107,7 +1107,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK2,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1115,7 +1115,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK3,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1123,7 +1123,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK4,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1131,7 +1131,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK5,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1139,7 +1139,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK6,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_SHA1, 0x2000, 0x4000); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -1147,7 +1147,7 @@ TEST test_bload_trace_po() { test_type_input("2000<7000.BFFFM\r"); test_type_input("BLOADJUNK7,A$2000\r"); test_type_input("1F33:FF\r"); - c_debugger_go(); + debugger_go(); ASSERT_SHA_MEM(JUNK_MEM_END_SHA1, 0x2000, 0x4000); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1196,13 +1196,13 @@ TEST test_inithello_dsk() { test_type_input("INIT HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(INIT_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -1221,13 +1221,13 @@ TEST test_inithello_nib() { test_type_input("INIT HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(INIT_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -1246,13 +1246,13 @@ TEST test_inithello_po() { test_type_input("INIT HELLO\r"); test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(INIT_SHA1); REBOOT_TO_DOS(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA(BOOT_SCREEN); @@ -1374,14 +1374,14 @@ static int _test_disk_image_with_gzip_header(int readonly) { test_setup_boot_disk(GZBAD_NIB, readonly); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); test_type_input("CLEAR\r"); - c_debugger_set_timeout(10); - c_debugger_go(); - c_debugger_set_timeout(0); + debugger_setTimeout(10); + debugger_go(); + debugger_setTimeout(0); do { uint8_t md[SHA_DIGEST_LENGTH]; @@ -1477,8 +1477,8 @@ TEST test_reinsert_edgecase() { // TODO FIXME : we need both a timeout and a step-until-framebuffer-is-a-particular-SHA routine ... // First verify we hit the crackscreen - c_debugger_set_timeout(10); - c_debugger_go(); + debugger_setTimeout(10); + debugger_go(); WAIT_FOR_FB_SHA(DROL_CRACK_SCREEN_SHA); // re-insert @@ -1487,8 +1487,8 @@ TEST test_reinsert_edgecase() { // press key to continue and verify we are at a non-blank screen in a short amount of time test_type_input(" "); - c_debugger_clear_watchpoints(); - c_debugger_go(); + debugger_clearWatchpoints(); + debugger_go(); uint8_t md[SHA_DIGEST_LENGTH]; SHA1((uint8_t *)display_waitForNextCompleteFramebuffer(), SCANWIDTH*SCANHEIGHT*PIXEL_STRIDE, md); @@ -1497,7 +1497,7 @@ TEST test_reinsert_edgecase() { ASSERT(strcmp(mdstr, DROL_CRACK_SCREEN_SHA) != 0); ASSERT(strcmp(mdstr, BLANK_SCREEN) != 0); - c_debugger_set_timeout(0); + debugger_setTimeout(0); disk6_eject(0); PASS(); @@ -1534,7 +1534,7 @@ GREATEST_SUITE(test_suite_disk) { RUN_TESTp(test_disk_bytes_savehello_nib); RUN_TESTp(test_disk_bytes_savehello_po); - c_debugger_set_timeout(0); + debugger_setTimeout(0); // test order from here is important ... // * load the disks with a buncha junk files diff --git a/src/test/testdisplay.c b/src/test/testdisplay.c index 30d9d067..640b0ec8 100644 --- a/src/test/testdisplay.c +++ b/src/test/testdisplay.c @@ -95,7 +95,7 @@ TEST test_video_trace_40col(void) { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("CATALOG\r\rPOKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; @@ -109,7 +109,7 @@ TEST test_video_trace_40col(void) { video_scannerTraceBegin(traceFile, 1); debugger_setBreakCallback(&video_scannerTraceShouldStop); - c_debugger_go(); + debugger_go(); debugger_setBreakCallback(NULL); video_scannerTraceEnd(); @@ -153,10 +153,10 @@ TEST test_video_trace_liltexwin(void) { BOOT_TO_DOS(); - c_debugger_set_timeout(5); - c_debugger_clear_watchpoints(); - c_debugger_go(); - c_debugger_set_timeout(0); + debugger_setTimeout(5); + debugger_clearWatchpoints(); + debugger_go(); + debugger_setTimeout(0); const char *homedir = HOMEDIR; char *traceFile = NULL; @@ -168,9 +168,9 @@ TEST test_video_trace_liltexwin(void) { video_scannerTraceBegin(traceFile, 1); debugger_setBreakCallback(&video_scannerTraceShouldStop); - c_debugger_go(); + debugger_go(); debugger_setBreakCallback(NULL); - c_debugger_set_watchpoint(WATCHPOINT_ADDR); + debugger_setWatchpoint(WATCHPOINT_ADDR); video_scannerTraceEnd(); @@ -216,7 +216,7 @@ TEST test_40col_normal() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUN TESTNORMALTEXT\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA("D676FAFEF4FE5B31832EF875285B7E3A87E47689"); @@ -229,7 +229,7 @@ TEST test_80col_normal() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("PR#3\rRUN TESTNORMALTEXT\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA("BB63B7206CD8741270791872CCD5B77C08169850"); @@ -242,7 +242,7 @@ TEST test_40col_inverse() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUN TESTINVERSETEXT\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA("137B1F840ACC1BD23F9636153AAD93CD0FB60E97"); @@ -255,7 +255,7 @@ TEST test_80col_inverse() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("PR#3\rRUN TESTINVERSETEXT\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); WAIT_FOR_FB_SHA("CDAB6BCA6DA883049AF1431EF408F8994615B24A"); @@ -273,7 +273,7 @@ TEST test_lores_with_80col() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("TEXT\rPR#3\rRUN TESTLORES\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -288,7 +288,7 @@ TEST test_lores_with_40col() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("TEXT\rHOME\rLOAD TESTLORES\rLIST\rLIST\rRUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -303,7 +303,7 @@ TEST test_lores_with_40col_2() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUNTESTLORES_2\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -318,7 +318,7 @@ TEST test_lores_40colmix_normal() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("TEXT\rHOME\rLOAD TESTLORES\rLIST\rLIST\rPOKE 7986,127\rRUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -333,7 +333,7 @@ TEST test_lores_40colmix_inverse() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("TEXT\rINVERSE\rHOME\rLOAD TESTLORES\rLIST\rLIST\rPOKE 7986,127\rRUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -348,7 +348,7 @@ TEST test_lores_80colmix_normal() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("TEXT\rPR#3\rLOAD TESTLORES\rLIST\rLIST\rPOKE 7986,127\rRUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -363,7 +363,7 @@ TEST test_lores_80colmix_inverse() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("TEXT\rINVERSE\rPR#3\rLOAD TESTLORES\rLIST\rLIST\rPOKE 7986,127\rRUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -384,7 +384,7 @@ TEST test_hires_with_80col() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("PR#3\rRUN TESTHIRES_2\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -398,7 +398,7 @@ TEST test_hires_with_40col() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUN TESTHIRES_2\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -412,7 +412,7 @@ TEST test_hires_with_40col_page2() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUN TESTHIRES_PG2\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -426,7 +426,7 @@ TEST test_hires_40colmix_normal() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("POKE 7986,127\rRUN TESTHIRES\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -440,7 +440,7 @@ TEST test_hires_40colmix_inverse() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("INVERSE\rPOKE 7986,127\rRUN TESTHIRES\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -454,7 +454,7 @@ TEST test_hires_80colmix_normal() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("PR#3\rLOAD TESTHIRES\rLIST\rLIST\rPOKE 7986,127\rRUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -468,7 +468,7 @@ TEST test_hires_80colmix_inverse() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("INVERSE\rPR#3\rLOAD TESTHIRES\rLIST\rLIST\rPOKE 7986,127\rRUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -486,7 +486,7 @@ TEST test_80col_lores() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUN TESTLORES80\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -500,7 +500,7 @@ TEST test_80col_lores_2() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUN TESTLORES80_2\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -514,7 +514,7 @@ TEST test_80col_hires() { ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); test_type_input("RUN TESTHIRES80_2\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); diff --git a/src/test/testtrace.c b/src/test/testtrace.c index c9454508..25a64b4b 100644 --- a/src/test/testtrace.c +++ b/src/test/testtrace.c @@ -35,7 +35,7 @@ static void testtrace_setup(void *arg) { if (test_do_reboot) { cpu65_interrupt(ResetSig); } - c_debugger_set_watchpoint(WATCHPOINT_ADDR); + debugger_setWatchpoint(WATCHPOINT_ADDR); } static void testtrace_teardown(void *arg) { @@ -59,7 +59,7 @@ static void testspeaker_cyclesOverflow(void) { TEST test_timing_overflow() { test_setup_boot_disk(BLANK_DSK, /*readonly:*/1); - c_debugger_set_timeout(1); + debugger_setTimeout(1); ASSERT(!cycles_overflowed); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] != TEST_FINISHED); @@ -70,7 +70,7 @@ TEST test_timing_overflow() { do { run_args.emul_reinitialize = 1; - c_debugger_go(); + debugger_go(); if (cycles_overflowed) { break; @@ -81,9 +81,9 @@ TEST test_timing_overflow() { ASSERT(cycles_overflowed); - c_debugger_set_timeout(0); + debugger_setTimeout(0); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); // appears emulator handled cycle count overflow gracefully ... @@ -166,10 +166,10 @@ TEST test_mockingboard_1() { // Poll for trace file of particular size mb_traceBegin(mbTraceFile); // ".samp" file is automatically created ... - c_debugger_clear_watchpoints(); - c_debugger_set_timeout(1); + debugger_clearWatchpoints(); + debugger_setTimeout(1); do { - c_debugger_go(); + debugger_go(); FILE *fpTrace = fopen(mbTraceFile, "r"); fseek(fpTrace, 0, SEEK_END); @@ -220,7 +220,7 @@ TEST test_mockingboard_1() { break; } while (1); - c_debugger_set_timeout(0); + debugger_setTimeout(0); unlink(mbTraceFile); FREE(mbTraceFile); @@ -297,10 +297,10 @@ TEST test_boot_disk_cputrace2() { // Failing now due to difference in IRQ timing } // Poll for trace file of particular size - c_debugger_clear_watchpoints(); - c_debugger_set_timeout(1); + debugger_clearWatchpoints(); + debugger_setTimeout(1); do { - c_debugger_go(); + debugger_go(); FILE *fpTrace = fopen(output, "r"); fseek(fpTrace, 0, SEEK_END); @@ -335,7 +335,7 @@ TEST test_boot_disk_cputrace2() { // Failing now due to difference in IRQ timing } while (1); - c_debugger_set_timeout(0); + debugger_setTimeout(0); disk6_eject(0); @@ -362,10 +362,10 @@ TEST test_boot_disk_cputrace3() { } // Poll for trace file of particular size - c_debugger_clear_watchpoints(); - c_debugger_set_timeout(1); + debugger_clearWatchpoints(); + debugger_setTimeout(1); do { - c_debugger_go(); + debugger_go(); FILE *fpTrace = fopen(output, "r"); fseek(fpTrace, 0, SEEK_END); @@ -400,7 +400,7 @@ TEST test_boot_disk_cputrace3() { } while (1); - c_debugger_set_timeout(0); + debugger_setTimeout(0); disk6_eject(0); @@ -429,7 +429,7 @@ TEST test_cputrace_hello_dsk() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; test_type_input_deterministically("RUN HELLO\r"); - c_debugger_go(); + debugger_go(); cpu65_trace_end(); disk6_eject(0); @@ -478,7 +478,7 @@ TEST test_cputrace_hello_nib() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; test_type_input_deterministically("RUN HELLO\r"); - c_debugger_go(); + debugger_go(); cpu65_trace_end(); disk6_eject(0); @@ -527,7 +527,7 @@ TEST test_cputrace_hello_po() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; test_type_input_deterministically("RUN HELLO\r"); - c_debugger_go(); + debugger_go(); cpu65_trace_end(); disk6_eject(0); diff --git a/src/test/testui.c b/src/test/testui.c index 660d800e..e21e0fe0 100644 --- a/src/test/testui.c +++ b/src/test/testui.c @@ -159,10 +159,10 @@ TEST test_load_state_1() { // ensure stable test disk6_eject(0); - c_debugger_set_timeout(1); - c_debugger_clear_watchpoints(); - c_debugger_go(); - c_debugger_set_timeout(0); + debugger_setTimeout(1); + debugger_clearWatchpoints(); + debugger_go(); + debugger_setTimeout(0); char *savData = NULL; ASPRINTF(&savData, "%s/emulator-test.a2state", HOMEDIR); @@ -206,10 +206,10 @@ TEST test_load_A2VM_good1() { // ensure stable test disk6_eject(0); - c_debugger_set_timeout(1); - c_debugger_clear_watchpoints(); - c_debugger_go(); - c_debugger_set_timeout(0); + debugger_setTimeout(1); + debugger_clearWatchpoints(); + debugger_go(); + debugger_setTimeout(0); // write saved state to disk @@ -320,10 +320,10 @@ TEST test_load_A2V2_good1() { // ensure stable test disk6_eject(0); - c_debugger_set_timeout(1); - c_debugger_clear_watchpoints(); - c_debugger_go(); - c_debugger_set_timeout(0); + debugger_setTimeout(1); + debugger_clearWatchpoints(); + debugger_go(); + debugger_setTimeout(0); // write saved state to disk @@ -446,10 +446,10 @@ TEST test_load_A2V2_good2() { // ensure stable test disk6_eject(0); - c_debugger_set_timeout(1); - c_debugger_clear_watchpoints(); - c_debugger_go(); - c_debugger_set_timeout(0); + debugger_setTimeout(1); + debugger_clearWatchpoints(); + debugger_go(); + debugger_setTimeout(0); // write saved state to disk @@ -572,10 +572,10 @@ TEST test_load_A2V2_good3() { // ensure stable test disk6_eject(0); - c_debugger_set_timeout(1); - c_debugger_clear_watchpoints(); - c_debugger_go(); - c_debugger_set_timeout(0); + debugger_setTimeout(1); + debugger_clearWatchpoints(); + debugger_go(); + debugger_setTimeout(0); // write saved state to disk diff --git a/src/test/testvm.c b/src/test/testvm.c index a0619f6b..c924267a 100644 --- a/src/test/testvm.c +++ b/src/test/testvm.c @@ -40,7 +40,7 @@ TEST test_read_keyboard() { ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 0x00); test_type_input("RUN TESTGETKEY\rZ"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 'Z'); @@ -55,7 +55,7 @@ TEST test_clear_keyboard() { ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 0x00); test_type_input("RUN TESTCLEARKEY\rZA"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 'A'); @@ -71,7 +71,7 @@ TEST test_read_random() { ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 0x00); test_type_input("RUN TESTRND\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 249); @@ -79,28 +79,28 @@ TEST test_read_random() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; test_common_setup(); test_type_input("RUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 26); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; test_common_setup(); test_type_input("RUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 4); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; test_common_setup(); test_type_input("RUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 199); apple_ii_64k[0][WATCHPOINT_ADDR] = 0x0; test_common_setup(); test_type_input("RUN\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(apple_ii_64k[0][TESTOUT_ADDR] == 141); @@ -456,7 +456,7 @@ TEST test_PAGE2_on(bool flag_80store, bool flag_hires) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_PAGE2)); @@ -477,7 +477,7 @@ TEST test_PAGE2_on(bool flag_80store, bool flag_hires) { uint8_t *save_base_hgrwrt = run_args.base_hgrwrt; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_PAGE2)); @@ -539,7 +539,7 @@ TEST test_PAGE2_off(bool flag_80store, bool flag_hires) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT( (run_args.softswitches & SS_PAGE2)); @@ -560,7 +560,7 @@ TEST test_PAGE2_off(bool flag_80store, bool flag_hires) { uint8_t *save_base_hgrwrt = run_args.base_hgrwrt; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT( (flag_80store ? (run_args.softswitches & SS_80STORE) : !(run_args.softswitches & SS_80STORE)) ); @@ -611,7 +611,7 @@ TEST test_check_PAGE2(bool flag_page2) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -637,7 +637,7 @@ TEST test_TEXT_on() { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_TEXT)); @@ -657,7 +657,7 @@ TEST test_TEXT_on() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -687,7 +687,7 @@ TEST test_TEXT_off() { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_TEXT)); @@ -707,7 +707,7 @@ TEST test_TEXT_off() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -743,7 +743,7 @@ TEST test_check_TEXT(bool flag_text) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -769,7 +769,7 @@ TEST test_MIXED_on() { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_MIXED)); @@ -789,7 +789,7 @@ TEST test_MIXED_on() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -819,7 +819,7 @@ TEST test_MIXED_off() { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_MIXED)); @@ -839,7 +839,7 @@ TEST test_MIXED_off() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -875,7 +875,7 @@ TEST test_check_MIXED(bool flag_mixed) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -913,7 +913,7 @@ TEST test_HIRES_on(bool flag_80store, bool flag_page2) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_HIRES)); @@ -935,7 +935,7 @@ TEST test_HIRES_on(bool flag_80store, bool flag_page2) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_HIRES)); @@ -998,7 +998,7 @@ TEST test_HIRES_off(bool flag_ramrd, bool flag_ramwrt) { } ASM_GO(); - c_debugger_go(); + debugger_go(); if (flag_ramwrt) { ASSERT(apple_ii_64k[1][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1016,7 +1016,7 @@ TEST test_HIRES_off(bool flag_ramrd, bool flag_ramwrt) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; apple_ii_64k[1][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); if (flag_ramwrt) { ASSERT(apple_ii_64k[1][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1068,7 +1068,7 @@ TEST test_check_HIRES(bool flag_hires) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1100,7 +1100,7 @@ TEST test_iie_c080(bool flag_altzp) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(flag_altzp ? (run_args.softswitches & SS_ALTZP) : !(run_args.softswitches & SS_ALTZP) ); @@ -1113,7 +1113,7 @@ TEST test_iie_c080(bool flag_altzp) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1166,7 +1166,7 @@ TEST test_iie_c081(bool flag_altzp, bool flag_lcsec) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(flag_altzp ? (run_args.softswitches & SS_ALTZP) : !(run_args.softswitches & SS_ALTZP) ); @@ -1182,7 +1182,7 @@ TEST test_iie_c081(bool flag_altzp, bool flag_lcsec) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1234,7 +1234,7 @@ TEST test_lc_c082() { ASM_TRIGGER_WATCHPT(); ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1280,7 +1280,7 @@ TEST test_iie_c083(bool flag_altzp, bool flag_lcsec) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(flag_altzp ? (run_args.softswitches & SS_ALTZP) : !(run_args.softswitches & SS_ALTZP) ); @@ -1296,7 +1296,7 @@ TEST test_iie_c083(bool flag_altzp, bool flag_lcsec) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1352,7 +1352,7 @@ TEST test_iie_c088(bool flag_altzp) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(flag_altzp ? (run_args.softswitches & SS_ALTZP) : !(run_args.softswitches & SS_ALTZP) ); @@ -1365,7 +1365,7 @@ TEST test_iie_c088(bool flag_altzp) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1417,7 +1417,7 @@ TEST test_iie_c089(bool flag_altzp, bool flag_lcsec) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(flag_altzp ? (run_args.softswitches & SS_ALTZP) : !(run_args.softswitches & SS_ALTZP) ); @@ -1433,7 +1433,7 @@ TEST test_iie_c089(bool flag_altzp, bool flag_lcsec) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1485,7 +1485,7 @@ TEST test_lc_c08a() { ASM_TRIGGER_WATCHPT(); ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1530,7 +1530,7 @@ TEST test_iie_c08b(bool flag_altzp, bool flag_lcsec) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(flag_altzp ? (run_args.softswitches & SS_ALTZP) : !(run_args.softswitches & SS_ALTZP) ); @@ -1546,7 +1546,7 @@ TEST test_iie_c08b(bool flag_altzp, bool flag_lcsec) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1604,7 +1604,7 @@ TEST test_check_BANK2(bool flag_bank2) { test_type_input("POKE7987,255:REM TRIGGER DEBUGGER\r"); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1639,7 +1639,7 @@ TEST test_check_LCRAM(bool flag_lcram) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1682,7 +1682,7 @@ TEST test_80store_on(bool flag_hires, bool flag_page2) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_80STORE)); @@ -1694,7 +1694,7 @@ TEST test_80store_on(bool flag_hires, bool flag_page2) { uint8_t *save_base_hgrwrt = run_args.base_hgrwrt; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_80STORE)); @@ -1775,7 +1775,7 @@ TEST test_80store_off(bool flag_ramrd, bool flag_ramwrt, bool flag_page2) { } ASM_GO(); - c_debugger_go(); + debugger_go(); if (flag_ramwrt) { ASSERT(apple_ii_64k[1][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1791,7 +1791,7 @@ TEST test_80store_off(bool flag_ramrd, bool flag_ramwrt, bool flag_page2) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; apple_ii_64k[1][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); if (flag_ramwrt) { ASSERT(apple_ii_64k[1][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -1858,7 +1858,7 @@ TEST test_check_80store(bool flag_80store) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); if (flag_80store) { @@ -1903,7 +1903,7 @@ TEST test_ramrd_main(bool flag_80store, bool flag_hires) { ASM_XFER_TEST_TO_AUXMEM(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_RAMRD)); @@ -1919,7 +1919,7 @@ TEST test_ramrd_main(bool flag_80store, bool flag_hires) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_RAMRD)); @@ -1984,7 +1984,7 @@ TEST test_ramrd_aux(bool flag_80store, bool flag_hires) { ASM_XFER_TEST_TO_AUXMEM(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_RAMRD)); @@ -2000,7 +2000,7 @@ TEST test_ramrd_aux(bool flag_80store, bool flag_hires) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_RAMRD)); @@ -2060,7 +2060,7 @@ TEST test_check_ramrd(bool flag_ramrd) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); if (flag_ramrd) { @@ -2100,7 +2100,7 @@ TEST test_ramwrt_main(bool flag_80store, bool flag_hires) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[1][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_RAMWRT)); @@ -2117,7 +2117,7 @@ TEST test_ramwrt_main(bool flag_80store, bool flag_hires) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; apple_ii_64k[1][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_RAMWRT)); @@ -2180,7 +2180,7 @@ TEST test_ramwrt_aux(bool flag_80store, bool flag_hires) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_RAMWRT)); @@ -2197,7 +2197,7 @@ TEST test_ramwrt_aux(bool flag_80store, bool flag_hires) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; apple_ii_64k[1][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[1][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_RAMWRT)); @@ -2254,7 +2254,7 @@ TEST test_check_ramwrt(bool flag_ramwrt) { apple_ii_64k[0][TESTOUT_ADDR] = 0x96; apple_ii_64k[1][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); if (flag_ramwrt) { ASSERT(apple_ii_64k[1][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -2295,7 +2295,7 @@ TEST test_altzp_main(bool flag_lcram, bool flag_lcwrt) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_ALTZP)); @@ -2312,7 +2312,7 @@ TEST test_altzp_main(bool flag_lcram, bool flag_lcwrt) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_ALTZP)); @@ -2380,7 +2380,7 @@ TEST test_altzp_aux(bool flag_lcram, bool flag_lcwrt) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_ALTZP)); @@ -2397,7 +2397,7 @@ TEST test_altzp_aux(bool flag_lcram, bool flag_lcwrt) { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_ALTZP)); @@ -2457,7 +2457,7 @@ TEST test_check_altzp(bool flag_altzp) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -2483,7 +2483,7 @@ TEST test_80col_on() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_80COL)); @@ -2492,7 +2492,7 @@ TEST test_80col_on() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_80COL)); @@ -2519,7 +2519,7 @@ TEST test_80col_off() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_80COL)); @@ -2528,7 +2528,7 @@ TEST test_80col_off() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_80COL)); @@ -2562,7 +2562,7 @@ TEST test_check_80col(bool flag_80col) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -2588,7 +2588,7 @@ TEST test_altchar_on() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_ALTCHAR)); @@ -2597,7 +2597,7 @@ TEST test_altchar_on() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_ALTCHAR)); @@ -2626,7 +2626,7 @@ TEST test_altchar_off() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_ALTCHAR)); @@ -2635,7 +2635,7 @@ TEST test_altchar_off() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_ALTCHAR)); @@ -2671,7 +2671,7 @@ TEST test_check_altchar(bool flag_altchar) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -2697,7 +2697,7 @@ TEST test_ioudis_on() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_IOUDIS)); @@ -2706,7 +2706,7 @@ TEST test_ioudis_on() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_IOUDIS)); @@ -2733,7 +2733,7 @@ TEST test_ioudis_off() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_IOUDIS)); @@ -2742,7 +2742,7 @@ TEST test_ioudis_off() { apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_IOUDIS)); @@ -2776,7 +2776,7 @@ TEST test_check_ioudis(bool flag_ioudis) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -2807,7 +2807,7 @@ TEST test_dhires_on(bool flag_ioudis/* FIXME TODO : possibly testing a existing ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_DHIRES)); @@ -2816,7 +2816,7 @@ TEST test_dhires_on(bool flag_ioudis/* FIXME TODO : possibly testing a existing apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_DHIRES)); @@ -2848,7 +2848,7 @@ TEST test_dhires_off(bool flag_ioudis/* FIXME TODO : possibly testing a existing ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_DHIRES)); @@ -2857,7 +2857,7 @@ TEST test_dhires_off(bool flag_ioudis/* FIXME TODO : possibly testing a existing apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_DHIRES)); @@ -2897,7 +2897,7 @@ TEST test_check_dhires(bool flag_dhires, bool flag_ioudis/* FIXME TODO : possibl ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -2924,7 +2924,7 @@ TEST test_c3rom_internal() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_C3ROM)); @@ -2932,7 +2932,7 @@ TEST test_c3rom_internal() { uint32_t switch_save = run_args.softswitches; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_C3ROM)); @@ -2969,7 +2969,7 @@ TEST test_c3rom_peripheral(bool flag_cxrom) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_C3ROM)); @@ -2978,7 +2978,7 @@ TEST test_c3rom_peripheral(bool flag_cxrom) { uint8_t *save_base_c3rom = run_args.base_c3rom; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_C3ROM)); @@ -3018,7 +3018,7 @@ TEST test_check_c3rom(bool flag_c3rom) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); @@ -3047,7 +3047,7 @@ TEST test_cxrom_internal() { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_CXROM)); @@ -3055,7 +3055,7 @@ TEST test_cxrom_internal() { uint32_t switch_save = run_args.softswitches; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_CXROM)); @@ -3093,7 +3093,7 @@ TEST test_cxrom_peripheral(bool flag_c3rom) { ASM_DONE(); ASM_GO(); - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT((run_args.softswitches & SS_CXROM)); @@ -3102,7 +3102,7 @@ TEST test_cxrom_peripheral(bool flag_c3rom) { uint8_t *save_base_c3rom = run_args.base_c3rom; apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); ASSERT(!(run_args.softswitches & SS_CXROM)); @@ -3146,7 +3146,7 @@ TEST test_check_cxrom(bool flag_cxrom) { ASM_GO(); apple_ii_64k[0][TESTOUT_ADDR] = 0x96; - c_debugger_go(); + debugger_go(); ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED); diff --git a/src/timing.c b/src/timing.c index 9f8ecf17..86493e13 100644 --- a/src/timing.c +++ b/src/timing.c @@ -339,7 +339,7 @@ cpu_runloop: debugging_cycles -= run_args.cpu65_cycle_count; timing_checkpointCycles(); - if (c_debugger_should_break() || (debugging_cycles <= 0)) { + if (debugger_shouldBreak() || (debugging_cycles <= 0)) { int err = 0; if ((err = pthread_cond_signal(&dbg_thread_cond))) { LOG("pthread_cond_signal : %d", err);