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

refactor HIRES switch to C

Browse Source
This commit is contained in:
Aaron Culliney 2014-05-10 12:36:59 -07:00
parent 2600c13723
commit ebde9266e3
2 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/asm386/memory.S
View File

@ -149,49 +149,6 @@
enabled.
----------------------------------------------------------------- */
/* HIRES off. use RAMRD/RAMWRT offsets for hires page 1. */
E(iie_hires_off)
testl $SS_HIRES, SN(softswitches) # already off?
jz ram_nop
andl $~(SS_HIRES|SS_HGRRD|SS_HGRWRT), SN(softswitches)
movl $SN(apple_ii_64k), SN(base_hgrrd)
movl $SN(apple_ii_64k), SN(base_hgrwrt)
testl $SS_RAMRD,SN(softswitches)
jz iie_hires_off_no_ramrd
movl $SN(apple_ii_64k)+BANK2, SN(base_hgrrd)
orl $SS_HGRRD, SN(softswitches)
iie_hires_off_no_ramrd:
testl $SS_RAMWRT,SN(softswitches)
jz iie_hires_off_no_ramwrt
movl $SN(apple_ii_64k)+BANK2, SN(base_hgrwrt)
orl $SS_HGRWRT, SN(softswitches)
iie_hires_off_no_ramwrt:
call SN(video_redraw) # update screen
ret
/* HIRES on. if 80STORE on, use PAGE2 offset for hires page 1. */
E(iie_hires_on)
testl $SS_HIRES, SN(softswitches) # already on?
jnz ram_nop
orl $SS_HIRES, SN(softswitches) # hires on
testl $SS_80STORE, SN(softswitches)
jz iie_hires_on_80store_off # no 80STORE
testl $SS_PAGE2, SN(softswitches)
jz iie_hires_on_80store_aux
andl $~(SS_HGRRD|SS_HGRWRT), SN(softswitches)
movl $SN(apple_ii_64k), SN(base_hgrrd)
movl $SN(apple_ii_64k), SN(base_hgrwrt)
jmp iie_hires_on_80store_off
iie_hires_on_80store_aux:
orl $(SS_HGRRD|SS_HGRWRT), SN(softswitches)
movl $SN(apple_ii_64k)+BANK2, SN(base_hgrrd)
movl $SN(apple_ii_64k)+BANK2, SN(base_hgrwrt)
iie_hires_on_80store_off:
call SN(video_redraw) # update screen
ret
/*****************************************************************************/
E(read_button0)
movb SN(joy_button0), %al
ret

48
src/vm.c
View File

@ -149,3 +149,51 @@ GLUE_C_READ(read_switch_mixed)
return 0x0;
}
GLUE_C_READ(iie_hires_off)
{
if (!(softswitches & SS_HIRES)) {
return 0x0; // TODO: no early return?
}
softswitches &= ~(SS_HIRES|SS_HGRRD|SS_HGRWRT);
base_hgrrd = apple_ii_64k[0];
base_hgrwrt = apple_ii_64k[0];
if (softswitches & SS_RAMRD) {
base_hgrrd = apple_ii_64k[1];
softswitches |= SS_HGRRD;
}
if (softswitches & SS_RAMWRT) {
base_hgrwrt = apple_ii_64k[1];
softswitches |= SS_HGRWRT;
}
video_redraw();
return 0x0;
}
GLUE_C_READ(iie_hires_on)
{
if (softswitches & SS_HIRES) {
return 0x0; // TODO: no early return?
}
softswitches |= SS_HIRES;
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];
}
}
video_redraw();
return 0x0;
}