a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed useless spaces. Removed addrni.asm from Sconstruct and updated the build instructions for the tools.

Browse Source
This commit is contained in:
jbo_85
2005-07-12 14:19:01 +00:00
parent dba28a70f0
commit 707c6f50c2
35 changed files with 3124 additions and 3125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zsnes/src/cpu/dma.asm
View File

@@ -1164,11 +1164,11 @@ NEWSYM ewj2hack, dd 0
section .text
NEWSYM hdmatype2indirect
cmp dword [ewj2hack],1
cmp dword[ewj2hack],1
jne near .notend
cmp byte [esi+1],40h ; Writing to spc
cmp byte[esi+1],40h ; Writing to spc
jne near .notend
cmp byte [esi+10],0DAh ; first transfer
cmp byte[esi+10],0DAh ; first transfer
jne near .notend
; EWJ2 HACK
; int 3h
@@ -1181,7 +1181,7 @@ NEWSYM hdmatype2indirect
xor ecx,ecx
xor edx,edx
mov ax,word[spcRam+021h] ; load dest offset
mov dword [.dest],spcRam
mov dword[.dest],spcRam
add [.dest],eax
mov dl,byte[esi+10] ; number of bytes to transfer
sub dl,80h
@@ -1193,7 +1193,7 @@ NEWSYM hdmatype2indirect
inc word[esi+5]
call dword near [memtabler8+ebx*4]
mov ebx,[.dest]
mov byte [ebx],al
mov byte[ebx],al
inc ebx
mov [.dest],ebx
xor ebx,ebx
@@ -1203,7 +1203,7 @@ NEWSYM hdmatype2indirect
inc word[esi+5]
call dword near [memtabler8+ebx*4]
mov ebx,[.dest]
mov byte [ebx],al
mov byte[ebx],al
inc ebx
mov [.dest],ebx
dec edx

120
zsnes/src/cpu/dsp.asm
View File

