Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-15 20:30:11 +00:00
Code Issues Projects Releases Wiki Activity

pt3: rename REGISTER_DUMP to AY_REGISTERS

Browse Source 
makes the code a bit clearer
This commit is contained in:
Vince Weaver 2019-05-17 13:25:02 -04:00
parent 62b3123aaf
commit efcf749f4b
5 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pt3_player/interrupt_handler.s
View File

@ -78,7 +78,7 @@ mb_write_frame:
;================================== ;==================================
mb_write_loop: mb_write_loop:
lda REGISTER_DUMP,X ; load register value ; 4 lda AY_REGISTERS,X ; load register value ; 4
; special case R13. If it is 0xff, then don't update ; special case R13. If it is 0xff, then don't update
; otherwise might spuriously reset the envelope settings ; otherwise might spuriously reset the envelope settings
@ -103,7 +103,7 @@ mb_not_13:
sta MOCK_6522_ORB2 ; 4 sta MOCK_6522_ORB2 ; 4
; value ; value
lda REGISTER_DUMP,X ; load register value ; 4 lda AY_REGISTERS,X ; load register value ; 4
sta MOCK_6522_ORA1 ; put value on PA1 ; 4 sta MOCK_6522_ORA1 ; put value on PA1 ; 4
sta MOCK_6522_ORA2 ; put value on PA2 ; 4 sta MOCK_6522_ORA2 ; put value on PA2 ; 4
lda #MOCK_AY_WRITE ; ; 2 lda #MOCK_AY_WRITE ; ; 2
@ -292,7 +292,7 @@ quiet_exit:
jsr clear_ay_both jsr clear_ay_both
lda #$ff ; also mute the channel lda #$ff ; also mute the channel
sta REGISTER_DUMP+7 ; just in case sta AY_REGISTERS+7 ; just in case
exit_interrupt: exit_interrupt:

28
pt3_player/pt3_dumper.s
View File

@ -65,9 +65,9 @@ main_loop:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+1 lda AY_REGISTERS+1
jsr PRBYTE jsr PRBYTE
lda REGISTER_DUMP+0 lda AY_REGISTERS+0
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -77,9 +77,9 @@ main_loop:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+3 lda AY_REGISTERS+3
jsr PRBYTE jsr PRBYTE
lda REGISTER_DUMP+2 lda AY_REGISTERS+2
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -89,9 +89,9 @@ main_loop:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+5 lda AY_REGISTERS+5
jsr PRBYTE jsr PRBYTE
lda REGISTER_DUMP+4 lda AY_REGISTERS+4
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -101,7 +101,7 @@ main_loop:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+6 lda AY_REGISTERS+6
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -111,7 +111,7 @@ main_loop:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+7 lda AY_REGISTERS+7
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -130,7 +130,7 @@ six_space:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+8 lda AY_REGISTERS+8
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -144,7 +144,7 @@ six_space:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+9 lda AY_REGISTERS+9
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -158,7 +158,7 @@ six_space:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+10 lda AY_REGISTERS+10
jsr PRBYTE jsr PRBYTE
lda #' '+$80 lda #' '+$80
jsr COUT jsr COUT
@ -172,15 +172,15 @@ six_space:
jsr COUT jsr COUT
lda #':'+$80 lda #':'+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+12 lda AY_REGISTERS+12
jsr PRBYTE jsr PRBYTE
lda REGISTER_DUMP+11 lda AY_REGISTERS+11
jsr PRBYTE jsr PRBYTE
; Envelope type ; Envelope type
lda #','+$80 lda #','+$80
jsr COUT jsr COUT
lda REGISTER_DUMP+13 lda AY_REGISTERS+13
jsr PRBYTE jsr PRBYTE
jsr CROUT1 jsr CROUT1

208
pt3_player/pt3_lib.s
View File

