mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-06-04 01:28:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove separate playerstack and clean up the code.

Browse Source
This commit is contained in:
Veikko Sariola 2020-05-25 11:16:49 +03:00
parent 7de7b49e24
commit 8d0ae21fb6
2 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/player.asm
View File

@ -18,27 +18,6 @@
%endmacro %endmacro
%endif %endif
struc su_playerstack ; the structure of stack _as the output sound sees it_
.rowtick RESPTR 1 ; which tick within this row are we at
.row RESPTR 1 ; which total row of the song are we at
.tick RESPTR 1 ; which total tick of the song are we at
.randseed RESPTR 1
%ifdef INCLUDE_MULTIVOICE_TRACKS
.trackbits RESPTR 1
%endif
.cleanup
%if BITS == 32
.regs RESPTR 8
.retaddr RESPTR 1
%elifidn __OUTPUT_FORMAT__,win64
.regs RESPTR 4
%else
.regs RESPTR 2
%endif
.bufferptr RESPTR 1
.size
endstruc
;=============================================================================== ;===============================================================================
; Uninitialized data: The one and only synth object ; Uninitialized data: The one and only synth object
;=============================================================================== ;===============================================================================
@ -49,9 +28,6 @@ su_synth_obj resb su_synth.size
%if DELAY_ID > -1 ; if we use delay, then the synth obj should be immediately followed by the delay workspaces %if DELAY_ID > -1 ; if we use delay, then the synth obj should be immediately followed by the delay workspaces
resb NUM_DELAY_LINES*su_delayline_wrk.size resb NUM_DELAY_LINES*su_delayline_wrk.size
%endif %endif
%ifdef INCLUDE_MULTIVOICE_TRACKS
su_curvoices resd MAX_TRACKS
%endif
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
; Constants ; Constants
@ -75,17 +51,17 @@ SECT_DATA(suconst)
%macro output_sound 0 %macro output_sound 0
%ifndef SU_USE_16BIT_OUTPUT %ifndef SU_USE_16BIT_OUTPUT
%ifndef SU_CLIP_OUTPUT ; The modern way. No need to clip; OS can do it. %ifndef SU_CLIP_OUTPUT ; The modern way. No need to clip; OS can do it.
mov _DI, [_SP+su_playerstack.bufferptr] ; edi containts ptr mov _DI, [_SP+su_stack.bufferptr - su_stack.output_sound] ; edi containts ptr
mov _SI, PTRWORD su_synth_obj + su_synth.left mov _SI, PTRWORD su_synth_obj + su_synth.left
movsd ; copy left channel to output buffer movsd ; copy left channel to output buffer
movsd ; copy right channel to output buffer movsd ; copy right channel to output buffer
mov [_SP+su_playerstack.bufferptr], _DI ; save back the updated ptr mov [_SP+su_stack.bufferptr - su_stack.output_sound], _DI ; save back the updated ptr
lea _DI, [_SI-8] lea _DI, [_SI-8]
xor eax, eax xor eax, eax
stosd ; clear left channel so the VM is ready to write them again stosd ; clear left channel so the VM is ready to write them again
stosd ; clear right channel so the VM is ready to write them again stosd ; clear right channel so the VM is ready to write them again
%else %else
mov _SI, qword [_SP+su_playerstack.bufferptr] ; esi points to the output buffer mov _SI, qword [_SP+su_stack.bufferptr - su_stack.output_sound] ; esi points to the output buffer
xor _CX,_CX xor _CX,_CX
xor eax,eax xor eax,eax
%%loop: ; loop over two channels, left & right %%loop: ; loop over two channels, left & right
@ -96,10 +72,10 @@ SECT_DATA(suconst)
add _SI,4 add _SI,4
cmp ecx,2 cmp ecx,2
jl %%loop jl %%loop
mov dword [_SP+su_playerstack.bufferptr], _SI ; save esi back to stack mov dword [_SP+su_stack.bufferptr - su_stack.output_sound], _SI ; save esi back to stack
%endif %endif
%else ; 16-bit output, always clipped. This is a bit legacy method. %else ; 16-bit output, always clipped. This is a bit legacy method.
mov _SI, [_SP+su_playerstack.bufferptr] ; esi points to the output buffer mov _SI, [_SP+su_stack.bufferptr - su_stack.output_sound] ; esi points to the output buffer
mov _DI, PTRWORD su_synth_obj+su_synth.left mov _DI, PTRWORD su_synth_obj+su_synth.left
mov ecx, 2 mov ecx, 2
%%loop: ; loop over two channels, left & right %%loop: ; loop over two channels, left & right
@ -114,7 +90,7 @@ SECT_DATA(suconst)
stosd stosd
add _SI,2 add _SI,2
loop %%loop loop %%loop
mov [_SP+su_playerstack.bufferptr], _SI ; save esi back to stack mov [_SP+su_stack.bufferptr - su_stack.output_sound], _SI ; save esi back to stack
%endif %endif
%endmacro %endmacro
@ -146,14 +122,19 @@ su_render_sampleloop: ; loop through every sample in the row
push _AX ; Stack: sample row pushad ptr push _AX ; Stack: sample row pushad ptr
%ifdef INCLUDE_POLYPHONY %ifdef INCLUDE_POLYPHONY
push POLYPHONY_BITMASK ; does the next voice reuse the current opcodes? push POLYPHONY_BITMASK ; does the next voice reuse the current opcodes?
%endif %endif
mov WRK, PTRWORD su_synth_obj ; WRK points to the synth object mov _DX, PTRWORD su_synth_obj ; _DX points to the synth object
mov COM, PTRWORD MANGLE_DATA(su_commands) ; COM points to vm code mov COM, PTRWORD MANGLE_DATA(su_commands) ; COM points to vm code
mov VAL, PTRWORD MANGLE_DATA(su_params) ; VAL points to unit params mov VAL, PTRWORD MANGLE_DATA(su_params) ; VAL points to unit params
%if DELAY_ID > -1
lea _CX, [_DX + su_synth.size - su_delayline_wrk.filtstate]
%endif
lea WRK, [_DX + su_synth.voices] ; WRK points to the first voice
xor edi, edi ; voice = 0
call MANGLE_FUNC(su_run_vm,0) ; run through the VM code call MANGLE_FUNC(su_run_vm,0) ; run through the VM code
%ifdef INCLUDE_POLYPHONY %ifdef INCLUDE_POLYPHONY
pop _AX pop _AX
%endif %endif
output_sound ; *ptr++ = left, *ptr++ = right output_sound ; *ptr++ = left, *ptr++ = right
pop _AX ; Stack: row pushad ptr pop _AX ; Stack: row pushad ptr
inc dword [_SP + PTRSIZE] ; increment global time, used by delays inc dword [_SP + PTRSIZE] ; increment global time, used by delays
@ -165,11 +146,11 @@ su_render_sampleloop: ; loop through every sample in the row
cmp eax, TOTAL_ROWS cmp eax, TOTAL_ROWS
jl su_render_rowloop jl su_render_rowloop
%ifdef INCLUDE_MULTIVOICE_TRACKS %ifdef INCLUDE_MULTIVOICE_TRACKS
add _SP, su_playerstack.cleanup - su_playerstack.tick ; rewind the remaining tack add _SP, su_stack.render_epilogue - su_stack.tick ; rewind the remaining tack
%else %else
pop _AX pop _AX
pop _AX pop _AX
%endif %endif
render_epilogue render_epilogue
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
@ -198,7 +179,7 @@ su_update_voices_trackloop:
xor edx, edx ; edx=0 xor edx, edx ; edx=0
mov ecx, ebx ; ecx=first voice of the track to be done mov ecx, ebx ; ecx=first voice of the track to be done
su_calculate_voices_loop: ; do { su_calculate_voices_loop: ; do {
bt dword [_SP + su_playerstack.trackbits + PTRSIZE],ecx ; test voicetrack_bitmask// notice that the incs don't set carry bt dword [_SP + su_stack.voicetrack - su_stack.update_voices + 2*PTRSIZE],ecx ; test voicetrack_bitmask// notice that the incs don't set carry
inc edx ; edx++ // edx=numvoices inc edx ; edx++ // edx=numvoices
inc ecx ; ecx++ // ecx=the first voice of next track inc ecx ; ecx++ // ecx=the first voice of next track
jc su_calculate_voices_loop ; } while bit ecx-1 of bitmask is on jc su_calculate_voices_loop ; } while bit ecx-1 of bitmask is on
@ -234,7 +215,6 @@ su_update_voices_nexttrack:
jl su_update_voices_trackloop jl su_update_voices_trackloop
ret ret
%else ; INCLUDE_MULTIVOICE_TRACKS not defined -> one voice per track ve_SIon %else ; INCLUDE_MULTIVOICE_TRACKS not defined -> one voice per track ve_SIon
su_update_voices: ; Stack: retaddr row su_update_voices: ; Stack: retaddr row