@@ -1094,11 +1094,11 @@ NEWSYM RDSPRegFF ;
push eax
push ebx
push edx
test byte [DSPMem+07h+%1*10h],80h
test byte[DSPMem+07h+%1*10h],80h
jz near %%Direct
test byte [DSPMem+07h+%1*10h],40h
test byte[DSPMem+07h+%1*10h],40h
jnz near %%Increase
test byte [DSPMem+07h+%1*10h],20h
test byte[DSPMem+07h+%1*10h],20h
jz %%LinearDec
xor eax,eax
mov al,[DSPMem+07h+%1*10h]
@@ -1115,11 +1115,11 @@ NEWSYM RDSPRegFF ;
mov byte[GainDecBendDataDat+%1],127
div ebx
neg eax
mov dword [Voice0IncNumber+%1*4],eax
mov dword[Voice0IncNumber+%1*4],eax
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],7
mov byte[Voice0State+%1],7
ret
%%LinearDec
xor eax,eax
@@ -1132,14 +1132,14 @@ NEWSYM RDSPRegFF ;
mov eax,127*65536
div ebx
neg eax
mov dword [Voice0IncNumber+%1*4],eax
mov dword[Voice0IncNumber+%1*4],eax
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],5
mov byte[Voice0State+%1],5
ret
%%Increase
test byte [DSPMem+07h+%1*10h],20h
test byte[DSPMem+07h+%1*10h],20h
jz %%LinearInc
xor eax,eax
mov al,[DSPMem+07h+%1*10h]
@@ -1150,7 +1150,7 @@ NEWSYM RDSPRegFF ;
xor edx,edx
mov eax,127*65536
div ebx
mov dword [Voice0IncNumber+%1*4],eax
mov dword[Voice0IncNumber+%1*4],eax
mov ebx,[Voice0Time+%1*4]
mov eax,ebx
shr eax,2
@@ -1160,7 +1160,7 @@ NEWSYM RDSPRegFF ;
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],6
mov byte[Voice0State+%1],6
ret
%%LinearInc
xor eax,eax
@@ -1172,23 +1172,23 @@ NEWSYM RDSPRegFF ;
xor edx,edx
mov eax,127*65536
div ebx
mov dword [Voice0IncNumber+%1*4],eax
mov dword[Voice0IncNumber+%1*4],eax
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],3
mov byte[Voice0State+%1],3
ret
%%Direct
mov al,[DSPMem+07h+%1*10h]
and al,7Fh
mov dword[Voice0EnvInc+%1*4],0
mov byte [Voice0EnvInc+%1*4+2],al
mov dword [Voice0Time+%1*4],0FFFFFFFFh
mov dword [Voice0IncNumber+%1*4],0
mov byte[Voice0EnvInc+%1*4+2],al
mov dword[Voice0Time+%1*4],0FFFFFFFFh
mov dword[Voice0IncNumber+%1*4],0
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],4
mov byte[Voice0State+%1],4
ret
%endmacro
@@ -1196,11 +1196,11 @@ NEWSYM RDSPRegFF ;
push eax
push ebx
push edx
test byte [DSPMem+07h+%1*10h],80h
test byte[DSPMem+07h+%1*10h],80h
jz near %%Direct
test byte [DSPMem+07h+%1*10h],40h
test byte[DSPMem+07h+%1*10h],40h
jnz near %%Increase
test byte [DSPMem+07h+%1*10h],20h
test byte[DSPMem+07h+%1*10h],20h
jz %%LinearDec
xor eax,eax
mov al,[DSPMem+07h+%1*10h]
@@ -1230,7 +1230,7 @@ NEWSYM RDSPRegFF ;
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],7
mov byte[Voice0State+%1],7
ret
%%LinearDec
xor eax,eax
@@ -1244,14 +1244,14 @@ NEWSYM RDSPRegFF ;
shl eax,16
div ebx
neg eax
mov dword [Voice0IncNumber+%1*4],eax
mov dword[Voice0IncNumber+%1*4],eax
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],5
mov byte[Voice0State+%1],5
ret
%%Increase
test byte [DSPMem+07h+%1*10h],20h
test byte[DSPMem+07h+%1*10h],20h
jz %%LinearInc
xor eax,eax
mov al,[DSPMem+07h+%1*10h]
@@ -1269,7 +1269,7 @@ NEWSYM RDSPRegFF ;
xor al,127
shl eax,16
div ebx
mov dword [Voice0IncNumber+%1*4],eax
mov dword[Voice0IncNumber+%1*4],eax
mov ebx,[Voice0Time+%1*4]
mov eax,ebx
shr eax,2
@@ -1279,7 +1279,7 @@ NEWSYM RDSPRegFF ;
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],6
mov byte[Voice0State+%1],6
ret
%%LinearInc
xor eax,eax
@@ -1298,23 +1298,23 @@ NEWSYM RDSPRegFF ;
xor al,127
shl eax,16
div ebx
mov dword [Voice0IncNumber+%1*4],eax
mov dword[Voice0IncNumber+%1*4],eax
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],3
mov byte[Voice0State+%1],3
ret
%%Direct
mov al,[DSPMem+07h+%1*10h]
and al,7Fh
mov dword[Voice0EnvInc+%1*4],0
mov byte [Voice0EnvInc+%1*4+2],al
mov dword [Voice0Time+%1*4],0FFFFFFFFh
mov dword [Voice0IncNumber+%1*4],0
mov byte[Voice0EnvInc+%1*4+2],al
mov dword[Voice0Time+%1*4],0FFFFFFFFh
mov dword[Voice0IncNumber+%1*4],0
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],4
mov byte[Voice0State+%1],4
ret
%%end
pop edx
@@ -1400,7 +1400,7 @@ NEWSYM RDSPRegFF ;
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],9
mov byte[Voice0State+%1],9
ret
%%decayover
sub edx,ebx
@@ -1439,7 +1439,7 @@ NEWSYM RDSPRegFF ;
pop edx
pop ebx
pop eax
mov byte [Voice0State+%1],7
mov byte[Voice0State+%1],7
ret
%endmacro
@@ -1475,7 +1475,7 @@ NEWSYM RDSPRegFF ;
ret
.gain2
mov [DSPMem+05h+%1*10h],al
cmp byte [Voice0State+%1],210
cmp byte[Voice0State+%1],210
jne %%noendofsamp2
push eax
push ebx
@@ -1523,7 +1523,7 @@ NEWSYM RDSPRegFF ;
mov [DSPMem+07h+%1*10h],al
ret
.gain
cmp byte [Voice0State+%1],210
cmp byte[Voice0State+%1],210
jne %%noendofsamp
push eax
push ebx
@@ -1831,45 +1831,45 @@ NEWSYM WDSPReg3C ; Voice 3
ret
NEWSYM WDSPReg3D ; Voice 3
mov byte [Voice0Noise],0
mov byte [Voice1Noise],0
mov byte [Voice2Noise],0
mov byte [Voice3Noise],0
mov byte [Voice4Noise],0
mov byte [Voice5Noise],0
mov byte [Voice6Noise],0
mov byte [Voice7Noise],0
mov byte[Voice0Noise],0
mov byte[Voice1Noise],0
mov byte[Voice2Noise],0
mov byte[Voice3Noise],0
mov byte[Voice4Noise],0
mov byte[Voice5Noise],0
mov byte[Voice6Noise],0
mov byte[Voice7Noise],0
test al,1
jz .TestVoice1
mov byte [Voice0Noise],1
mov byte[Voice0Noise],1
.TestVoice1
test al,2
jz .TestVoice2
mov byte [Voice1Noise],1
mov byte[Voice1Noise],1
.TestVoice2
test al,4
jz .TestVoice3
mov byte [Voice2Noise],1
mov byte[Voice2Noise],1
.TestVoice3
test al,8
jz .TestVoice4
mov byte [Voice3Noise],1
mov byte[Voice3Noise],1
.TestVoice4
test al,16
jz .TestVoice5
mov byte [Voice4Noise],1
mov byte[Voice4Noise],1
.TestVoice5
test al,32
jz .TestVoice6
mov byte [Voice5Noise],1
mov byte[Voice5Noise],1
.TestVoice6
test al,64
jz .TestVoice7
mov byte [Voice6Noise],1
mov byte[Voice6Noise],1
.TestVoice7
test al,128
jz .TestVoice8
mov byte [Voice7Noise],1
mov byte[Voice7Noise],1
.TestVoice8
mov [DSPMem+03Dh],al
ret
@@ -1940,11 +1940,11 @@ NEWSYM WDSPReg4C ; Key On
xor bl,0FFh
and bl,al
xor byte [DSPMem+05Ch],0FFh
xor byte[DSPMem+05Ch],0FFh
jnz .notzero
and bl,[DSPMem+05Ch]
.notzero
xor byte [DSPMem+05Ch],0FFh
xor byte[DSPMem+05Ch],0FFh
or byte[KeyOnStA],bl
pop ebx
@@ -1955,7 +1955,7 @@ NEWSYM WDSPReg4C ; Key On
mov [DSPMem+04Ch],al
push eax
xor al,0FFh
and byte [DSPMem+07Ch],al
and byte[DSPMem+07Ch],al
pop eax
ret
@@ -2089,9 +2089,9 @@ NEWSYM WDSPReg5B ; Voice 5
shr eax,8
neg eax
mov dword[Voice0IncNumber+%1*4],eax
mov byte [Voice0State+%1],200
mov byte [DSPMem+08h+%1*10h],0
or byte [DSPMem+7Ch],1 << %1
mov byte[Voice0State+%1],200
mov byte[DSPMem+08h+%1*10h],0
or byte[DSPMem+7Ch],1 << %1
pop ebx
pop edx
pop eax
@@ -2205,7 +2205,7 @@ NEWSYM WDSPReg6B ; Voice 6
NEWSYM WDSPReg6C ; Voice 6
mov [DSPMem+06Ch],al
and byte [DSPMem+06Ch],7Fh
and byte[DSPMem+06Ch],7Fh
test al,0C0h
jz .NoRes2
mov byte[Voice0Status],0
@@ -2224,7 +2224,7 @@ NEWSYM WDSPReg6C ; Voice 6
and eax,1Fh
xor edx,edx
mov eax,[NoiseSpeeds+eax*4]
Mul dword [dspPAdj]
Mul dword[dspPAdj]
ShrD EAX, EDX, 17
mov [NoiseInc],eax
pop edx
@@ -2298,7 +2298,7 @@ NEWSYM WDSPReg7B ; Voice 7
ret
NEWSYM WDSPReg7C ; ENDX
mov byte [DSPMem+07Ch],0
mov byte[DSPMem+07Ch],0
ret
NEWSYM WDSPReg7D ; Echo Delay