@ -1806,9 +1806,9 @@ do_frame:
; Load up the Frequency Registers ; Load up the Frequency Registers
lda note_a+NOTE_TONE_L ; Note A Period L lda note_a+NOTE_TONE_L ; Note A Period L
sta REGISTER_DUMP+0 ; into R0 sta AY_REGISTERS+0 ; into R0
lda note_a+NOTE_TONE_H ; Note A Period H lda note_a+NOTE_TONE_H ; Note A Period H
sta REGISTER_DUMP+1 ; into R1 sta AY_REGISTERS+1 ; into R1
lda convert_177 lda convert_177
beq no_scale_a beq no_scale_a
@ -1816,41 +1816,41 @@ do_frame:
; Convert from 1.77MHz to 1MHz by multiplying by 9/16 ; Convert from 1.77MHz to 1MHz by multiplying by 9/16
; first multiply by 8 ; first multiply by 8
asl REGISTER_DUMP+0 asl AY_REGISTERS+0
rol REGISTER_DUMP+1 rol AY_REGISTERS+1
asl REGISTER_DUMP+0 asl AY_REGISTERS+0
rol REGISTER_DUMP+1 rol AY_REGISTERS+1
asl REGISTER_DUMP+0 asl AY_REGISTERS+0
rol REGISTER_DUMP+1 rol AY_REGISTERS+1
; add in original to get 9 ; add in original to get 9
clc clc
lda note_a+NOTE_TONE_L lda note_a+NOTE_TONE_L
adc REGISTER_DUMP+0 adc AY_REGISTERS+0
sta REGISTER_DUMP+0 sta AY_REGISTERS+0
lda note_a+NOTE_TONE_H lda note_a+NOTE_TONE_H
adc REGISTER_DUMP+1 adc AY_REGISTERS+1
sta REGISTER_DUMP+1 sta AY_REGISTERS+1
; divide by 16 to get proper value ; divide by 16 to get proper value
ror REGISTER_DUMP+1 ror AY_REGISTERS+1
ror REGISTER_DUMP+0 ror AY_REGISTERS+0
ror REGISTER_DUMP+1 ror AY_REGISTERS+1
ror REGISTER_DUMP+0 ror AY_REGISTERS+0
ror REGISTER_DUMP+1 ror AY_REGISTERS+1
ror REGISTER_DUMP+0 ror AY_REGISTERS+0
ror REGISTER_DUMP+1 ror AY_REGISTERS+1
ror REGISTER_DUMP+0 ror AY_REGISTERS+0
lda REGISTER_DUMP+1 lda AY_REGISTERS+1
and #$0f and #$0f
sta REGISTER_DUMP+1 sta AY_REGISTERS+1
no_scale_a: no_scale_a:
lda note_b+NOTE_TONE_L ; Note B Period L lda note_b+NOTE_TONE_L ; Note B Period L
sta REGISTER_DUMP+2 ; into R2 sta AY_REGISTERS+2 ; into R2
lda note_b+NOTE_TONE_H ; Note B Period H lda note_b+NOTE_TONE_H ; Note B Period H
sta REGISTER_DUMP+3 ; into R3 sta AY_REGISTERS+3 ; into R3
lda convert_177 lda convert_177
beq no_scale_b beq no_scale_b
@ -1858,41 +1858,41 @@ no_scale_a:
; Convert from 1.77MHz to 1MHz by multiplying by 9/16 ; Convert from 1.77MHz to 1MHz by multiplying by 9/16
; first multiply by 8 ; first multiply by 8
asl REGISTER_DUMP+2 asl AY_REGISTERS+2
rol REGISTER_DUMP+3 rol AY_REGISTERS+3
asl REGISTER_DUMP+2 asl AY_REGISTERS+2
rol REGISTER_DUMP+3 rol AY_REGISTERS+3
asl REGISTER_DUMP+2 asl AY_REGISTERS+2
rol REGISTER_DUMP+3 rol AY_REGISTERS+3
; add in original to get 9 ; add in original to get 9
clc clc
lda note_b+NOTE_TONE_L lda note_b+NOTE_TONE_L
adc REGISTER_DUMP+2 adc AY_REGISTERS+2
sta REGISTER_DUMP+2 sta AY_REGISTERS+2
lda note_b+NOTE_TONE_H lda note_b+NOTE_TONE_H
adc REGISTER_DUMP+3 adc AY_REGISTERS+3
sta REGISTER_DUMP+3 sta AY_REGISTERS+3
; divide by 16 to get proper value ; divide by 16 to get proper value
ror REGISTER_DUMP+3 ror AY_REGISTERS+3
ror REGISTER_DUMP+2 ror AY_REGISTERS+2
ror REGISTER_DUMP+3 ror AY_REGISTERS+3
ror REGISTER_DUMP+2 ror AY_REGISTERS+2
ror REGISTER_DUMP+3 ror AY_REGISTERS+3
ror REGISTER_DUMP+2 ror AY_REGISTERS+2
ror REGISTER_DUMP+3 ror AY_REGISTERS+3
ror REGISTER_DUMP+2 ror AY_REGISTERS+2
lda REGISTER_DUMP+3 lda AY_REGISTERS+3
and #$0f and #$0f
sta REGISTER_DUMP+3 sta AY_REGISTERS+3
no_scale_b: no_scale_b:
lda note_c+NOTE_TONE_L ; Note C Period L lda note_c+NOTE_TONE_L ; Note C Period L
sta REGISTER_DUMP+4 ; into R4 sta AY_REGISTERS+4 ; into R4
lda note_c+NOTE_TONE_H ; Note C Period H lda note_c+NOTE_TONE_H ; Note C Period H
sta REGISTER_DUMP+5 ; into R5 sta AY_REGISTERS+5 ; into R5
lda convert_177 lda convert_177
beq no_scale_c beq no_scale_c
@ -1900,34 +1900,34 @@ no_scale_b:
; Convert from 1.77MHz to 1MHz by multiplying by 9/16 ; Convert from 1.77MHz to 1MHz by multiplying by 9/16
; first multiply by 8 ; first multiply by 8
asl REGISTER_DUMP+4 asl AY_REGISTERS+4
rol REGISTER_DUMP+5 rol AY_REGISTERS+5
asl REGISTER_DUMP+4 asl AY_REGISTERS+4
rol REGISTER_DUMP+5 rol AY_REGISTERS+5
asl REGISTER_DUMP+4 asl AY_REGISTERS+4
rol REGISTER_DUMP+5 rol AY_REGISTERS+5
; add in original to get 9 ; add in original to get 9
clc clc
lda note_c+NOTE_TONE_L lda note_c+NOTE_TONE_L
adc REGISTER_DUMP+4 adc AY_REGISTERS+4
sta REGISTER_DUMP+4 sta AY_REGISTERS+4
lda note_c+NOTE_TONE_H lda note_c+NOTE_TONE_H
adc REGISTER_DUMP+5 adc AY_REGISTERS+5
sta REGISTER_DUMP+5 sta AY_REGISTERS+5
; divide by 16 to get proper value ; divide by 16 to get proper value
ror REGISTER_DUMP+5 ror AY_REGISTERS+5
ror REGISTER_DUMP+4 ror AY_REGISTERS+4
ror REGISTER_DUMP+5 ror AY_REGISTERS+5
ror REGISTER_DUMP+4 ror AY_REGISTERS+4
ror REGISTER_DUMP+5 ror AY_REGISTERS+5
ror REGISTER_DUMP+4 ror AY_REGISTERS+4
ror REGISTER_DUMP+5 ror AY_REGISTERS+5
ror REGISTER_DUMP+4 ror AY_REGISTERS+4
lda REGISTER_DUMP+5 lda AY_REGISTERS+5
and #$0f and #$0f
sta REGISTER_DUMP+5 sta AY_REGISTERS+5
no_scale_c: no_scale_c:
@ -1938,7 +1938,7 @@ no_scale_c:
lda pt3_noise_period lda pt3_noise_period
adc pt3_noise_add adc pt3_noise_add
and #$1f and #$1f
sta REGISTER_DUMP+6 sta AY_REGISTERS+6
sta temp_word_l sta temp_word_l
lda convert_177 lda convert_177
@ -1947,23 +1947,23 @@ no_scale_c:
; Convert from 1.77MHz to 1MHz by multiplying by 9/16 ; Convert from 1.77MHz to 1MHz by multiplying by 9/16
; first multiply by 8 ; first multiply by 8
asl REGISTER_DUMP+6 asl AY_REGISTERS+6
asl REGISTER_DUMP+6 asl AY_REGISTERS+6
asl REGISTER_DUMP+6 asl AY_REGISTERS+6
; add in original to get 9 ; add in original to get 9
clc clc
lda temp_word_l lda temp_word_l
adc REGISTER_DUMP+6 adc AY_REGISTERS+6
; divide by 16 to get proper value ; divide by 16 to get proper value
ror REGISTER_DUMP+6 ror AY_REGISTERS+6
ror REGISTER_DUMP+6 ror AY_REGISTERS+6
ror REGISTER_DUMP+6 ror AY_REGISTERS+6
ror REGISTER_DUMP+6 ror AY_REGISTERS+6
lda REGISTER_DUMP+6 lda AY_REGISTERS+6
and #$1f and #$1f
sta REGISTER_DUMP+6 sta AY_REGISTERS+6
no_scale_n: no_scale_n:
@ -1971,15 +1971,15 @@ no_scale_n:
; Mixer ; Mixer
lda pt3_mixer_value lda pt3_mixer_value
sta REGISTER_DUMP+7 sta AY_REGISTERS+7
; Amplitudes ; Amplitudes
lda note_a+NOTE_AMPLITUDE lda note_a+NOTE_AMPLITUDE
sta REGISTER_DUMP+8 sta AY_REGISTERS+8
lda note_b+NOTE_AMPLITUDE lda note_b+NOTE_AMPLITUDE
sta REGISTER_DUMP+9 sta AY_REGISTERS+9
lda note_c+NOTE_AMPLITUDE lda note_c+NOTE_AMPLITUDE
sta REGISTER_DUMP+10 sta AY_REGISTERS+10
; Envelope period ; Envelope period
; result=period+add+slide (16-bits) ; result=period+add+slide (16-bits)
@ -1995,11 +1995,11 @@ no_scale_n:
lda pt3_envelope_slide_l lda pt3_envelope_slide_l
adc temp_word_l adc temp_word_l
sta temp_word_l sta temp_word_l
sta REGISTER_DUMP+11 sta AY_REGISTERS+11
lda temp_word_h lda temp_word_h
adc pt3_envelope_slide_h adc pt3_envelope_slide_h
sta temp_word_h sta temp_word_h
sta REGISTER_DUMP+12 sta AY_REGISTERS+12
lda convert_177 lda convert_177
beq no_scale_e beq no_scale_e
@ -2007,34 +2007,34 @@ no_scale_n:
; Convert from 1.77MHz to 1MHz by multiplying by 9/16 ; Convert from 1.77MHz to 1MHz by multiplying by 9/16
; first multiply by 8 ; first multiply by 8
asl REGISTER_DUMP+11 asl AY_REGISTERS+11
rol REGISTER_DUMP+12 rol AY_REGISTERS+12
asl REGISTER_DUMP+11 asl AY_REGISTERS+11
rol REGISTER_DUMP+12 rol AY_REGISTERS+12
asl REGISTER_DUMP+11 asl AY_REGISTERS+11
rol REGISTER_DUMP+12 rol AY_REGISTERS+12
; add in original to get 9 ; add in original to get 9
clc clc
lda temp_word_l lda temp_word_l
adc REGISTER_DUMP+11 adc AY_REGISTERS+11
sta REGISTER_DUMP+11 sta AY_REGISTERS+11
lda temp_word_h lda temp_word_h
adc REGISTER_DUMP+12 adc AY_REGISTERS+12
sta REGISTER_DUMP+12 sta AY_REGISTERS+12
; divide by 16 to get proper value ; divide by 16 to get proper value
ror REGISTER_DUMP+12 ror AY_REGISTERS+12
ror REGISTER_DUMP+11 ror AY_REGISTERS+11
ror REGISTER_DUMP+12 ror AY_REGISTERS+12
ror REGISTER_DUMP+11 ror AY_REGISTERS+11
ror REGISTER_DUMP+12 ror AY_REGISTERS+12
ror REGISTER_DUMP+11 ror AY_REGISTERS+11
ror REGISTER_DUMP+12 ror AY_REGISTERS+12
ror REGISTER_DUMP+11 ror AY_REGISTERS+11
lda REGISTER_DUMP+12 lda AY_REGISTERS+12
and #$0f and #$0f
sta REGISTER_DUMP+12 sta AY_REGISTERS+12
no_scale_e: no_scale_e:
@ -2046,7 +2046,7 @@ no_scale_e:
envelope_same: envelope_same:
lda #$ff ; if same, store $ff lda #$ff ; if same, store $ff
envelope_diff: envelope_diff:
sta REGISTER_DUMP+13 sta AY_REGISTERS+13
lda pt3_envelope_type lda pt3_envelope_type
sta pt3_envelope_type_old ; copy old to new sta pt3_envelope_type_old ; copy old to new

