Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2024-12-01 05:50:24 +00:00
Code Issues Projects Releases Wiki Activity

DeskTop: Simplify some dynamic jumps

Browse Source
This commit is contained in:
Joshua Bell 2018-01-04 20:27:15 -08:00
parent e8d2364379
commit 07f9e5a733
2 changed files with 57 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/a2d.s
View File

@ -8,9 +8,6 @@
.include "../a2d.inc" .include "../a2d.inc"
.include "../desktop.inc" .include "../desktop.inc"
;; Is this actually needed, or a coincidence?
desktop_win18_state := $D63F
;;; ================================================== ;;; ==================================================
;;; A2D - the GUI library ;;; A2D - the GUI library
;;; ================================================== ;;; ==================================================
@ -8782,6 +8779,9 @@ mouse_operand: ; e.g. if mouse is in slot 4, this is $40
;;; TODO: This section behaves almost like part of DeskTop, not A2D ??? ;;; TODO: This section behaves almost like part of DeskTop, not A2D ???
;; Is this actually needed, or a coincidence?
desktop_win18_state := $D63F
.byte $03 .byte $03
.addr $85E9 .addr $85E9

134
desktop/desktop.s
View File

@ -4,7 +4,6 @@
.include "../inc/apple2.inc" .include "../inc/apple2.inc"
.include "../inc/auxmem.inc" .include "../inc/auxmem.inc"
.include "../inc/prodos.inc" .include "../inc/prodos.inc"
.include "../inc/mouse.inc"
.include "../a2d.inc" .include "../a2d.inc"
.include "../desktop.inc" .include "../desktop.inc"
@ -5224,7 +5223,6 @@ app_mask:
.res 70, 0 .res 70, 0
.endproc ; desktop_aux .endproc ; desktop_aux
desktop_win18_state := desktop_aux::win18::state
.proc desktop_main .proc desktop_main
L0000 := $0000 L0000 := $0000
@ -5238,50 +5236,31 @@ L0D14 := $0D14
.org $4000 .org $4000
;; Jump table
L4000: jmp L4042 L4000: jmp L4042
L4003: jmp A2D_RELAY L4003: jmp A2D_RELAY
L4006: jmp L8259 L4006: jmp L8259
L4009: jmp L830F L4009: jmp L830F
jmp L5E78 jmp L5E78
jmp DESKTOP_AUXLOAD jmp DESKTOP_AUXLOAD
L4012: jmp L5050 L4012: jmp L5050
L4015: jmp L40F2 L4015: jmp L40F2
L4018: jmp DESKTOP_RELAY L4018: jmp DESKTOP_RELAY
jmp L8E81 jmp L8E81
L401E: jmp L6D2B L401E: jmp L6D2B
L4021: jmp L46BA L4021: jmp L46BA
jmp DESKTOP_COPY_TO_BUF jmp DESKTOP_COPY_TO_BUF
jmp DESKTOP_COPY_FROM_BUF jmp DESKTOP_COPY_FROM_BUF
jmp L490E jmp L490E
L402D: jmp L8707 L402D: jmp L8707
L4030: jmp DESKTOP_SHOW_ALERT0 L4030: jmp DESKTOP_SHOW_ALERT0
L4033: jmp DESKTOP_SHOW_ALERT L4033: jmp DESKTOP_SHOW_ALERT
jmp L46DE jmp L46DE
jmp L489A jmp L489A
jmp L488A jmp L488A
jmp L8E89 jmp L8E89
;; API entry point
L4042: cli L4042: cli
sta ALTZPON sta ALTZPON
lda LCBANK1 lda LCBANK1
@ -5619,16 +5598,15 @@ L43B3: dex
lda L42C4,x lda L42C4,x
sta L43E5 sta L43E5
lda L42C5,x lda L42C5,x
sta L43E6 sta L43E5+1
jsr L43E0 jsr L43E0
A2D_RELAY_CALL $33, $E25A ; ??? A2D_RELAY_CALL $33, $E25A ; ???
rts rts
L43E0: tsx L43E0: tsx
stx $E256 stx $E256
.byte $4C L43E5 := *+1
L43E5: .byte $34 jmp $1234 ; self-modified
L43E6: .byte $12
L43E7: tsx L43E7: tsx
stx $E256 stx $E256
A2D_RELAY_CALL A2D_QUERY_TARGET, $D209 A2D_RELAY_CALL A2D_QUERY_TARGET, $D209
@ -6031,7 +6009,7 @@ L477F: lda $D345,x
lda #$90 lda #$90
sta L5B19 sta L5B19
lda #$02 lda #$02
sta L5B1A sta L5B19+1
jmp L5AEE jmp L5AEE
.byte $0A,$00,$18,$00,$00,$00,$00,$00 .byte $0A,$00,$18,$00,$00,$00,$00,$00
@ -6145,10 +6123,11 @@ L48CC: sta $D2AC
lda #$88 lda #$88
sta L48E4 sta L48E4
lda #$40 lda #$40
sta L48E5 sta L48E4+1
.byte $4C
L48E4: .byte $34 L48E4 := *+1
L48E5: .byte $12 jmp $1234 ; self-modified
L48E6: A2D_RELAY_CALL A2D_GET_INPUT, $D208 L48E6: A2D_RELAY_CALL A2D_GET_INPUT, $D208
rts rts
@ -8185,7 +8164,7 @@ L5AD0: .byte 0
sbc #$30 sbc #$30
clc clc
adc #$C0 adc #$C0
sta L5B1A sta L5B19+1
lda #$00 lda #$00
sta L5B19 sta L5B19
L5AEE: sta ALTZPOFF L5AEE: sta ALTZPOFF
@ -8202,9 +8181,10 @@ L5AEE: sta ALTZPOFF
sta CLRALTCHAR sta CLRALTCHAR
sta CLR80VID sta CLR80VID
sta CLR80COL sta CLR80COL
.byte $4C
L5B19: .byte 0 L5B19 := *+1
L5B1A: .byte 0 jmp $0000 ; self-modified
L5B1B: .byte 0 L5B1B: .byte 0
L5B1C: lda DESKTOP_WINID L5B1C: lda DESKTOP_WINID
sta DESKTOP_BUFNUM sta DESKTOP_BUFNUM
@ -14288,18 +14268,17 @@ L9168: jsr L917F
L917A: .byte 0 L917A: .byte 0
.byte 0 .byte 0
L917C: .byte $4C
L917D: .byte 0 ;; Dynamically constructed jump table???
L917E: .byte 0 L917D := *+1
L917F: .byte $4C L917C: jmp $0000
L9180: .byte 0 L9180 := *+1
L9181: .byte 0 L917F: jmp $0000
L9182: .byte $4C L9183 := *+1
L9183: .byte 0 L9182: jmp $0000
L9184: .byte 0 L9186 := *+1
L9185: .byte $4C L9185: jmp $0000
L9186: .byte 0
L9187: .byte 0
L9188: .byte 0 L9188: .byte 0
L9189: .byte 0 L9189: .byte 0
L918A: .byte 0 L918A: .byte 0
@ -15186,11 +15165,11 @@ L993E: lda #$00
lda #$5A lda #$5A
sta L917D sta L917D
lda #$99 lda #$99
sta L917E sta L917D+1
lda #$7C lda #$7C
sta L9180 sta L9180
lda #$99 lda #$99
sta L9181 sta L9180+1
jmp L9BBF jmp L9BBF
sta L9938 sta L9938
@ -15218,11 +15197,11 @@ L9984: lda #$00
lda #$A7 lda #$A7
sta L917D sta L917D
lda #$99 lda #$99
sta L917E sta L917D+1
lda #$DC lda #$DC
sta L9180 sta L9180
lda #$99 lda #$99
sta L9181 sta L9180+1
ldy #$0A ldy #$0A
lda #$37 lda #$37
ldx #$99 ldx #$99
@ -15251,7 +15230,7 @@ L99C3: lda L9931,y
lda #$EB lda #$EB
sta L9186 sta L9186
lda #$99 lda #$99
sta L9187 sta L9186+1
rts rts
lda #$03 lda #$03
@ -15811,16 +15790,16 @@ L9E7E: sta L9E79
lda #$B1 lda #$B1
sta L9183 sta L9183
lda #$9E lda #$9E
sta L9184 sta L9183+1
lda #$A3 lda #$A3
sta L917D sta L917D
lda #$9E lda #$9E
sta L917E sta L917D+1
jsr LA044 jsr LA044
lda #$D3 lda #$D3
sta L9180 sta L9180
lda #$9E lda #$9E
sta L9181 sta L9180+1
rts rts
sta L9E7A sta L9E7A
@ -16041,31 +16020,31 @@ LA059: lda #$00
lda #$D1 lda #$D1
sta L9183 sta L9183
lda #$A0 lda #$A0
sta L9184 sta L9183+1
lda #$B5 lda #$B5
sta L917D sta L917D
lda #$A0 lda #$A0
sta L917E sta L917D+1
jsr LA10A jsr LA10A
lda #$F8 lda #$F8
sta L9180 sta L9180
lda #$A0 lda #$A0
sta L9181 sta L9180+1
rts rts
LA085: lda #$C3 LA085: lda #$C3
sta L9183 sta L9183
lda #$A0 lda #$A0
sta L9184 sta L9183+1
lda #$A7 lda #$A7
sta L917D sta L917D
lda #$A0 lda #$A0
sta L917E sta L917D+1
jsr LA100 jsr LA100
lda #$F0 lda #$F0
sta L9180 sta L9180
lda #$A0 lda #$A0
sta L9181 sta L9180+1
rts rts
sta LA055 sta LA055
@ -16227,11 +16206,11 @@ LA1E4: lda #$00
lda #$20 lda #$20
sta L9183 sta L9183
lda #$A2 lda #$A2
sta L9184 sta L9183+1
lda #$11 lda #$11
sta L917D sta L917D
lda #$A2 lda #$A2
sta L917E sta L917D+1
ldy #$0B ldy #$0B
lda #$DF lda #$DF
ldx #$A1 ldx #$A1
@ -16239,7 +16218,7 @@ LA1E4: lda #$00
lda #$33 lda #$33
sta L9180 sta L9180
lda #$A2 lda #$A2
sta L9181 sta L9180+1
rts rts
lda #$01 lda #$01
@ -16597,11 +16576,7 @@ LA4C6: ldy #$C5
.res 48, 0 .res 48, 0
LA500: jmp LA520 LA500: jmp LA520
LA503: .byte $9C LA503: .addr $A89C,$A957,$ACD4,$AE34,$A898,$A898,$AF28,$B02C,$B14A,$B268,$AAE1,$ABFA,$B325
LA504: .byte $A8,$57,$A9,$D4,$AC,$34,$AE,$98
.byte $A8,$98,$A8,$28,$AF,$2C,$B0,$4A
.byte $B1,$68,$B2,$E1,$AA,$FA,$AB,$25
.byte $B3
LA51D: .byte $00 LA51D: .byte $00
LA51E: .byte $00,$00 LA51E: .byte $00,$00
LA520: sta LA51D LA520: sta LA51D
@ -16611,8 +16586,8 @@ LA520: sta LA51D
tax tax
lda LA503,x lda LA503,x
sta LA565 sta LA565
lda LA504,x lda LA503+1,x
sta LA566 sta LA565+1
lda #$00 lda #$00
sta $D8EB sta $D8EB
sta $D8EC sta $D8EC
@ -16628,11 +16603,11 @@ LA520: sta LA51D
lda #$98 lda #$98
sta LA89A sta LA89A
lda #$A8 lda #$A8
sta LA89B sta LA89A+1
jsr LB403 jsr LB403
.byte $4C
LA565: .byte 0 LA565 := *+1
LA566: .byte 0 jmp $0000 ; self-modified
LA567: lda $D8E8 LA567: lda $D8E8
beq LA579 beq LA579
dec $D8E9 dec $D8E9
@ -16969,9 +16944,8 @@ LA895: lda #$FF
rts rts
LA899: .byte $4C LA89A := *+1
LA89A: .byte 0 LA899: jmp $0000
LA89B: .byte 0
LA89C: A2D_RELAY_CALL A2D_CREATE_WINDOW, $D62B LA89C: A2D_RELAY_CALL A2D_CREATE_WINDOW, $D62B
lda $D62B lda $D62B
@ -19249,4 +19223,4 @@ LBEB1: A2D_RELAY_CALL A2D_QUERY_SCREEN, $D239
rts rts
.res 60, 0 .res 60, 0
.endproc .endproc ; desktop_main