np2/win9x/x86/opngeng.x86 - diff

Return to opngeng.x86 CVS log

Up to [RetroPC.NET] / np2 / win9x / x86

Diff for /np2/win9x/x86/opngeng.x86 between versions 1.2 and 1.6

version 1.2, 2003/10/18 09:02:38	version 1.6, 2003/11/28 08:01:33
Line 1	Line 1

	FMDIV_BITS equ 8
	FMDIV_ENT equ (1 << FMDIV_BITS)
	FMVOL_SFTBIT equ 4

	SIN_BITS equ 11
	EVC_BITS equ 10
	ENV_BITS equ 16
	KF_BITS equ 6
	FREQ_BITS equ 20
	ENVTBL_BIT equ 14
	SINTBL_BIT equ 14

	TL_BITS equ (FREQ_BITS+2)
	OPM_OUTSB equ (TL_BITS + 2 - 16)

	SIN_ENT equ (1 << SIN_BITS)
	EVC_ENT equ (1 << EVC_BITS)

	EC_ATTACK equ 0
	EC_DECAY equ (EVC_ENT << ENV_BITS)
	EC_OFF equ ((2 * EVC_ENT) << ENV_BITS)

	EM_ATTACK equ 4
	EM_DECAY1 equ 3
	EM_DECAY2 equ 2
	EM_RELEASE equ 1
	EM_OFF equ 0


struc slot_t	struc slot_t
.detune1 resd 1 ; 00	.detune1 resd 1 ; 00
.totallevel resd 1 ; 04	.totallevel resd 1 ; 04
Line 28	Line 57
.slot resb (slot_t.size * 4)	.slot resb (slot_t.size * 4)
.algorithm resb 1	.algorithm resb 1
.feedback resb 1	.feedback resb 1
resb 2	.playing resb 1
	.outslot resb 1
.op1fb resd 1	.op1fb resd 1
.connect1 resd 1	.connect1 resd 1
.connect3 resd 1	.connect3 resd 1
Line 47	Line 77

struc opngen_t	struc opngen_t
.playchannels resd 1	.playchannels resd 1
	.playing resd 1
.feedback2 resd 1	.feedback2 resd 1
.feedback3 resd 1	.feedback3 resd 1
.feedback4 resd 1	.feedback4 resd 1
Line 64	Line 95
.vr_en resd 1	.vr_en resd 1
.vr_l resd 1	.vr_l resd 1
.vr_r resd 1	.vr_r resd 1
endstruc


FMDIV_BITS equ 8
FMDIV_ENT equ (1 << FMDIV_BITS)
FMVOL_SFTBIT equ 4

SIN_BITS equ 11
EVC_BITS equ 10
ENV_BITS equ 16
KF_BITS equ 6
FREQ_BITS equ 20
ENVTBL_BIT equ 14
SINTBL_BIT equ 14

TL_BITS equ (FREQ_BITS+2)
OPM_OUTSB equ (TL_BITS + 2 - 16)

SIN_ENT equ (1 << SIN_BITS)	.sintable resd SIN_ENT
EVC_ENT equ (1 << EVC_BITS)	.envtable resd EVC_ENT
	.envcurve resd (EVC_ENT*2 + 1)
EC_ATTACK equ 0	endstruc
EC_DECAY equ (EVC_ENT << ENV_BITS)
EC_OFF equ ((2 * EVC_ENT) << ENV_BITS)

EM_ATTACK equ 4
EM_DECAY1 equ 3
EM_DECAY2 equ 2
EM_RELEASE equ 1
EM_OFF equ 0


section .text	section .text
Line 103 section .text	Line 109 section .text
extern _opncfg	extern _opncfg

extern _sinshift	extern _sinshift
extern _sintable
extern _envshift	extern _envshift
extern _envtable
extern _env_curve	ENVCURVE equ (_opncfg + opncfg_t.envcurve)
	SINTABLE equ (_opncfg + opncfg_t.sintable)
	ENVTABLE equ (_opncfg + opncfg_t.envtable)


global @opngen_getpcm@12	global @opngen_getpcm@12
Line 117 section .text	Line 124 section .text
shr eax, (FREQ_BITS - SIN_BITS)	shr eax, (FREQ_BITS - SIN_BITS)
and eax, (SIN_ENT - 1)	and eax, (SIN_ENT - 1)
mov cl, [_sinshift + eax]	mov cl, [_sinshift + eax]
mov eax, [_sintable + eax*4]	mov eax, [SINTABLE + eax*4]
add cl, [_envshift + edx]	add cl, [_envshift + edx]
imul eax, [_envtable + edx*4]	imul eax, [ENVTABLE + edx*4]
sar eax, cl	sar eax, cl
%endmacro	%endmacro

Line 133 section .text	Line 140 section .text
%2: mov [edi + slot_t.env_cnt], eax	%2: mov [edi + slot_t.env_cnt], eax
shr eax, ENV_BITS	shr eax, ENV_BITS
mov edx, [edi + slot_t.totallevel]	mov edx, [edi + slot_t.totallevel]
sub edx, [_env_curve + eax*4]	sub edx, [ENVCURVE + eax*4]
%endmacro	%endmacro

%macro setenv 2	%macro setenv 3
%1: mov dl, [edi + slot_t.env_mode]	%1: mov dl, [edi + slot_t.env_mode]
dec dl	dec dl
je short %%setrr	je short %%setrr
Line 162 section .text	Line 169 section .text
%%setrr: mov byte [edi + slot_t.env_mode], EM_OFF	%%setrr: mov byte [edi + slot_t.env_mode], EM_OFF
%%setd2: mov dword [edi + slot_t.env_end], EC_OFF + 1	%%setd2: mov dword [edi + slot_t.env_end], EC_OFF + 1
and dword [edi + slot_t.env_inc], byte 0	and dword [edi + slot_t.env_inc], byte 0
	and byte [esi + ch_t.playing], ~(%3)