46
src/sointu.asm
View File

@ -100,21 +100,41 @@
struc su_stack ; the structure of stack _as the units see it_ struc su_stack ; the structure of stack _as the units see it_
.retaddr RESPTR 1 .retaddr RESPTR 1
.voiceno RESPTR 1 .voiceno RESPTR 1
.wrk RESPTR 1
.val RESPTR 1 .val RESPTR 1
.wrk RESPTR 1
%if BITS == 32 ; we dump everything with pushad, so this is unused in 32-bit
RESPTR 1
%endif
.com RESPTR 1 .com RESPTR 1
.synth RESPTR 1 .synth RESPTR 1
%if DELAY_ID > -1
.delaywrk RESPTR 1 .delaywrk RESPTR 1
%if BITS == 32 ; we dump everything with pushad, so this is unused in 32-bit
RESPTR 1
%endif %endif
.retaddrvm RESPTR 1 .retaddrvm RESPTR 1
%ifdef INCLUDE_POLYPHONY %ifdef INCLUDE_POLYPHONY
.polyphony RESPTR 1 .polyphony RESPTR 1
%endif %endif
.output_sound
.rowtick RESPTR 1 ; which tick within this row are we at .rowtick RESPTR 1 ; which tick within this row are we at
.update_voices
.row RESPTR 1 ; which total row of the song are we at .row RESPTR 1 ; which total row of the song are we at
.tick RESPTR 1 ; which total tick of the song are we at .tick RESPTR 1 ; which total tick of the song are we at
.randseed RESPTR 1 .randseed RESPTR 1
%ifdef INCLUDE_MULTIVOICE_TRACKS
.voicetrack RESPTR 1
%endif
.render_epilogue
%if BITS == 32
RESPTR 8 ; registers
.retaddr_pl RESPTR 1
%elifidn __OUTPUT_FORMAT__,win64
RESPTR 4 ; registers
%else
RESPTR 2 ; registers
%endif
.bufferptr RESPTR 1
.size
endstruc endstruc
;=============================================================================== ;===============================================================================
@ -150,6 +170,12 @@ EXPORT MANGLE_DATA(LFO_NORMALIZE)
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
; Input: su_synth_obj.left : Set to 0 before calling ; Input: su_synth_obj.left : Set to 0 before calling
; su_synth_obj.right : Set to 0 before calling ; su_synth_obj.right : Set to 0 before calling
; _CX : Pointer to delay workspace (if needed)
; _DX : Pointer to synth object
; COM : Pointer to command stream
; VAL : Pointer to value stream
; WRK : Pointer to the last workspace processed
; _DI : Voice number (0 = starting from first voice)
; Output: su_synth_obj.left : left sample ; Output: su_synth_obj.left : left sample
; su_synth_obj.right : right sample ; su_synth_obj.right : right sample
; Dirty: everything ; Dirty: everything
@ -157,17 +183,7 @@ EXPORT MANGLE_DATA(LFO_NORMALIZE)
SECT_TEXT(surunvm) SECT_TEXT(surunvm)
EXPORT MANGLE_FUNC(su_run_vm,0) EXPORT MANGLE_FUNC(su_run_vm,0)
%if DELAY_ID > -1 push_registers _CX, _DX, COM, WRK, VAL, _DI ; save everything to stack
lea _AX, [WRK + su_synth.size - su_delayline_wrk.filtstate]
push _AX ; reset delaywrk to first delayline
%endif
push WRK ; Stack: synth (delayWRK)
lea WRK, [WRK + su_synth.voices] ; WRK points to the first voice
push COM ; Stack: COM synth
push VAL ; Stack: VAL COM synth
push WRK ; Stack: WRK VAL COM synth
xor ecx, ecx ; voice = 0
push _CX ; Stack: voice WRK VAL COM synth
su_run_vm_loop: ; loop until all voices done su_run_vm_loop: ; loop until all voices done
movzx eax, byte [COM] ; eax = command byte movzx eax, byte [COM] ; eax = command byte
inc COM ; move to next instruction inc COM ; move to next instruction
@ -182,7 +198,7 @@ do {mov al, byte [},su_opcode_numparams,_AX,]
do call [,su_synth_commands,_AX*PTRSIZE,] ; call the function corresponding to the instruction do call [,su_synth_commands,_AX*PTRSIZE,] ; call the function corresponding to the instruction
cmp dword [_SP+su_stack.voiceno-PTRSIZE],MAX_VOICES ; if (voice < MAX_VOICES) cmp dword [_SP+su_stack.voiceno-PTRSIZE],MAX_VOICES ; if (voice < MAX_VOICES)
jl su_run_vm_loop ; goto vm_loop jl su_run_vm_loop ; goto vm_loop
add _SP, su_stack.retaddrvm-PTRSIZE ; Stack cleared pop_registers _CX, _DX, COM, WRK, VAL, _DI ; pop everything from stack
ret ret
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
@ -273,4 +289,4 @@ EXPORT MANGLE_FUNC(su_power,0)
%ifidn __OUTPUT_FORMAT__,win32 %ifidn __OUTPUT_FORMAT__,win32
%include "win32/gmdls_win32.asm" %include "win32/gmdls_win32.asm"
%endif %endif