Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2024-06-25 21:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Add macro for copy16 w/ indexed indirect src/dst

Browse Source
This commit is contained in:
Joshua Bell 2018-11-10 20:31:31 -08:00
parent ac84a24a71
commit 1692b4da42
5 changed files with 60 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desk.acc/date.s
View File

@ -482,11 +482,7 @@ incr: copy16 #increment_table, ptr
go: lda selected_field
asl a
tay
lda (ptr),y
sta gosub+1
iny
lda (ptr),y
sta gosub+2
copy16in (ptr),y, gosub+1
gosub: jsr $1000 ; self modified
MGTK_CALL MGTK::SetTextBG, settextbg_params

12
desk.acc/sort.directory.s
View File

@ -261,11 +261,7 @@ L09E7: jsr L0B16
and #STORAGE_TYPE_MASK
beq L09E7
ldy #SubdirectoryHeader::file_count
lda ($06),y
sta L0A95
iny
lda ($06),y
sta L0A95+1
copy16in ($06),y, L0A95
jsr L0AE8
lda unit_num
sta block_params::unit_num
@ -300,11 +296,7 @@ L0A4B: jsr L0B16
cmp #(ST_LINKED_DIRECTORY << 4)
bne L0A4B
ldy #$11
lda ($06),y
sta block_params::block_num
iny
lda ($06),y
sta block_params::block_num+1
copy16in ($06),y, block_params::block_num
jsr read_block
bne L0A8F
lda $07

6
desktop/desktop_aux.s
View File

@ -1788,11 +1788,7 @@ icon_poly_size := (8 * .sizeof(MGTK::Point)) + 2
copy16 poly::v0::xcoord, poly::v7::xcoord
ldy #IconEntry::iconbits
lda (entry_ptr),y
sta bitmap_ptr
iny
lda (entry_ptr),y
sta bitmap_ptr+1
copy16in (entry_ptr),y, bitmap_ptr
;; Right edge of icon (v1, v2)
ldy #8 ; bitmap x2

132
desktop/desktop_main.s
View File