8
zsnes/src/cpu/dspproc.asm
View File

@@ -2954,8 +2954,8 @@ SECTION .text
mov dword[BRRPlace0+%1*8],10000000h
mov dword[Voice0Prev0+%1*4],0
mov dword[Voice0Prev1+%1*4],0
mov byte [Voice0End+%1],0
mov byte [Voice0Loop+%1],0
mov byte[Voice0End+%1],0
mov byte[Voice0Loop+%1],0
mov dword[PSampleBuf+%1*24*4+16*4],0
mov dword[PSampleBuf+%1*24*4+17*4],0
mov dword[PSampleBuf+%1*24*4+18*4],0
@@ -3064,8 +3064,8 @@ NEWSYM Voice7Start
mov dword[BRRPlace0+%1*8],10000000h
mov dword[Voice0Prev0+%1*4],0
mov dword[Voice0Prev1+%1*4],0
mov byte [Voice0End+%1],0
mov byte [Voice0Loop+%1],0
mov byte[Voice0End+%1],0
mov byte[Voice0Loop+%1],0
mov dword[PSampleBuf+%1*24*4+16*4],0
mov dword[PSampleBuf+%1*24*4+17*4],0
mov dword[PSampleBuf+%1*24*4+18*4],0

40
zsnes/src/cpu/execute.asm
View File

