Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Display test improvements

Browse Source 
* Removes hackish code in testdisplay.c in preparation for a bugfix
    * Adds function to output state of softswitches ... useful from GDB
This commit is contained in:
Aaron Culliney 2014-11-23 12:53:59 -08:00
parent 3536b6b65a
commit 89fc5f6599
2 changed files with 94 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/test/testdisplay.c
View File

@ -189,14 +189,8 @@ TEST test_lores_80colmix_inverse() {
test_type_input("TEXT\rINVERSE\rPR#3\rLOAD TESTLORES\rLIST\rLIST\rPOKE 7986,127\rRUN\r");
c_debugger_go();
if (test_do_reboot) {
// HACK FIXME TODO -- softswitch settings appear to be initially screwy on reboot, so we start, abort, and then start again ...
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("7936E87BE1F920AACD43268DB288746528E89959");
} else {
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("7936E87BE1F920AACD43268DB288746528E89959");
}
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("7936E87BE1F920AACD43268DB288746528E89959");
PASS();
}
@ -215,14 +209,8 @@ TEST test_hires_with_80col() {
test_type_input("PR#3\rRUN TESTHIRES_2\r");
c_debugger_go();
if (test_do_reboot) {
// HACK FIXME TODO -- softswitch settings appear to be initially screwy on reboot, so we start, abort, and then start again ...
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("8EF89A5E0501191847E9907416309B33D4B48713");
} else {
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("1A5DD96B7E3538C2C3625A37653E013E3998F825");
}
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("1A5DD96B7E3538C2C3625A37653E013E3998F825");
PASS();
}
@ -273,14 +261,8 @@ TEST test_hires_80colmix_normal() {
test_type_input("PR#3\rLOAD TESTHIRES\rLIST\rLIST\rPOKE 7986,127\rRUN\r");
c_debugger_go();
if (test_do_reboot) {
// HACK FIXME TODO -- softswitch settings appear to be initially screwy on reboot, so we start, abort, and then start again ...
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("F200479ABE6050CE3A071E36487ADF4C3791415F");
} else {
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("032BD68899749265EB2934A76A35D7068642824B");
}
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("032BD68899749265EB2934A76A35D7068642824B");
PASS();
}
@ -292,14 +274,8 @@ TEST test_hires_80colmix_inverse() {
test_type_input("INVERSE\rPR#3\rLOAD TESTHIRES\rLIST\rLIST\rPOKE 7986,127\rRUN\r");
c_debugger_go();
if (test_do_reboot) {
// HACK FIXME TODO -- softswitch settings appear to be initially screwy on reboot, so we start, abort, and then start again ...
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("984672DD673E9EC3C2CD5CD03D1D79FD0F3D626A");
} else {
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("FAFBB65013DA3D5173487C3F434C36A7C04DE92E");
}
ASSERT(apple_ii_64k[0][WATCHPOINT_ADDR] == TEST_FINISHED);
ASSERT_SHA("FAFBB65013DA3D5173487C3F434C36A7C04DE92E");
PASS();
}
@ -408,8 +384,6 @@ static void *test_thread(void *dummyptr) {
// hires
// HACK FIXME TODO : there appears to be bugs with various 80col graphics modes ...
RUN_TESTp(test_hires_with_80col);
test_do_reboot = false;
RUN_TESTp(test_hires_with_80col);

86
src/vm.c
View File

@ -952,3 +952,89 @@ GLUE_C_READ(iie_disable_slot_expansion)
return 0x0;
}
// ----------------------------------------------------------------------------
void debug_print_softwitches(void) {
// useful from GDB ...
fprintf(stderr, "STANDARD: ");
if (softswitches & SS_TEXT) {
fprintf(stderr, "SS_TEXT ");
}
if (softswitches & SS_MIXED) {
fprintf(stderr, "SS_MIXED ");
}
if (softswitches & SS_HIRES) {
fprintf(stderr, "SS_HIRES ");
}
if (softswitches & SS_PAGE2) {
fprintf(stderr, "SS_PAGE2 ");
}
if (softswitches & SS_BANK2) {
fprintf(stderr, "SS_BANK2 ");
}
if (softswitches & SS_LCRAM) {
fprintf(stderr, "SS_LCRAM ");
}
if (softswitches & SS_80STORE) {
fprintf(stderr, "SS_80STORE ");
}
if (softswitches & SS_80COL) {
fprintf(stderr, "SS_80COL ");
}
if (softswitches & SS_RAMRD) {
fprintf(stderr, "SS_RAMRD ");
}
if (softswitches & SS_RAMWRT) {
fprintf(stderr, "SS_RAMWRT ");
}
if (softswitches & SS_ALTZP) {
fprintf(stderr, "SS_ALTZP ");
}
if (softswitches & SS_DHIRES) {
fprintf(stderr, "SS_DHIRES ");
}
if (softswitches & SS_IOUDIS) {
fprintf(stderr, "SS_IOUDIS ");
}
if (softswitches & SS_CXROM) {
fprintf(stderr, "SS_CXROM ");
}
if (softswitches & SS_C3ROM) {
fprintf(stderr, "SS_C3ROM ");
}
if (softswitches & SS_ALTCHAR) {
fprintf(stderr, "SS_ALTCHAR ");
}
fprintf(stderr, "\n");
// pseudo #1
fprintf(stderr, "PSEUDO 1: ");
if (softswitches & SS_LCSEC) {
fprintf(stderr, "SS_LCSEC ");
}
if (softswitches & SS_LCWRT) {
fprintf(stderr, "SS_LCWRT ");
}
fprintf(stderr, "\n");
// pseudo #2
fprintf(stderr, "PSEUDO 2: ");
if (softswitches & SS_SCREEN) {
fprintf(stderr, "SS_SCREEN ");
}
if (softswitches & SS_TEXTRD) {
fprintf(stderr, "SS_TEXTRD ");
}
if (softswitches & SS_TEXTWRT) {
fprintf(stderr, "SS_TEXTWRT ");
}
if (softswitches & SS_HGRRD) {
fprintf(stderr, "SS_HGRRD ");
}
if (softswitches & SS_HGRWRT) {
fprintf(stderr, "SS_HGRWRT ");
}
fprintf(stderr, "\n");
}