mov eax, EC_OFF	mov eax, EC_OFF
jmp near %2	jmp near %2
%endmacro	%endmacro
Line 171 section .text	Line 179 section .text
@opngen_getpcm@12:	@opngen_getpcm@12:
cmp dword [esp+4], byte 0	cmp dword [esp+4], byte 0
je near og_noupdate	je near og_noupdate
	cmp dword [_opngen + opngen_t.playing], byte 0
	je near og_noupdate

push ebx	push ebx
push esi	push esi
Line 191 og_fmout_st: mov eax, ebx	Line 201 og_fmout_st: mov eax, ebx
sub ebx, eax	sub ebx, eax
imul eax, [_opngen + opngen_t.outdr]	imul eax, [_opngen + opngen_t.outdr]
mov [esp + OPN_SAMPR], eax	mov [esp + OPN_SAMPR], eax
og_fmout_lp: xor eax, eax	og_fmout_lp: mov [_opngen + opngen_t.calcremain], ebx
mov [_opngen + opngen_t.calcremain], ebx	and dword [_opngen + opngen_t.playing], byte 0
mov [_opngen + opngen_t.outdl], eax	and dword [_opngen + opngen_t.outdl], byte 0
mov [_opngen + opngen_t.outdc], eax	and dword [_opngen + opngen_t.outdc], byte 0
mov [_opngen + opngen_t.outdr], eax	and dword [_opngen + opngen_t.outdr], byte 0
mov ch, [_opngen + opngen_t.playchannels]	mov ch, [_opngen + opngen_t.playchannels]
mov edi, _opnch	mov esi, _opnch
og_calcch_lp: xor eax, eax	og_calcch_lp: mov cl, [esi + ch_t.outslot]
mov [_opngen + opngen_t.feedback2], eax	test cl, [esi + ch_t.playing]
mov [_opngen + opngen_t.feedback3], eax	je near og_calcch_nt
mov [_opngen + opngen_t.feedback4], eax	and dword [_opngen + opngen_t.feedback2], byte 0
mov esi, edi	and dword [_opngen + opngen_t.feedback3], byte 0
	and dword [_opngen + opngen_t.feedback4], byte 0
	mov edi, esi
calcenv envcalc1, envret1 ; slot1 calculate	calcenv envcalc1, envret1 ; slot1 calculate
jl near og_calcslot3	jl near og_calcslot3
mov cl, [esi + ch_t.feedback]	mov cl, [esi + ch_t.feedback]
Line 247 og_calcslot4: add edi, byte slot_t.size	Line 259 og_calcslot4: add edi, byte slot_t.size
op_out	op_out
mov ebx, [esi + ch_t.connect4]	mov ebx, [esi + ch_t.connect4]
add [ebx], eax	add [ebx], eax
og_calcsloted: add edi, byte (ch_t.size - (slot_t.size * 3))	og_calcsloted: inc dword [_opngen + opngen_t.playing]
	og_calcch_nt: add esi, ch_t.size
dec ch	dec ch
jne near og_calcch_lp	jne near og_calcch_lp
mov eax, [_opngen + opngen_t.outdc]	mov eax, [_opngen + opngen_t.outdc]
Line 273 og_nextsamp: neg ebx	Line 286 og_nextsamp: neg ebx
imul eax, [_opngen + opngen_t.outdl]	imul eax, [_opngen + opngen_t.outdl]
add eax, [esp + OPN_SAMPL]	add eax, [esp + OPN_SAMPL]
imul dword [_opncfg + opncfg_t.fmvol]	imul dword [_opncfg + opncfg_t.fmvol]
mov [ebp], edx	add [ebp], edx
mov eax, [_opngen + opngen_t.outdr]	mov eax, [_opngen + opngen_t.outdr]
imul ecx	imul ecx
add eax, [esp + OPN_SAMPR]	add eax, [esp + OPN_SAMPR]
imul dword [_opncfg + opncfg_t.fmvol]	imul dword [_opncfg + opncfg_t.fmvol]
mov [ebp+4], edx	add [ebp+4], edx
add ebp, byte 8	add ebp, byte 8
dec dword [esp + OPN_LENG]	dec dword [esp + OPN_LENG]
jne near og_fmout_st	jne near og_fmout_st
Line 289 og_nextsamp: neg ebx	Line 302 og_nextsamp: neg ebx
pop ebx	pop ebx
og_noupdate: ret 4	og_noupdate: ret 4

setenv envcalc1, envret1	setenv envcalc1, envret1, 1
setenv envcalc2, envret2	setenv envcalc2, envret2, 2
setenv envcalc3, envret3	setenv envcalc3, envret3, 4
setenv envcalc4, envret4	setenv envcalc4, envret4, 8


align 16	align 16
Line 433 ogv_nextsamp: neg ebx	Line 446 ogv_nextsamp: neg ebx
pop ebx	pop ebx
ogv_noupdate: ret 4	ogv_noupdate: ret 4

setenv vrenvcalc1, vrenvret1	setenv vrenvcalc1, vrenvret1, 1
setenv vrenvcalc2, vrenvret2	setenv vrenvcalc2, vrenvret2, 2
setenv vrenvcalc3, vrenvret3	setenv vrenvcalc3, vrenvret3, 4
setenv vrenvcalc4, vrenvret4	setenv vrenvcalc4, vrenvret4, 8

ends	ends

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.2
changed lines
	Added in v.1.6