@@ -1765,10 +1765,10 @@ NEWSYM UpdatePORSCMR
or al,bl
mov ebx,[PLOTJmpb+eax*4]
mov eax,[PLOTJmpa+eax*4]
mov dword [FxTable+4Ch*4],eax
mov dword [FxTableb+4Ch*4],eax
mov dword [FxTablec+4Ch*4],eax
mov dword [FxTabled+4Ch*4],ebx
mov dword[FxTable+4Ch*4],eax
mov dword[FxTableb+4Ch*4],eax
mov dword[FxTablec+4Ch*4],eax
mov dword[FxTabled+4Ch*4],ebx
pop eax
pop ebx
ret
@@ -1794,14 +1794,14 @@ NEWSYM UpdateSCBRCOLR
ret
NEWSYM UpdateCLSR
mov dword [NumberOfOpcodes2],350 ; 0FFFFFFFh;350
mov dword[NumberOfOpcodes2],350 ; 0FFFFFFFh;350
test byte[SfxCLSR],01h
jz .nohighsfx
mov dword [NumberOfOpcodes2],700 ;700
mov dword[NumberOfOpcodes2],700 ;700
.nohighsfx
cmp byte[SFXCounter],1
je .noyi
mov dword [NumberOfOpcodes2],0FFFFFFFh
mov dword[NumberOfOpcodes2],0FFFFFFFh
.noyi
ret
@@ -1858,14 +1858,14 @@ NEWSYM StartSFXdebug
test al,08h
jz .noaccess
.noram
mov dword [NumberOfOpcodes],350 ; 0FFFFFFFh;350
mov dword[NumberOfOpcodes],350 ; 0FFFFFFFh;350
test byte[SfxCLSR],01h
jz .nohighsfx
mov dword [NumberOfOpcodes],700 ;700
mov dword[NumberOfOpcodes],700 ;700
.nohighsfx
cmp byte[SFXCounter],1
jne .noyi
mov dword [NumberOfOpcodes],0FFFFFFFFh
mov dword[NumberOfOpcodes],0FFFFFFFFh
.noyi
; call SFXDebugLoop
.noaccess
@@ -1914,10 +1914,10 @@ NEWSYM StartSFXdebugb
or al,bl
mov ebx,[PLOTJmpb+eax*4]
mov eax,[PLOTJmpa+eax*4]
mov dword [FxTable+4Ch*4],eax
mov dword [FxTableb+4Ch*4],eax
mov dword [FxTablec+4Ch*4],eax
mov dword [FxTabled+4Ch*4],ebx
mov dword[FxTable+4Ch*4],eax
mov dword[FxTableb+4Ch*4],eax
mov dword[FxTablec+4Ch*4],eax
mov dword[FxTabled+4Ch*4],ebx
mov ebx,[SfxSCBR]
shl ebx,10
@@ -1947,14 +1947,14 @@ NEWSYM StartSFXdebugb
test al,08h
jz .noaccess
.noram
mov dword [NumberOfOpcodes],400 ;678
mov dword[NumberOfOpcodes],400 ;678
test byte[SfxCLSR],01h
jz .nohighsfx
mov dword [NumberOfOpcodes],800 ;678*2
mov dword[NumberOfOpcodes],800 ;678*2
.nohighsfx
cmp byte[SFXCounter],1
jne .noyi
mov dword [NumberOfOpcodes],0FFFFFFFh
mov dword[NumberOfOpcodes],0FFFFFFFh
.noyi
call MainLoop
.noaccess
@@ -1982,12 +1982,12 @@ NEWSYM StartSFXret
test al,08h
jz .noaccess
.noram
mov dword [NumberOfOpcodes],400 ;678
mov dword[NumberOfOpcodes],400 ;678
test byte[SfxCLSR],01h
jz .nohighsfx
mov dword [NumberOfOpcodes],800 ;678*2
mov dword[NumberOfOpcodes],800 ;678*2
.nohighsfx
mov dword [NumberOfOpcodes],0FFFFFFFFh
mov dword[NumberOfOpcodes],0FFFFFFFFh
call MainLoop
.noaccess
popad

