Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-09-13 12:56:30 +00:00
Code Issues Projects Releases Wiki Activity

pt3: add more cycle counting

Browse Source
This commit is contained in:
Vince Weaver 2019-05-20 12:40:35 -04:00
parent 5b2ad332e4
commit acc8c3f0fb
2 changed files with 262 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pt3_player/TODO
View File

@ -1,3 +1,4 @@
1. Merge some of the common code in decode_note() 1. Merge some of the common code in decode_note()
2. Use a jump table for the two switch() statements in decode_note() 2. Use a jump table for the two switch() statements in decode_note()
3. Make the frequency and volume table lookups use self-modify code 3. Make the frequency and volume table lookups use self-modify code
@ -10,6 +11,8 @@
all 13 registers then walking through and outputting them all 13 registers then walking through and outputting them
7. Clear out the channel data with a memset() instead of explicitly 7. Clear out the channel data with a memset() instead of explicitly
setting values? setting values?
8. Self modify the 1MHz vs 1.7MHz change
some further out things some further out things

500
pt3_player/pt3_lib.s
View File

@ -1750,59 +1750,59 @@ pt3_make_frame:
; load a new pattern in ; load a new pattern in
jsr pt3_set_pattern ;6+? jsr pt3_set_pattern ;6+?
lda DONE_SONG lda DONE_SONG ; 3
beq pattern_good beq pattern_good ; 2/3
rts rts ; 6
pattern_good: pattern_good:
; see if we need a new line ; see if we need a new line
lda current_subframe lda current_subframe ; 4
bne line_good bne line_good ; 2/3
; decode a new line ; decode a new line
jsr pt3_decode_line jsr pt3_decode_line ; 6+?
; check if pattern done early ; check if pattern done early
lda pt3_pattern_done lda pt3_pattern_done ; 4
bne line_good bne line_good ; 2/3
;========================== ;==========================
; pattern done early! ; pattern done early!
inc current_pattern ; increment pattern inc current_pattern ; increment pattern ; 6
lda #0 lda #0 ; 2
sta current_line sta current_line ; 4
sta current_subframe sta current_subframe ; 4
jmp pt3_make_frame jmp pt3_make_frame ; 3
line_good: line_good:
; Increment everything ; Increment everything
inc current_subframe ; subframe++ inc current_subframe ; subframe++ ; 6
lda current_subframe lda current_subframe ; 4
cmp pt3_speed ; if we hit pt3_speed, move to next
bne do_frame ; if we hit pt3_speed, move to next
cmp pt3_speed ; 4
bne do_frame ; 2/3
next_line: next_line:
lda #0 ; reset subframe to 0 lda #0 ; reset subframe to 0 ; 2
sta current_subframe sta current_subframe ; 4
inc current_line ; and increment line inc current_line ; and increment line ; 6
lda current_line lda current_line ; 4
cmp #64 ; always end at 64. cmp #64 ; always end at 64. ; 2
bne do_frame ; is this always needed? bne do_frame ; is this always needed? ; 2/3
next_pattern: next_pattern:
lda #0 ; reset line to 0 lda #0 ; reset line to 0 ; 2
sta current_line sta current_line ; 4
inc current_pattern ; increment pattern inc current_pattern ; increment pattern ; 6
jmp do_frame
do_frame: do_frame:
; AY-3-8910 register summary ; AY-3-8910 register summary
@ -1817,286 +1817,299 @@ do_frame:
; R13 = Envelope Shape, 0xff means don't write ; R13 = Envelope Shape, 0xff means don't write
; R14/R15 = I/O (ignored) ; R14/R15 = I/O (ignored)
lda #0 lda #0 ; 2
sta pt3_mixer_value sta pt3_mixer_value ; 4
sta pt3_envelope_add sta pt3_envelope_add ; 4
ldx #(NOTE_STRUCT_SIZE*0) ; Note A ldx #(NOTE_STRUCT_SIZE*0) ; Note A ; 2
jsr calculate_note jsr calculate_note ; 6+?
ldx #(NOTE_STRUCT_SIZE*1) ; Note B ldx #(NOTE_STRUCT_SIZE*1) ; Note B ; 2
jsr calculate_note jsr calculate_note ; 6+?
ldx #(NOTE_STRUCT_SIZE*2) ; Note C ldx #(NOTE_STRUCT_SIZE*2) ; Note C ; 2
jsr calculate_note jsr calculate_note ; 6+?
; 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 ; 4
sta AY_REGISTERS+0 ; into R0 sta AY_REGISTERS+0 ; into R0 ; 3
lda note_a+NOTE_TONE_H ; Note A Period H lda note_a+NOTE_TONE_H ; Note A Period H ; 4
sta AY_REGISTERS+1 ; into R1 sta AY_REGISTERS+1 ; into R1 ; 3
lda convert_177 ; FIXME: make this self-modifying?
beq no_scale_a
lda convert_177 ; 4
beq no_scale_a ; 2/3
; Convert from 1.77MHz to 1MHz by multiplying by 9/16 ; Convert from 1.77MHz to 1MHz by multiplying by 9/16
; conversion costs 100 cycles!
; first multiply by 8 ; first multiply by 8
asl AY_REGISTERS+0 asl AY_REGISTERS+0 ; 5
rol AY_REGISTERS+1 rol AY_REGISTERS+1 ; 5
asl AY_REGISTERS+0 asl AY_REGISTERS+0 ; 5
rol AY_REGISTERS+1 rol AY_REGISTERS+1 ; 5
asl AY_REGISTERS+0 asl AY_REGISTERS+0 ; 5
rol AY_REGISTERS+1 rol AY_REGISTERS+1 ; 5
; add in original to get 9 ; add in original to get 9
clc clc ; 2
lda note_a+NOTE_TONE_L lda note_a+NOTE_TONE_L ; 4
adc AY_REGISTERS+0 adc AY_REGISTERS+0 ; 3
sta AY_REGISTERS+0 sta AY_REGISTERS+0 ; 3
lda note_a+NOTE_TONE_H lda note_a+NOTE_TONE_H ; 4
adc AY_REGISTERS+1 adc AY_REGISTERS+1 ; 3
sta AY_REGISTERS+1 sta AY_REGISTERS+1 ; 3
; divide by 16 to get proper value ; divide by 16 to get proper value
ror AY_REGISTERS+1 ror AY_REGISTERS+1 ; 5
ror AY_REGISTERS+0 ror AY_REGISTERS+0 ; 5
ror AY_REGISTERS+1 ror AY_REGISTERS+1 ; 5
ror AY_REGISTERS+0 ror AY_REGISTERS+0 ; 5
ror AY_REGISTERS+1 ror AY_REGISTERS+1 ; 5
ror AY_REGISTERS+0 ror AY_REGISTERS+0 ; 5
ror AY_REGISTERS+1 ror AY_REGISTERS+1 ; 5
ror AY_REGISTERS+0 ror AY_REGISTERS+0 ; 5
lda AY_REGISTERS+1 lda AY_REGISTERS+1 ; 3
and #$0f and #$0f ; 2
sta AY_REGISTERS+1 sta AY_REGISTERS+1 ; 3
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 ; 4
sta AY_REGISTERS+2 ; into R2 sta AY_REGISTERS+2 ; into R2 ; 3
lda note_b+NOTE_TONE_H ; Note B Period H lda note_b+NOTE_TONE_H ; Note B Period H ; 4
sta AY_REGISTERS+3 ; into R3 sta AY_REGISTERS+3 ; into R3 ; 3
lda convert_177 lda convert_177 ; 4
beq no_scale_b beq no_scale_b ; 2/3
; 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 AY_REGISTERS+2 asl AY_REGISTERS+2 ; 5
rol AY_REGISTERS+3 rol AY_REGISTERS+3 ; 5
asl AY_REGISTERS+2 asl AY_REGISTERS+2 ; 5
rol AY_REGISTERS+3 rol AY_REGISTERS+3 ; 5
asl AY_REGISTERS+2 asl AY_REGISTERS+2 ; 5
rol AY_REGISTERS+3 rol AY_REGISTERS+3 ; 5
; add in original to get 9 ; add in original to get 9
clc clc ; 2
lda note_b+NOTE_TONE_L lda note_b+NOTE_TONE_L ; 4
adc AY_REGISTERS+2 adc AY_REGISTERS+2 ; 3
sta AY_REGISTERS+2 sta AY_REGISTERS+2 ; 3
lda note_b+NOTE_TONE_H lda note_b+NOTE_TONE_H ; 4
adc AY_REGISTERS+3 adc AY_REGISTERS+3 ; 3
sta AY_REGISTERS+3 sta AY_REGISTERS+3 ; 3
; divide by 16 to get proper value ; divide by 16 to get proper value
ror AY_REGISTERS+3 ror AY_REGISTERS+3 ; 5
ror AY_REGISTERS+2 ror AY_REGISTERS+2 ; 5
ror AY_REGISTERS+3 ror AY_REGISTERS+3 ; 5
ror AY_REGISTERS+2 ror AY_REGISTERS+2 ; 5
ror AY_REGISTERS+3 ror AY_REGISTERS+3 ; 5
ror AY_REGISTERS+2 ror AY_REGISTERS+2 ; 5
ror AY_REGISTERS+3 ror AY_REGISTERS+3 ; 5
ror AY_REGISTERS+2 ror AY_REGISTERS+2 ; 5
lda AY_REGISTERS+3 lda AY_REGISTERS+3 ; 3
and #$0f and #$0f ; 2
sta AY_REGISTERS+3 sta AY_REGISTERS+3 ; 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 ; 4
sta AY_REGISTERS+4 ; into R4 sta AY_REGISTERS+4 ; into R4 ; 3
lda note_c+NOTE_TONE_H ; Note C Period H lda note_c+NOTE_TONE_H ; Note C Period H ; 4
sta AY_REGISTERS+5 ; into R5 sta AY_REGISTERS+5 ; into R5 ; 3
lda convert_177 lda convert_177 ; 4
beq no_scale_c beq no_scale_c ; 2/3
; 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 AY_REGISTERS+4 asl AY_REGISTERS+4 ; 5
rol AY_REGISTERS+5 rol AY_REGISTERS+5 ; 5
asl AY_REGISTERS+4 asl AY_REGISTERS+4 ; 5
rol AY_REGISTERS+5 rol AY_REGISTERS+5 ; 5
asl AY_REGISTERS+4 asl AY_REGISTERS+4 ; 5
rol AY_REGISTERS+5 rol AY_REGISTERS+5 ; 5
; add in original to get 9 ; add in original to get 9
clc clc ; 2
lda note_c+NOTE_TONE_L lda note_c+NOTE_TONE_L ; 4
adc AY_REGISTERS+4 adc AY_REGISTERS+4 ; 3
sta AY_REGISTERS+4 sta AY_REGISTERS+4 ; 3
lda note_c+NOTE_TONE_H lda note_c+NOTE_TONE_H ; 4
adc AY_REGISTERS+5 adc AY_REGISTERS+5 ; 3
sta AY_REGISTERS+5 sta AY_REGISTERS+5 ; 3
; divide by 16 to get proper value ; divide by 16 to get proper value
ror AY_REGISTERS+5 ror AY_REGISTERS+5 ; 5
ror AY_REGISTERS+4 ror AY_REGISTERS+4 ; 5
ror AY_REGISTERS+5 ror AY_REGISTERS+5 ; 5
ror AY_REGISTERS+4 ror AY_REGISTERS+4 ; 5
ror AY_REGISTERS+5 ror AY_REGISTERS+5 ; 5
ror AY_REGISTERS+4 ror AY_REGISTERS+4 ; 5
ror AY_REGISTERS+5 ror AY_REGISTERS+5 ; 5
ror AY_REGISTERS+4 ror AY_REGISTERS+4 ; 5
lda AY_REGISTERS+5 lda AY_REGISTERS+5 ; 3
and #$0f and #$0f ; 2
sta AY_REGISTERS+5 sta AY_REGISTERS+5 ; 3
no_scale_c: no_scale_c:
; Noise ; Noise
; frame[6]= (pt3->noise_period+pt3->noise_add)&0x1f; ; frame[6]= (pt3->noise_period+pt3->noise_add)&0x1f;
clc clc ; 2
lda pt3_noise_period lda pt3_noise_period ; 4
adc pt3_noise_add adc pt3_noise_add ; 4
and #$1f and #$1f ; 2
sta AY_REGISTERS+6 sta AY_REGISTERS+6 ; 3
sta temp_word_l sta temp_word_l ; 4
lda convert_177 lda convert_177 ; 3
beq no_scale_n beq no_scale_n ; 2/3
; 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 AY_REGISTERS+6 asl AY_REGISTERS+6 ; 5
asl AY_REGISTERS+6 asl AY_REGISTERS+6 ; 5
asl AY_REGISTERS+6 asl AY_REGISTERS+6 ; 5
; add in original to get 9 ; add in original to get 9
clc clc ; 2
lda temp_word_l lda temp_word_l ; 4
adc AY_REGISTERS+6 adc AY_REGISTERS+6 ; 3
; divide by 16 to get proper value ; divide by 16 to get proper value
ror AY_REGISTERS+6 ror AY_REGISTERS+6 ; 5
ror AY_REGISTERS+6 ror AY_REGISTERS+6 ; 5
ror AY_REGISTERS+6 ror AY_REGISTERS+6 ; 5
ror AY_REGISTERS+6 ror AY_REGISTERS+6 ; 5
lda AY_REGISTERS+6 lda AY_REGISTERS+6 ; 3
and #$1f and #$1f ; 2
sta AY_REGISTERS+6 sta AY_REGISTERS+6 ; 3
no_scale_n: no_scale_n:
;=======================
; Mixer ; Mixer
lda pt3_mixer_value
sta AY_REGISTERS+7
lda pt3_mixer_value ; 4
sta AY_REGISTERS+7 ; 3
;=======================
; Amplitudes ; Amplitudes
lda note_a+NOTE_AMPLITUDE
sta AY_REGISTERS+8
lda note_b+NOTE_AMPLITUDE
sta AY_REGISTERS+9
lda note_c+NOTE_AMPLITUDE
sta AY_REGISTERS+10
lda note_a+NOTE_AMPLITUDE ; 4
sta AY_REGISTERS+8 ; 3
lda note_b+NOTE_AMPLITUDE ; 4
sta AY_REGISTERS+9 ; 3
lda note_c+NOTE_AMPLITUDE ; 4
sta AY_REGISTERS+10 ; 3
;======================================
; Envelope period ; Envelope period
; result=period+add+slide (16-bits) ; result=period+add+slide (16-bits)
clc clc ; 2
lda pt3_envelope_period_l lda pt3_envelope_period_l ; 4
adc pt3_envelope_add adc pt3_envelope_add ; 4
sta temp_word_l sta temp_word_l ; 4
lda pt3_envelope_period_h lda pt3_envelope_period_h ; 4
adc #0 adc #0 ; 2
sta temp_word_h sta temp_word_h ; 4
clc clc ; 2
lda pt3_envelope_slide_l lda pt3_envelope_slide_l ; 4
adc temp_word_l adc temp_word_l ; 4
sta temp_word_l sta temp_word_l ; 4
sta AY_REGISTERS+11 sta AY_REGISTERS+11 ; 3
lda temp_word_h lda temp_word_h ; 4
adc pt3_envelope_slide_h adc pt3_envelope_slide_h ; 4
sta temp_word_h sta temp_word_h ; 4
sta AY_REGISTERS+12 sta AY_REGISTERS+12 ; 3
lda convert_177 lda convert_177 ; 4
beq no_scale_e beq no_scale_e ; 2/3
; 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 AY_REGISTERS+11 asl AY_REGISTERS+11 ; 5
rol AY_REGISTERS+12 rol AY_REGISTERS+12 ; 5
asl AY_REGISTERS+11 asl AY_REGISTERS+11 ; 5
rol AY_REGISTERS+12 rol AY_REGISTERS+12 ; 5
asl AY_REGISTERS+11 asl AY_REGISTERS+11 ; 5
rol AY_REGISTERS+12 rol AY_REGISTERS+12 ; 5
; add in original to get 9 ; add in original to get 9
clc clc ; 2
lda temp_word_l lda temp_word_l ; 4
adc AY_REGISTERS+11 adc AY_REGISTERS+11 ; 3
sta AY_REGISTERS+11 sta AY_REGISTERS+11 ; 3
lda temp_word_h lda temp_word_h ; 4
adc AY_REGISTERS+12 adc AY_REGISTERS+12 ; 3
sta AY_REGISTERS+12 sta AY_REGISTERS+12 ; 3
; divide by 16 to get proper value ; divide by 16 to get proper value
ror AY_REGISTERS+12 ror AY_REGISTERS+12 ; 5
ror AY_REGISTERS+11 ror AY_REGISTERS+11 ; 5
ror AY_REGISTERS+12 ror AY_REGISTERS+12 ; 5
ror AY_REGISTERS+11 ror AY_REGISTERS+11 ; 5
ror AY_REGISTERS+12 ror AY_REGISTERS+12 ; 5
ror AY_REGISTERS+11 ror AY_REGISTERS+11 ; 5
ror AY_REGISTERS+12 ror AY_REGISTERS+12 ; 5
ror AY_REGISTERS+11 ror AY_REGISTERS+11 ; 5
lda AY_REGISTERS+12 lda AY_REGISTERS+12 ; 3
and #$0f and #$0f ; 2
sta AY_REGISTERS+12 sta AY_REGISTERS+12 ; 3
no_scale_e: no_scale_e:
;========================
; Envelope shape ; Envelope shape
lda pt3_envelope_type
cmp pt3_envelope_type_old lda pt3_envelope_type ; 4
bne envelope_diff cmp pt3_envelope_type_old ; 4
bne envelope_diff ; 2/3
envelope_same: envelope_same:
lda #$ff ; if same, store $ff lda #$ff ; if same, store $ff ; 2
envelope_diff: envelope_diff:
sta AY_REGISTERS+13 sta AY_REGISTERS+13 ; 3
lda pt3_envelope_type lda pt3_envelope_type ; 4
sta pt3_envelope_type_old ; copy old to new sta pt3_envelope_type_old ; copy old to new ; 4
lda pt3_envelope_delay
beq done_do_frame ; assume can't be negative? ;==============================
; end-of-frame envelope update
;==============================
lda pt3_envelope_delay ; 4
beq done_do_frame ; assume can't be negative? ; 2/3
; do this if envelope_delay>0 ; do this if envelope_delay>0
dec pt3_envelope_delay dec pt3_envelope_delay ; 6
bne done_do_frame bne done_do_frame ; 2/3
; only do if we hit 0 ; only do if we hit 0
lda pt3_envelope_delay_orig ; reset envelope delay lda pt3_envelope_delay_orig ; reset envelope delay ; 4
sta pt3_envelope_delay sta pt3_envelope_delay ; 4
clc ; 16-bit add clc ; 16-bit add ; 2
lda pt3_envelope_slide_l lda pt3_envelope_slide_l ; 4
adc pt3_envelope_slide_add_l adc pt3_envelope_slide_add_l ; 4
sta pt3_envelope_slide_l sta pt3_envelope_slide_l ; 4
lda pt3_envelope_slide_h lda pt3_envelope_slide_h ; 4
adc pt3_envelope_slide_add_h adc pt3_envelope_slide_add_h ; 4
sta pt3_envelope_slide_h sta pt3_envelope_slide_h ; 4
done_do_frame: done_do_frame:
rts rts ; 6
;====================================== ;======================================
; GetNoteFreq ; GetNoteFreq
@ -2104,33 +2117,38 @@ done_do_frame:
; Return frequency from lookup table ; Return frequency from lookup table
; Which note is in A ; Which note is in A
; return in freq_l/freq_h ; return in freq_l/freq_h
; FIXME: self modify code
GetNoteFreq: GetNoteFreq:
sty ysave sty ysave ; 4
tay tay ; 2
lda PT3_LOC+PT3_HEADER_FREQUENCY lda PT3_LOC+PT3_HEADER_FREQUENCY ; 4
cmp #1 cmp #1 ; 2
bne freq_table_2 bne freq_table_2 ; 2/3
lda PT3NoteTable_ST_high,Y lda PT3NoteTable_ST_high,Y ; 4+
sta freq_h sta freq_h ; 4
lda PT3NoteTable_ST_low,Y lda PT3NoteTable_ST_low,Y ; 4+
sta freq_l sta freq_l ; 4
ldy ysave ; 4
rts ; 6
;===========
; 40
ldy ysave
rts
freq_table_2: freq_table_2:
lda PT3NoteTable_ASM_34_35_high,Y lda PT3NoteTable_ASM_34_35_high,Y ; 4+
sta freq_h sta freq_h ; 4
lda PT3NoteTable_ASM_34_35_low,Y lda PT3NoteTable_ASM_34_35_low,Y ; 4+
sta freq_l sta freq_l ; 4
ldy ysave
rts
ldy ysave ; 4
rts ; 6
;===========
; 41
; Table #1 of Pro Tracker 3.3x - 3.5x ; Table #1 of Pro Tracker 3.3x - 3.5x