4
pt3_player/pt3_timer.s
View File

@ -382,7 +382,7 @@ mb_write_frame:
;================================== ;==================================
mb_write_loop: mb_write_loop:
lda REGISTER_DUMP,X ; load register value ; 4 lda AY_REGISTERS,X ; load register value ; 4
; special case R13. If it is 0xff, then don't update ; special case R13. If it is 0xff, then don't update
; otherwise might spuriously reset the envelope settings ; otherwise might spuriously reset the envelope settings
@ -407,7 +407,7 @@ mb_not_13:
sta MOCK_6522_ORB2 ; 4 sta MOCK_6522_ORB2 ; 4
; value ; value
lda REGISTER_DUMP,X ; load register value ; 4 lda AY_REGISTERS,X ; load register value ; 4
sta MOCK_6522_ORA1 ; put value on PA1 ; 4 sta MOCK_6522_ORA1 ; put value on PA1 ; 4
sta MOCK_6522_ORA2 ; put value on PA2 ; 4 sta MOCK_6522_ORA2 ; put value on PA2 ; 4
lda #MOCK_AY_WRITE ; ; 2 lda #MOCK_AY_WRITE ; ; 2

2
pt3_player/zp.inc
View File

@ -70,7 +70,7 @@ FILEMH EQU $65
;DY_I EQU $6E ;DY_I EQU $6E
;DY_F EQU $6F ;DY_F EQU $6F
REGISTER_DUMP EQU $70 AY_REGISTERS EQU $70
A_FINE_TONE EQU $70 A_FINE_TONE EQU $70
A_COARSE_TONE EQU $71 A_COARSE_TONE EQU $71
B_FINE_TONE EQU $72 B_FINE_TONE EQU $72