368
zsnes/src/cpu/spc700.asm
View File

File diff suppressed because it is too large Load Diff

2
zsnes/src/cpu/spcaddr.inc
View File

@@ -80,7 +80,7 @@
xor eax,eax
add ebx,[spcRamDP]
inc ebp
mov ax, word [ebx]
mov ax, word[ebx]
mov ebx,eax
add ebx,spcRam
ReadByte

24
zsnes/src/cpu/spcdef.inc
View File

@@ -32,7 +32,7 @@
inc ebp
ret
.branch
movsx ebx,byte [ebp]
movsx ebx,byte[ebp]
inc ebp
add ebp,ebx
ret
@@ -44,10 +44,10 @@
sub ebx,spcRam
mov eax,[spcS]
mov [spcRam+eax],bh
dec byte [spcS]
dec byte[spcS]
mov eax,[spcS]
mov [spcRam+eax],bl
dec byte [spcS]
dec byte[spcS]
mov bx,[spcextraram+%1]
test byte[spcRam+0F1h],80h
jnz %%finished
@@ -94,7 +94,7 @@
add ebp,2
ret
.dp0jump
movsx ebx,byte [ebp+1]
movsx ebx,byte[ebp+1]
add ebp,ebx
add ebp,2
ret
@@ -110,7 +110,7 @@
add ebp,2
ret
.dp0jump
movsx ebx,byte [ebp+1]
movsx ebx,byte[ebp+1]
add ebp,ebx
add ebp,2
ret
@@ -118,7 +118,7 @@
; OR A, instruction
%macro SPC_OR_A 0
or byte [spcA], al
or byte[spcA], al
mov al,[spcA]
mov [spcNZ],al
ret
@@ -126,7 +126,7 @@
; AND A, instruction
%macro SPC_AND_A 0
and byte [spcA], al
and byte[spcA], al
mov al,[spcA]
mov [spcNZ],al
ret
@@ -134,7 +134,7 @@
; EOR A, instruction
%macro SPC_EOR_A 0
xor byte [spcA], al
xor byte[spcA], al
mov al,[spcA]
mov [spcNZ],al
ret
@@ -142,7 +142,7 @@
; CMP A, instruction
%macro SPC_CMP_A 0
cmp byte [spcA], al
cmp byte[spcA], al
cmc
SPCSetFlagnzc
%endmacro
@@ -150,7 +150,7 @@
%macro SPC_ADC_A 0
mov cl,[spcP]
shr cl,1
adc byte [spcA], al
adc byte[spcA], al
SPCSetFlagnvhzc
%endmacro
@@ -158,13 +158,13 @@
mov cl,[spcP]
xor cl,1
shr cl,1
sbb byte [spcA], al
sbb byte[spcA], al
cmc
SPCSetFlagnvhzc
%endmacro
%macro SPC_MOV_A 0
mov byte [spcA], al
mov byte[spcA], al
mov [spcNZ],al
ret
%endmacro