Rename test files to represent better the new opcodes they correspond to.

2025-05-28 03:10:24 -04:00 · 2020-05-16 18:32:56 +03:00 · 2020-05-16 18:32:56 +03:00 · f9388b028a
commit f9388b028a
parent 42ebc52c96
96 changed files with 91 additions and 92 deletions
--- a/src/opcodes/sources.asm
+++ b/src/opcodes/sources.asm
@ -298,11 +298,11 @@ SECT_DATA(suconst)

 SECT_TEXT(suloadvl)

-EXPORT MANGLE_FUNC(su_op_load_val,0)
+EXPORT MANGLE_FUNC(su_op_loadval,0)
 %ifdef INCLUDE_STEREO_LOAD_VAL
-    jnc     su_op_load_val_mono
-    call    su_load_val_mono
-su_load_val_mono:
+    jnc     su_op_loadval_mono
+    call    su_loadval_mono
+su_loadval_mono:
 %endif
    fld     dword [edx+su_load_val_ports.value] ; v
    fsub    dword [c_0_5]                       ; v-.5
--- a/src/opcodes/sources.inc
+++ b/src/opcodes/sources.inc
@ -159,12 +159,12 @@ endstruc
    %if LOAD_VAL_ID == -1
        %assign LOAD_VAL_ID CUR_ID
        %assign CUR_ID CUR_ID + 2
-        %xdefine OPCODES OPCODES MANGLE_FUNC(su_op_load_val,0),
+        %xdefine OPCODES OPCODES MANGLE_FUNC(su_op_loadval,0),
        %xdefine NUMPARAMS NUMPARAMS 1,
    %endif
 %endmacro

-%macro  SU_LOAD_VAL 2
+%macro  SU_LOADVAL 2
    db  %2
    USE_LOAD_VAL
    %xdefine CMDS CMDS LOAD_VAL_ID+%1,
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -40,60 +40,59 @@ function(regression_test testname)
 endfunction(regression_test)

 regression_test(test_envelope "" ENVELOPE)
-regression_test(test_load "" LOAD)
+regression_test(test_loadval "" LOAD)
 regression_test(test_send "" SEND)
-regression_test(test_globalstore)
+regression_test(test_send_global)
 regression_test(test_panning ENVELOPE PANNING)
 regression_test(test_multiple_instruments ENVELOPE)