@ -6389,11 +6389,7 @@ L7870: lda cached_window_id
ldy #IconEntry::win_type
sta (icon_entry),y
ldy #IconEntry::iconbits
lda L7622
sta (icon_entry),y
iny
lda L7622+1
sta (icon_entry),y
copy16in L7622, (icon_entry),y
ldx cached_window_icon_count
dex
lda cached_window_icon_list,x
@ -6437,11 +6433,7 @@ found:
;; Look up icon definition
copy16 type_icons_addr, ptr
lda (ptr),y
sta L7622
iny
lda (ptr),y
sta L7622+1
copy16in (ptr),y, L7622
jsr pop_zp_addrs
rts
@ -7121,11 +7113,7 @@ L7F92: dey
cmp $0808
beq L7F9C
bcc L7FAD
L7F9C: lda ($06),y
sta $0808
iny
lda ($06),y
sta $0809
L7F9C: copy16in ($06),y, $0808
lda L0800
sta $0806
L7FAD: inc L0800
@ -8491,42 +8479,26 @@ create_icon:
use_ramdisk_icon:
ldy #IconEntry::iconbits
lda #<desktop_aux::ramdisk_icon
sta (icon_ptr),y
iny
lda #>desktop_aux::ramdisk_icon
sta (icon_ptr),y
copy16in #desktop_aux::ramdisk_icon, (icon_ptr),y
jmp selected_device_icon
use_profile_icon:
ldy #IconEntry::iconbits
lda #<desktop_aux::profile_icon
sta (icon_ptr),y
iny
lda #>desktop_aux::profile_icon
sta (icon_ptr),y
copy16in #desktop_aux::profile_icon, (icon_ptr),y
jmp selected_device_icon
use_floppy_icon:
cmp #$B ; removable / 4 volumes
bne use_floppy140_icon
ldy #IconEntry::iconbits
lda #<desktop_aux::floppy800_icon
sta (icon_ptr),y
iny
lda #>desktop_aux::floppy800_icon
sta (icon_ptr),y
copy16in #desktop_aux::floppy800_icon, (icon_ptr),y
jmp selected_device_icon
use_floppy140_icon:
cmp #DT_DISKII ; 0 = Disk II
bne use_profile_icon ; last chance
ldy #IconEntry::iconbits
lda #<desktop_aux::floppy140_icon
sta (icon_ptr),y
iny
lda #>desktop_aux::floppy140_icon
sta (icon_ptr),y
copy16in #desktop_aux::floppy140_icon, (icon_ptr),y
selected_device_icon:
;; Assign icon type
@ -11895,11 +11867,7 @@ close: MGTK_RELAY_CALL MGTK::CloseWindow, winfo_about_dialog
rts
do1: ldy #1
lda (ptr),y
sta file_count
iny
lda (ptr),y
sta file_count+1
copy16in (ptr),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -11910,11 +11878,7 @@ do1: ldy #1
rts
do2: ldy #1
lda (ptr),y
sta file_count
iny
lda (ptr),y
sta file_count+1
copy16in (ptr),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12026,11 +11990,7 @@ else: lda #0
rts
do1: ldy #1
lda (ptr),y
sta file_count
iny
lda (ptr),y
sta file_count+1
copy16in (ptr),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12041,11 +12001,7 @@ do1: ldy #1
rts
do2: ldy #$01
lda (ptr),y
sta file_count
iny
lda (ptr),y
sta file_count+1
copy16in (ptr),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12124,11 +12080,7 @@ do1: ldy #$01
sta ptr+1
stx ptr
ldy #$00
lda (ptr),y
sta file_count
iny
lda (ptr),y
sta file_count+1
copy16in (ptr),y, file_count
jsr compose_file_count_string
lda winfo_alert_dialog
jsr set_port_from_window_id
@ -12144,11 +12096,7 @@ do1: ldy #$01
sta ptr+1
stx ptr
ldy #$00
lda (ptr),y
sta file_count
iny
lda (ptr),y
sta file_count+1
copy16in (ptr),y, file_count
jsr compose_file_count_string
lda #165
sta dialog_label_pos
@ -12210,11 +12158,7 @@ LAD20: axy_call draw_dialog_label, 4, desktop_aux::str_delete_ok
rts
do1: ldy #$01
lda ($06),y
sta file_count
iny
lda ($06),y
sta file_count+1
copy16in ($06),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12230,11 +12174,7 @@ LAD5D: addr_call draw_text1, str_file_count
rts
do3: ldy #$01
lda ($06),y
sta file_count
iny
lda ($06),y
sta file_count+1
copy16in ($06),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12322,11 +12262,7 @@ LAE70: lda #$80
jsr LBD75
jsr copy_dialog_param_addr_to_ptr
ldy #$01
lda ($06),y
sta $08
iny
lda ($06),y
sta $08+1
copy16in ($06),y, $08
ldy #$00
lda ($08),y
tay
@ -12519,11 +12455,7 @@ row: .byte 0
rts
do1: ldy #$01
lda ($06),y
sta file_count
iny
lda ($06),y
sta file_count+1
copy16in ($06),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12535,11 +12467,7 @@ do1: ldy #$01
rts
do3: ldy #$01
lda ($06),y
sta file_count
iny
lda ($06),y
sta file_count+1
copy16in ($06),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12610,11 +12538,7 @@ do4: jsr reset_grafport3a
rts
do1: ldy #$01
lda ($06),y
sta file_count
iny
lda ($06),y
sta file_count+1
copy16in ($06),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12626,11 +12550,7 @@ do1: ldy #$01
rts
do3: ldy #$01
lda ($06),y
sta file_count
iny
lda ($06),y
sta file_count+1
copy16in ($06),y, file_count
jsr adjust_str_files_suffix
jsr compose_file_count_string
lda winfo_alert_dialog
@ -12704,11 +12624,7 @@ LB27D: jsr LBD75
sta dialog_label_pos
jsr copy_dialog_param_addr_to_ptr
ldy #$01
lda ($06),y
sta $08
iny
lda ($06),y
sta $08+1
copy16in ($06),y, $08
ldy #$00
lda ($08),y
tay
@ -14271,11 +14187,7 @@ trash_name: PASCAL_STRING " Trash "
lda #icon_entry_type_trash
sta (ptr),y
ldy #IconEntry::iconbits
lda #<desktop_aux::trash_icon
sta (ptr),y
iny
lda #>desktop_aux::trash_icon
sta (ptr),y
copy16in #desktop_aux::trash_icon, (ptr),y
iny
ldx #0
: lda trash_name,x

34
macros.inc
View File

@ -513,6 +513,40 @@ end:
.endif
.endmacro
;;; Copy 16-bit value, indexed indirect, y register incremented
;;; copy16in #$1111, ($2222),y ; immediate load, indexed indirect store
;;; copy16in $1111, ($2222),y ; absolute load, indexed indirect store
;;; copy16in ($1111),y, $2222 ; indexed indirect load, absolute store
;;; copy16in ($1111),y ($2222),y ; indexed indirect load, indexed indirect store
.macro copy16in arg1, arg2, arg3, arg4
.if _is_y_register {arg2} && _is_y_register {arg4}
;; copy16in ($1111),y, ($2222),y
lda (arg1),y
sta (arg3),y
iny
lda (arg1),y
sta (arg3),y
.elseif _is_y_register {arg2}
;; copy16in ($1111),y, $2222
lda (arg1),y
sta arg3
iny
lda (arg1),y
sta arg3+1
.elseif _is_y_register {arg3}
;; copy16in #$1111, ($2222),y
;; copy16in $1111, ($2222),y
_op_lo lda, {arg1}
sta (arg2),y
iny
_op_hi lda, {arg1}
sta (arg2),y
.else
.error "Indirect indexed required at least one use of y reg"
.endif
.endmacro
;;; Compare 16-bit values
;;; cmp16 #$1111, #$2222 ; immediate, immediate (silly, but supported)
;;; cmp16 #$1111, $2222 ; immediate, absolute