Fix for other VM/display tests

This commit is contained in:
Aaron Culliney 2014-11-25 22:01:46 -08:00
parent bc643bfbdb
commit 2aa2648d30
2 changed files with 8 additions and 8 deletions

View File

@ -1198,13 +1198,13 @@ TEST test_HIRES_on(bool flag_80store, bool flag_page2) {
if (flag_80store) {
if (flag_page2) {
switch_save = switch_save & ~(SS_HGRRD|SS_HGRWRT);
ASSERT((void *)base_hgrrd == (void *)(apple_ii_64k[0]));
ASSERT((void *)base_hgrwrt == (void *)(apple_ii_64k[0]));
} else {
switch_save = switch_save | (SS_HGRRD|SS_HGRWRT);
ASSERT((void *)base_hgrrd == (void *)(apple_ii_64k[1]));
ASSERT((void *)base_hgrwrt == (void *)(apple_ii_64k[1]));
} else {
switch_save = switch_save & ~(SS_HGRRD|SS_HGRWRT);
ASSERT((void *)base_hgrrd == (void *)(apple_ii_64k[0]));
ASSERT((void *)base_hgrwrt == (void *)(apple_ii_64k[0]));
}
} else {
ASSERT(base_hgrrd == save_base_hgrrd); // unchanged

View File

@ -313,13 +313,13 @@ GLUE_C_READ(iie_hires_on)
if (softswitches & SS_80STORE) {
if (softswitches & SS_PAGE2) {
softswitches &= ~(SS_HGRRD|SS_HGRWRT);
base_hgrrd = apple_ii_64k[0];
base_hgrwrt = apple_ii_64k[0];
} else {
softswitches |= (SS_HGRRD|SS_HGRWRT);
base_hgrrd = apple_ii_64k[1];
base_hgrwrt = apple_ii_64k[1];
} else {
softswitches &= ~(SS_HGRRD|SS_HGRWRT);
base_hgrrd = apple_ii_64k[0];
base_hgrwrt = apple_ii_64k[0];
}
}