-regression_test(test_fop_pop LOAD FOP_POP)
-regression_test(test_fop_addp LOAD)
-regression_test(test_fop_mulp LOAD FOP_MULP)
-regression_test(test_fop_push "LOAD;FOP_POP" FOP_PUSH)
-regression_test(test_fop_xch LOAD)
-regression_test(test_fop_add LOAD)
-regression_test(test_fop_mul LOAD)
-regression_test(test_fop_addp2 LOAD)
-regression_test(test_fop_mulp2 LOAD FOP_MULP2)
-regression_test(test_fop_loadnote)
-regression_test(test_vco_sine ENVELOPE VCO_SINE)
-regression_test(test_vco_trisaw ENVELOPE)
-regression_test(test_vco_noise ENVELOPE VCO_NOISE)
-regression_test(test_vco_pulse ENVELOPE VCO_PULSE)
-regression_test(test_vco_gate ENVELOPE)
-regression_test(test_vco_stereo ENVELOPE)
-regression_test(test_vco_lfo "ENVELOPE;VCO_SINE;VCO_PULSE;FOP_MULP2")
-regression_test(test_vco_tm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
-regression_test(test_vco_dm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
-regression_test(test_vco_pm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
-regression_test(test_vco_cm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
-regression_test(test_vco_sm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
-regression_test(test_vco_gm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
+regression_test(test_pop LOAD FOP_POP)
+regression_test(test_addp LOAD)
+regression_test(test_mulp LOAD FOP_MULP)
+regression_test(test_push "LOAD;FOP_POP" FOP_PUSH)
+regression_test(test_xch LOAD)
+regression_test(test_add LOAD)
+regression_test(test_mul LOAD)
+regression_test(test_addp_stereo LOAD)
+regression_test(test_mulp_stereo LOAD FOP_MULP2)
+regression_test(test_loadnote)
+regression_test(test_noise ENVELOPE VCO_NOISE)
+regression_test(test_oscillat_sine ENVELOPE VCO_SINE)
+regression_test(test_oscillat_trisaw ENVELOPE)
+regression_test(test_oscillat_pulse ENVELOPE VCO_PULSE)
+regression_test(test_oscillat_gate ENVELOPE)
+regression_test(test_oscillat_stereo ENVELOPE)
+regression_test(test_oscillat_lfo "ENVELOPE;VCO_SINE;VCO_PULSE;FOP_MULP2")
+regression_test(test_oscillat_transposemod "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
+regression_test(test_oscillat_detunemod "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
+regression_test(test_oscillat_phasemod "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
+regression_test(test_oscillat_colormod "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
+regression_test(test_oscillat_shapemod "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")
+regression_test(test_oscillat_gainmod "VCO_SINE;ENVELOPE;FOP_MULP;FOP_PUSH;SEND")

-regression_test(test_dst ENVELOPE)
-regression_test(test_dst_modulation "VCO_SINE;ENVELOPE;SEND")
-regression_test(test_dst_sh ENVELOPE)
-regression_test(test_dst_sh_modulation "VCO_SINE;ENVELOPE;SEND")
-regression_test(test_dst_stereo ENVELOPE)
+regression_test(test_distort ENVELOPE)
+regression_test(test_distort_mod "VCO_SINE;ENVELOPE;SEND")
+regression_test(test_distort_stereo ENVELOPE)
+regression_test(test_hold ENVELOPE)
+regression_test(test_hold_mod "VCO_SINE;ENVELOPE;SEND")

-regression_test(test_vcf_band "VCO_SINE;ENVELOPE;FOP_MULP")
-regression_test(test_vcf_low "VCO_SINE;ENVELOPE;FOP_MULP")
-regression_test(test_vcf_high "VCO_SINE;ENVELOPE;FOP_MULP")
-regression_test(test_vcf_peak "VCO_SINE;ENVELOPE;FOP_MULP")
-regression_test(test_vcf_stereo "VCO_SINE;ENVELOPE;FOP_MULP")
-regression_test(test_vcf_fm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;SEND")
-regression_test(test_vcf_rm_modulation "VCO_SINE;ENVELOPE;FOP_MULP;SEND")
+regression_test(test_filter_band "VCO_SINE;ENVELOPE;FOP_MULP")
+regression_test(test_filter_low "VCO_SINE;ENVELOPE;FOP_MULP")
+regression_test(test_filter_high "VCO_SINE;ENVELOPE;FOP_MULP")
+regression_test(test_filter_peak "VCO_SINE;ENVELOPE;FOP_MULP")
+regression_test(test_filter_stereo "VCO_SINE;ENVELOPE;FOP_MULP")
+regression_test(test_filter_freqmod "VCO_SINE;ENVELOPE;FOP_MULP;SEND")
+regression_test(test_filter_resmod "VCO_SINE;ENVELOPE;FOP_MULP;SEND")

-regression_test(test_dll "ENVELOPE;FOP_MULP;PANNING;VCO_SINE")
-regression_test(test_dll_stereo "ENVELOPE;FOP_MULP;PANNING;VCO_SINE")
-regression_test(test_dll_notetracking "ENVELOPE;FOP_MULP;PANNING;VCO_NOISE")
-regression_test(test_dll_reverb "ENVELOPE;FOP_MULP;PANNING;VCO_SINE")
+regression_test(test_delay "ENVELOPE;FOP_MULP;PANNING;VCO_SINE")
+regression_test(test_delay_stereo "ENVELOPE;FOP_MULP;PANNING;VCO_SINE")
+regression_test(test_delay_notetracking "ENVELOPE;FOP_MULP;PANNING;VCO_NOISE")
+regression_test(test_delay_reverb "ENVELOPE;FOP_MULP;PANNING;VCO_SINE")
+regression_test(test_delay_feedbackmod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
+regression_test(test_delay_pregainmod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
+regression_test(test_delay_dampmod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
+regression_test(test_delay_drymod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")

-regression_test(test_dll_fm_modulation "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
-regression_test(test_dll_pm_modulation "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
-regression_test(test_dll_dm_modulation "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
-regression_test(test_dll_im_modulation "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND")
-
-regression_test(test_envelope_modulation "VCO_SINE;ENVELOPE;SEND")
+regression_test(test_envelope_mod "VCO_SINE;ENVELOPE;SEND")
 regression_test(test_envelope_16bit ENVELOPE "" test_envelope)
 target_compile_definitions(test_envelope_16bit PUBLIC SU_USE_16BIT_OUTPUT)

--- a/tests/expected_output/test_fop_add.raw
+++ b/tests/expected_output/test_fop_add.raw
--- a/tests/expected_output/test_fop_addp.raw
+++ b/tests/expected_output/test_fop_addp.raw
--- a/tests/expected_output/test_addp_stereo.raw
+++ b/tests/expected_output/test_addp_stereo.raw
--- a/tests/expected_output/test_delay.raw
+++ b/tests/expected_output/test_delay.raw
--- a/tests/expected_output/test_dll_dm_modulation.raw
+++ b/tests/expected_output/test_dll_dm_modulation.raw
--- a/tests/expected_output/test_dll_im_modulation.raw
+++ b/tests/expected_output/test_dll_im_modulation.raw
--- a/tests/expected_output/test_delay_feedbackmod.raw
+++ b/tests/expected_output/test_delay_feedbackmod.raw
--- a/tests/expected_output/test_delay_notetracking.raw
+++ b/tests/expected_output/test_delay_notetracking.raw
--- a/tests/expected_output/test_dll_pm_modulation.raw
+++ b/tests/expected_output/test_dll_pm_modulation.raw
--- a/tests/expected_output/test_delay_reverb.raw
+++ b/tests/expected_output/test_delay_reverb.raw
--- a/tests/expected_output/test_delay_stereo.raw
+++ b/tests/expected_output/test_delay_stereo.raw
--- a/tests/expected_output/test_distort.raw
+++ b/tests/expected_output/test_distort.raw
--- a/tests/expected_output/test_dst_modulation.raw
+++ b/tests/expected_output/test_dst_modulation.raw
--- a/tests/expected_output/test_distort_stereo.raw
+++ b/tests/expected_output/test_distort_stereo.raw
--- a/tests/expected_output/test_envelope_modulation.raw
+++ b/tests/expected_output/test_envelope_modulation.raw
--- a/tests/expected_output/test_filter_band.raw
+++ b/tests/expected_output/test_filter_band.raw
--- a/tests/expected_output/test_vcf_fm_modulation.raw
+++ b/tests/expected_output/test_vcf_fm_modulation.raw
--- a/tests/expected_output/test_filter_high.raw
+++ b/tests/expected_output/test_filter_high.raw
--- a/tests/expected_output/test_filter_low.raw
+++ b/tests/expected_output/test_filter_low.raw
--- a/tests/expected_output/test_filter_peak.raw
+++ b/tests/expected_output/test_filter_peak.raw
--- a/tests/expected_output/test_vcf_rm_modulation.raw
+++ b/tests/expected_output/test_vcf_rm_modulation.raw
--- a/tests/expected_output/test_filter_stereo.raw
+++ b/tests/expected_output/test_filter_stereo.raw
--- a/tests/expected_output/test_dst_sh.raw
+++ b/tests/expected_output/test_dst_sh.raw
--- a/tests/expected_output/test_dst_sh_modulation.raw
+++ b/tests/expected_output/test_dst_sh_modulation.raw
--- a/tests/expected_output/test_fop_loadnote.raw
+++ b/tests/expected_output/test_fop_loadnote.raw
--- a/tests/expected_output/test_loadval.raw
+++ b/tests/expected_output/test_loadval.raw
--- a/tests/expected_output/test_fop_mul.raw
+++ b/tests/expected_output/test_fop_mul.raw
--- a/tests/expected_output/test_fop_mulp.raw
+++ b/tests/expected_output/test_fop_mulp.raw
--- a/tests/expected_output/test_mulp_stereo.raw
+++ b/tests/expected_output/test_mulp_stereo.raw
--- a/tests/expected_output/test_vco_noise.raw
+++ b/tests/expected_output/test_vco_noise.raw
--- a/tests/expected_output/test_oscillat_colormod.raw
+++ b/tests/expected_output/test_oscillat_colormod.raw
--- a/tests/expected_output/test_oscillat_detunemod.raw
+++ b/tests/expected_output/test_oscillat_detunemod.raw
--- a/tests/expected_output/test_vco_gm_modulation.raw
+++ b/tests/expected_output/test_vco_gm_modulation.raw
--- a/tests/expected_output/test_oscillat_gate.raw
+++ b/tests/expected_output/test_oscillat_gate.raw
--- a/tests/expected_output/test_oscillat_lfo.raw
+++ b/tests/expected_output/test_oscillat_lfo.raw
--- a/tests/expected_output/test_oscillat_phasemod.raw
+++ b/tests/expected_output/test_oscillat_phasemod.raw
--- a/tests/expected_output/test_oscillat_pulse.raw
+++ b/tests/expected_output/test_oscillat_pulse.raw
--- a/tests/expected_output/test_oscillat_shapemod.raw
+++ b/tests/expected_output/test_oscillat_shapemod.raw
--- a/tests/expected_output/test_oscillat_sine.raw
+++ b/tests/expected_output/test_oscillat_sine.raw
--- a/tests/expected_output/test_oscillat_stereo.raw
+++ b/tests/expected_output/test_oscillat_stereo.raw
--- a/tests/expected_output/test_oscillat_transposemod.raw
+++ b/tests/expected_output/test_oscillat_transposemod.raw
--- a/tests/expected_output/test_oscillat_trisaw.raw
+++ b/tests/expected_output/test_oscillat_trisaw.raw
--- a/tests/expected_output/test_fop_pop.raw
+++ b/tests/expected_output/test_fop_pop.raw
--- a/tests/expected_output/test_fop_push.raw
+++ b/tests/expected_output/test_fop_push.raw
--- a/tests/expected_output/test_send_global.raw
+++ b/tests/expected_output/test_send_global.raw
--- a/tests/expected_output/test_fop_xch.raw
+++ b/tests/expected_output/test_fop_xch.raw
--- a/tests/test_fop_add.asm
+++ b/tests/test_fop_add.asm
@ -14,8 +14,8 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(32)
-        SU_LOAD_VAL MONO,VALUE(128)
+        SU_LOADVAL MONO,VALUE(32)
+        SU_LOADVAL MONO,VALUE(128)
        SU_ADD      MONO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
--- a/tests/test_fop_addp.asm
+++ b/tests/test_fop_addp.asm
@ -14,11 +14,11 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(48)
-        SU_LOAD_VAL MONO,VALUE(48)
+        SU_LOADVAL MONO,VALUE(48)
+        SU_LOADVAL MONO,VALUE(48)
        SU_ADDP     MONO
-        SU_LOAD_VAL MONO,VALUE(80)
-        SU_LOAD_VAL MONO,VALUE(80)
+        SU_LOADVAL MONO,VALUE(80)
+        SU_LOADVAL MONO,VALUE(80)
        SU_ADDP     MONO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
--- a/tests/test_addp_stereo.asm
+++ b/tests/test_addp_stereo.asm
@ -14,10 +14,10 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(0)
-        SU_LOAD_VAL MONO,VALUE(64)
-        SU_LOAD_VAL MONO,VALUE(96)
-        SU_LOAD_VAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(0)
+        SU_LOADVAL MONO,VALUE(64)
+        SU_LOADVAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(96)
        SU_ADDP     STEREO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
--- a/tests/test_delay.asm
+++ b/tests/test_delay.asm
--- a/tests/test_dll_dm_modulation.asm
+++ b/tests/test_dll_dm_modulation.asm
--- a/tests/test_dll_im_modulation.asm
+++ b/tests/test_dll_im_modulation.asm
--- a/tests/test_delay_feedbackmod.asm
+++ b/tests/test_delay_feedbackmod.asm
--- a/tests/test_delay_notetracking.asm
+++ b/tests/test_delay_notetracking.asm
--- a/tests/test_dll_pm_modulation.asm
+++ b/tests/test_dll_pm_modulation.asm
--- a/tests/test_delay_reverb.asm
+++ b/tests/test_delay_reverb.asm
--- a/tests/test_delay_stereo.asm
+++ b/tests/test_delay_stereo.asm
--- a/tests/test_distort.asm
+++ b/tests/test_distort.asm
--- a/tests/test_dst_modulation.asm
+++ b/tests/test_dst_modulation.asm
--- a/tests/test_distort_stereo.asm
+++ b/tests/test_distort_stereo.asm
--- a/tests/test_envelope_modulation.asm
+++ b/tests/test_envelope_modulation.asm
--- a/tests/test_filter_band.asm
+++ b/tests/test_filter_band.asm
--- a/tests/test_vcf_fm_modulation.asm
+++ b/tests/test_vcf_fm_modulation.asm
--- a/tests/test_filter_high.asm
+++ b/tests/test_filter_high.asm
--- a/tests/test_filter_low.asm
+++ b/tests/test_filter_low.asm
--- a/tests/test_filter_peak.asm
+++ b/tests/test_filter_peak.asm
--- a/tests/test_vcf_rm_modulation.asm
+++ b/tests/test_vcf_rm_modulation.asm
--- a/tests/test_filter_stereo.asm
+++ b/tests/test_filter_stereo.asm
--- a/tests/test_dst_sh.asm
+++ b/tests/test_dst_sh.asm
--- a/tests/test_dst_sh_modulation.asm
+++ b/tests/test_dst_sh_modulation.asm
--- a/tests/test_fop_loadnote.asm
+++ b/tests/test_fop_loadnote.asm
--- a/tests/test_loadval.asm
+++ b/tests/test_loadval.asm
@ -14,8 +14,8 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(40)
-        SU_LOAD_VAL MONO,VALUE(80)
+        SU_LOADVAL MONO,VALUE(40)
+        SU_LOADVAL MONO,VALUE(80)
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
 SU_END_PATCH
--- a/tests/test_fop_mul.asm
+++ b/tests/test_fop_mul.asm
@ -14,8 +14,8 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(32)
-        SU_LOAD_VAL MONO,VALUE(0)
+        SU_LOADVAL MONO,VALUE(32)
+        SU_LOADVAL MONO,VALUE(0)
        SU_MUL      MONO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
--- a/tests/test_fop_mulp.asm
+++ b/tests/test_fop_mulp.asm
@ -15,11 +15,11 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(96)
-        SU_LOAD_VAL MONO,VALUE(0)
+        SU_LOADVAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(0)
        SU_MULP     MONO
-        SU_LOAD_VAL MONO,VALUE(96)
-        SU_LOAD_VAL MONO,VALUE(128)
+        SU_LOADVAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(128)
        SU_MULP     MONO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
--- a/tests/test_mulp_stereo.asm
+++ b/tests/test_mulp_stereo.asm
@ -14,10 +14,10 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(96)
-        SU_LOAD_VAL MONO,VALUE(128)
-        SU_LOAD_VAL MONO,VALUE(0)
-        SU_LOAD_VAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(128)
+        SU_LOADVAL MONO,VALUE(0)
+        SU_LOADVAL MONO,VALUE(96)
        SU_MULP     STEREO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
--- a/tests/test_vco_noise.asm
+++ b/tests/test_vco_noise.asm
--- a/tests/test_oscillat_colormod.asm
+++ b/tests/test_oscillat_colormod.asm
--- a/tests/test_oscillat_detunemod.asm
+++ b/tests/test_oscillat_detunemod.asm
--- a/tests/test_vco_gm_modulation.asm
+++ b/tests/test_vco_gm_modulation.asm
--- a/tests/test_oscillat_gate.asm
+++ b/tests/test_oscillat_gate.asm
--- a/tests/test_oscillat_lfo.asm
+++ b/tests/test_oscillat_lfo.asm
--- a/tests/test_oscillat_phasemod.asm
+++ b/tests/test_oscillat_phasemod.asm
--- a/tests/test_oscillat_pulse.asm
+++ b/tests/test_oscillat_pulse.asm
--- a/tests/test_oscillat_shapemod.asm
+++ b/tests/test_oscillat_shapemod.asm
--- a/tests/test_oscillat_sine.asm
+++ b/tests/test_oscillat_sine.asm
--- a/tests/test_oscillat_stereo.asm
+++ b/tests/test_oscillat_stereo.asm
--- a/tests/test_oscillat_transposemod.asm
+++ b/tests/test_oscillat_transposemod.asm
--- a/tests/test_oscillat_trisaw.asm
+++ b/tests/test_oscillat_trisaw.asm
--- a/tests/test_fop_pop.asm
+++ b/tests/test_fop_pop.asm
@ -14,9 +14,9 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(32)
-        SU_LOAD_VAL MONO,VALUE(96)
-        SU_LOAD_VAL MONO,VALUE(0)
+        SU_LOADVAL MONO,VALUE(32)
+        SU_LOADVAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(0)
        SU_POP      MONO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
--- a/tests/test_fop_push.asm
+++ b/tests/test_fop_push.asm
@ -14,8 +14,8 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(32)
-        SU_LOAD_VAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(32)
+        SU_LOADVAL MONO,VALUE(96)
        SU_PUSH     MONO
        SU_POP      MONO
        SU_OUT      STEREO,GAIN(128)
--- a/tests/test_send.asm
+++ b/tests/test_send.asm
@ -14,13 +14,13 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(32)  ; should receive -0.5
+        SU_LOADVAL MONO,VALUE(32)  ; should receive -0.5
        SU_SEND     MONO,AMOUNT(96),PORT(5,load_val,value) ; should send -0.25  
        SU_SEND     MONO,AMOUNT(96),PORT(6,load_val,value) + SEND_POP ; should send -0.25   
-        SU_LOAD_VAL MONO,VALUE(128) ; should receive 1
+        SU_LOADVAL MONO,VALUE(128) ; should receive 1
        SU_SEND     MONO,AMOUNT(96),PORT(6,load_val,value) + SEND_POP ; should send 0.5
-        SU_LOAD_VAL MONO,VALUE(64) ; should receive -0.5
-        SU_LOAD_VAL MONO,VALUE(64) ; should receive 0.5
+        SU_LOADVAL MONO,VALUE(64) ; should receive -0.5
+        SU_LOADVAL MONO,VALUE(64) ; should receive 0.5
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
 SU_END_PATCH
--- a/tests/test_send_global.asm
+++ b/tests/test_send_global.asm
@ -13,17 +13,17 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(96)
        SU_SEND     MONO,AMOUNT(96),GLOBALPORT(1,3,load_val,value) + SEND_POP
-        SU_LOAD_VAL MONO,VALUE(64)
-        SU_LOAD_VAL MONO,VALUE(64)
+        SU_LOADVAL MONO,VALUE(64)
+        SU_LOADVAL MONO,VALUE(64)
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
    SU_BEGIN_INSTRUMENT VOICES(1)  ; Instrument1
-        SU_LOAD_VAL MONO,VALUE(32)
+        SU_LOADVAL MONO,VALUE(32)
        SU_SEND     MONO,AMOUNT(96),GLOBALPORT(0,2,load_val,value) + SEND_POP
-        SU_LOAD_VAL MONO,VALUE(64)
-        SU_LOAD_VAL MONO,VALUE(64)
+        SU_LOADVAL MONO,VALUE(64)
+        SU_LOADVAL MONO,VALUE(64)
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT
 SU_END_PATCH
--- a/tests/test_fop_xch.asm
+++ b/tests/test_fop_xch.asm
@ -14,8 +14,8 @@ SU_END_TRACKS

 SU_BEGIN_PATCH
    SU_BEGIN_INSTRUMENT VOICES(1) ; Instrument0
-        SU_LOAD_VAL MONO,VALUE(96)
-        SU_LOAD_VAL MONO,VALUE(32)
+        SU_LOADVAL MONO,VALUE(96)
+        SU_LOADVAL MONO,VALUE(32)
        SU_XCH      MONO
        SU_OUT      STEREO,GAIN(128)
    SU_END_INSTRUMENT