Fix warnings when built using nasm.

Nasm gives warnings about labels without colons in the end; these were particularly prevalent in struc members: ".size" has be ".size:". Nasm also wasn't happy with extra trailing commas when calling macros.
This commit is contained in:
Veikko Sariola
2020-11-02 22:31:22 +02:00
parent eb37d8123d
commit dc88b885e9
47 changed files with 75 additions and 70 deletions

View File

@ -334,7 +334,7 @@ struc su_delayline_wrk
.dcout resd 1
.filtstate resd 1
.buffer resd MAX_DELAY
.size
.size:
endstruc
;-------------------------------------------------------------------------------

View File

@ -141,16 +141,16 @@ struc su_stack ; the structure of stack _as the units see it_
%ifdef INCLUDE_POLYPHONY
.polyphony RESPTR 1
%endif
.output_sound
.output_sound:
.rowtick RESPTR 1 ; which tick within this row are we at
.update_voices
.update_voices:
.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
.voicetrack RESPTR 1
%endif
.render_epilogue
.render_epilogue:
%if BITS == 32
RESPTR 8 ; registers
.retaddr_pl RESPTR 1
@ -160,7 +160,7 @@ struc su_stack ; the structure of stack _as the units see it_
RESPTR 2 ; registers
%endif
.bufferptr RESPTR 1
.size
.size:
endstruc
;===============================================================================

View File

@ -6,7 +6,7 @@
%macro EXPORT 1
global %1
%1
%1:
%endmacro
%ifidn __OUTPUT_FORMAT__,win32
@ -235,7 +235,7 @@ section .text ; yasm throws section redeclaration warnings if strucs are defined
struc su_unit
.state resd 8
.ports resd 8
.size
.size:
endstruc
;-------------------------------------------------------------------------------
@ -247,7 +247,7 @@ struc su_voice
.inputs resd 8
.reserved resd 6 ; this is done to so the whole voice is 2^n long, see polyphonic player
.workspace resb MAX_UNITS * su_unit.size
.size
.size:
endstruc
;-------------------------------------------------------------------------------
@ -259,7 +259,7 @@ struc su_synthworkspace
.right resd 1
.aux resd 6 ; 3 auxiliary signals
.voices resb ABSOLUTE_MAX_VOICES * su_voice.size
.size
.size:
endstruc
%endif ; SOINTU_INC

View File

@ -260,7 +260,7 @@ su_oscillat_sine:
fstp st1
fsub st0, st0 ; // 0
ret
su_oscillat_sine_do
su_oscillat_sine_do:
fdivp st1, st0 ; // p/c
fldpi ; // pi p
fadd st0 ; // 2*pi p

View File

@ -34,6 +34,8 @@ su_gmdls_path2:
db 'drivers/etc/gm.dls',0
SECT_BSS(susamtbl)
EXPORT MANGLE_DATA(su_sample_table) resb SAMPLE_TABLE_SIZE ; size of gmdls.
EXPORT MANGLE_DATA(su_sample_table)
resb SAMPLE_TABLE_SIZE ; size of gmdls.
%endif

View File

@ -38,6 +38,8 @@ su_gmdls_path2:
db 'drivers/etc/gm.dls',0
SECT_BSS(susamtbl)
EXPORT MANGLE_DATA(su_sample_table) resb SAMPLE_TABLE_SIZE ; size of gmdls.
EXPORT MANGLE_DATA(su_sample_table)
resb SAMPLE_TABLE_SIZE ; size of gmdls.
%endif