zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 00:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed some more GCC warnings.

Browse source 
- Updated project files for nasm 2.0, which is now named nasm.exe for the
  Windows version, rather than nasmw.exe. Also fixed the annoying new warnings
  it generated.


SVN r593 (trunk)
This commit is contained in:
Randy Heit 2007-12-11 02:38:38 +00:00
parent 7d63937d7d
commit e666cde418
21 changed files with 161 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
FLAC/FLAC.vcproj
View file

@ -450,7 +450,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -461,7 +461,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -471,7 +471,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -482,7 +482,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -496,7 +496,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -507,7 +507,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -517,7 +517,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -528,7 +528,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -542,7 +542,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -553,7 +553,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -563,7 +563,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -574,7 +574,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -588,7 +588,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -599,7 +599,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -609,7 +609,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -620,7 +620,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -638,7 +638,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -649,7 +649,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -659,7 +659,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -670,7 +670,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -d OBJ_FORMAT_win32 -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>

2
FLAC/Makefile.mgw
View file

@ -29,7 +29,7 @@ CXX = g++
CFLAGS = $(LOC) $(DEFINES) -O2 -Wall -Wno-unused-function -fomit-frame-pointer CFLAGS = $(LOC) $(DEFINES) -O2 -Wall -Wno-unused-function -fomit-frame-pointer
CXXFLAGS = $(LOC) $(DEFINES) -O2 -Wall CXXFLAGS = $(LOC) $(DEFINES) -O2 -Wall
NASM = nasmw NASM = nasm
NASMFLAGS = -d OBJ_FORMAT_win32 -f win32 NASMFLAGS = -d OBJ_FORMAT_win32 -f win32
AR = ar AR = ar

2
FLAC/ia32/bitreader_asm.nasm
View file

@ -561,7 +561,7 @@ cident FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap
pop ebp pop ebp
ret ret
end end:
%ifdef OBJ_FORMAT_elf %ifdef OBJ_FORMAT_elf
section .note.GNU-stack noalloc section .note.GNU-stack noalloc

10
FLAC/ia32/cpu_asm.nasm
View file

@ -85,13 +85,13 @@ cident FLAC__cpu_info_asm_ia32
mov ebx, [esp + 12] mov ebx, [esp + 12]
mov [ebx], ecx mov [ebx], ecx
jmp .end jmp .end
.no_cpuid .no_cpuid:
xor eax, eax xor eax, eax
mov ebx, [esp + 8] mov ebx, [esp + 8]
mov [ebx], eax mov [ebx], eax
mov ebx, [esp + 12] mov ebx, [esp + 12]
mov [ebx], eax mov [ebx], eax
.end .end:
pop ebx pop ebx
ret ret
@ -108,13 +108,13 @@ cident FLAC__cpu_info_extended_amd_asm_ia32
cpuid cpuid
mov eax, edx mov eax, edx
jmp .end jmp .end
.no_cpuid .no_cpuid:
xor eax, eax xor eax, eax
.end .end:
pop ebx pop ebx
ret ret
end end:
%ifdef OBJ_FORMAT_elf %ifdef OBJ_FORMAT_elf
section .note.GNU-stack noalloc section .note.GNU-stack noalloc

2
FLAC/ia32/fixed_asm.nasm
View file

@ -305,7 +305,7 @@ cident FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov
pop ebp pop ebp
ret ret
end end:
%ifdef OBJ_FORMAT_elf %ifdef OBJ_FORMAT_elf
section .note.GNU-stack noalloc section .note.GNU-stack noalloc

2
FLAC/ia32/lpc_asm.nasm
View file

@ -1504,7 +1504,7 @@ cident FLAC__lpc_restore_signal_asm_ia32_mmx
pop ebp pop ebp
ret ret
end end:
%ifdef OBJ_FORMAT_elf %ifdef OBJ_FORMAT_elf
section .note.GNU-stack noalloc section .note.GNU-stack noalloc

2
FLAC/ia32/stream_encoder_asm.nasm
View file

@ -152,7 +152,7 @@ cident precompute_partition_info_sums_32bit_asm_ia32_
pop ebp pop ebp
ret ret
end end:
%ifdef OBJ_FORMAT_elf %ifdef OBJ_FORMAT_elf
section .note.GNU-stack noalloc section .note.GNU-stack noalloc

2
Makefile.mingw
View file

@ -90,7 +90,7 @@ $(OBJDIR)/%.o : %.cpp
$(CCDV) $(CXX) $(CXXFLAGS) -o $@ -c $< $(CCDV) $(CXX) $(CXXFLAGS) -o $@ -c $<
$(OBJDIR)/%.o : %.nas $(OBJDIR)/%.o : %.nas
$(CCDV) nasmw -o $@ -f win32 $< $(CCDV) nasm -o $@ -f win32 $<
@tools/fixrtext/fixrtext $@ @tools/fixrtext/fixrtext $@
$(OBJDIR)/%.o : %.rc $(OBJDIR)/%.o : %.rc

6
docs/rh-log.txt
View file

@ -1,3 +1,9 @@
December 10, 2007
- Fixed some more GCC warnings.
- Updated project files for nasm 2.0, which is now named nasm.exe for the
Windows version, rather than nasmw.exe. Also fixed the annoying new warnings
it generated.
December 10, 2007 (Changes by Graf Zahl) December 10, 2007 (Changes by Graf Zahl)
- Fixed: M_VerifyNightmare must use the selected skill level to start the - Fixed: M_VerifyNightmare must use the selected skill level to start the
game, not always 4. game, not always 4.

4
src/d_netinfo.cpp
View file

@ -611,6 +611,10 @@ void D_ReadUserInfoStrings (int i, BYTE **stream, bool update)
infotype = j; infotype = j;
} }
} }
else
{ // Shush, GCC.
value = NULL;
}
switch (infotype) switch (infotype)
{ {

4
src/g_level.cpp
View file

@ -3166,7 +3166,7 @@ static void ParseSkill ()
break; break;
} }
} }
for(int i = 0; i < AllSkills.Size(); i++) for(unsigned int i = 0; i < AllSkills.Size(); i++)
{ {
if (AllSkills[i].Name == skill.Name) if (AllSkills[i].Name == skill.Name)
{ {
@ -3222,7 +3222,7 @@ int G_SkillProperty(ESkillProperty prop)
void G_VerifySkill() void G_VerifySkill()
{ {
if (gameskill >= AllSkills.Size()) if (gameskill >= (int)AllSkills.Size())
gameskill = AllSkills.Size()-1; gameskill = AllSkills.Size()-1;
else if (gameskill < 0) else if (gameskill < 0)
gameskill = 0; gameskill = 0;

7
src/g_level.h
View file

@ -141,7 +141,7 @@ struct level_info_s
char *level_name; char *level_name;
char fadetable[9]; char fadetable[9];
SBYTE WallVertLight, WallHorizLight; SBYTE WallVertLight, WallHorizLight;
char *f1; const char *f1;
// TheDefaultLevelInfo initializes everything above this line. // TheDefaultLevelInfo initializes everything above this line.
int musicorder; int musicorder;
FCompressedMemFile *snapshot; FCompressedMemFile *snapshot;
@ -240,7 +240,7 @@ struct level_locals_s
SBYTE WallVertLight; // Light diffs for vert/horiz walls SBYTE WallVertLight; // Light diffs for vert/horiz walls
SBYTE WallHorizLight; SBYTE WallHorizLight;
char *f1; const char *f1;
}; };
typedef struct level_locals_s level_locals_t; typedef struct level_locals_s level_locals_t;
@ -370,8 +370,7 @@ enum ESkillProperty
SKILLP_AutoUseHealth, SKILLP_AutoUseHealth,
SKILLP_SpawnFilter, SKILLP_SpawnFilter,
SKILLP_EasyBossBrain, SKILLP_EasyBossBrain,
SKILLP_ACSReturn, SKILLP_ACSReturn
SKILLP_Confirm,
}; };
int G_SkillProperty(ESkillProperty prop); int G_SkillProperty(ESkillProperty prop);

2
src/m_menu.cpp
View file

@ -426,7 +426,7 @@ void M_StartupSkillMenu(const char *playerclass)
} }
} }
SkillDef.numitems = HexenSkillMenu.numitems = 0; SkillDef.numitems = HexenSkillMenu.numitems = 0;
for(int i=0;i<AllSkills.Size() && i<8;i++) for(unsigned int i=0;i<AllSkills.Size() && i<8;i++)
{ {
FSkillInfo &skill = AllSkills[i]; FSkillInfo &skill = AllSkills[i];

2
src/misc.nas
View file

@ -114,7 +114,7 @@ CheckMMX:
cmp ecx,0x444d4163 ; 'DMAc' cmp ecx,0x444d4163 ; 'DMAc'
jne .notamd jne .notamd
inc byte [edi+87] inc byte [edi+87]
.notamd .notamd:
; Get features flags and other info ; Get features flags and other info
mov eax,1 mov eax,1

10
src/s_advsound.cpp
View file

@ -1167,14 +1167,12 @@ static void S_AddSNDINFO (int lump)
case SI_MidiDevice: { case SI_MidiDevice: {
SC_MustGetString(); SC_MustGetString();
FName nm = sc_String; FName nm = sc_String;
int tim;
SC_MustGetString(); SC_MustGetString();
if (SC_Compare("timidity")) tim = 1; if (SC_Compare("timidity")) MidiDevices[nm] = 1;
else if (SC_Compare("standard")) tim = 0; else if (SC_Compare("standard")) MidiDevices[nm] = 0;
else if (SC_Compare("opl")) tim = 2; else if (SC_Compare("opl")) MidiDevices[nm] = 2;
else if (SC_Compare("default")) tim = -1; else if (SC_Compare("default")) MidiDevices[nm] = -1;
else SC_ScriptError("Unknown MIDI device %s\n", sc_String); else SC_ScriptError("Unknown MIDI device %s\n", sc_String);
MidiDevices[nm]=tim;
} }
break; break;

6
src/tmap.nas
View file

@ -811,7 +811,7 @@ _R_DrawFuzzColumnP_ASM:
; third loop: Do whatever is left ; third loop: Do whatever is left
.chunked .chunked:
test esi,esi test esi,esi
jle .savefuzzpos jle .savefuzzpos
mov edx,[fuzzoffset+ecx*4] mov edx,[fuzzoffset+ecx*4]
@ -1347,7 +1347,7 @@ _rt_map4cols_asm1:
.even and ebx,ebx .even and ebx,ebx
jz .done jz .done
.loop .loop:
mov dl,[ebp] mov dl,[ebp]
mov cl,[ebp+1] mov cl,[ebp+1]
add ebp,8 add ebp,8
@ -1441,7 +1441,7 @@ _rt_map4cols_asm2:
.even and ebx,ebx .even and ebx,ebx
jz .done jz .done
.loop .loop:
mov dl,[ebp+3] mov dl,[ebp+3]
mov ch,[esi+edx] mov ch,[esi+edx]
mov dl,[ebp+2] mov dl,[ebp+2]

4
src/tmap2.nas
View file

@ -382,7 +382,7 @@ StartDiv:
fld st3 ; 1/z | u | v | v/z | 1/z | u/z fld st3 ; 1/z | u | v | v/z | 1/z | u/z
fdivr dword [fp_1] ; z | u | v | v/z | 1/z | u/z fdivr dword [fp_1] ; z | u | v | v/z | 1/z | u/z
DrawFullSpan DrawFullSpan:
mov ecx,[start_v] mov ecx,[start_v]
mov edx,[start_u] mov edx,[start_u]
@ -589,7 +589,7 @@ CalcPartialSteps:
mov esi,edx mov esi,edx
mov ebp,ecx mov ebp,ecx
endloop endloop:
x10 shr ebp,26 x10 shr ebp,26
m10 and esi,0xfc000000 m10 and esi,0xfc000000

3
src/win32/eaxedit.cpp
View file

@ -762,10 +762,11 @@ INT_PTR CALLBACK NewEAXProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
hDlg, NULL, g_hInst, NULL); hDlg, NULL, g_hInst, NULL);
if (ToolTip) if (ToolTip)
{ {
char zero = '\0';
ti.cbSize = sizeof(ti); ti.cbSize = sizeof(ti);
ti.uFlags = TTF_TRACK | TTF_TRANSPARENT; ti.uFlags = TTF_TRACK | TTF_TRANSPARENT;
ti.hinst = g_hInst; ti.hinst = g_hInst;
ti.lpszText = ""; ti.lpszText = &zero;
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
{ {
ti.uId = i; ti.uId = i;

2
src/win32/wrappers.nas
View file

@ -34,6 +34,6 @@ IsDebuggerPresent_Check:
test eax,eax test eax,eax
jne near .itis jne near .itis
mov eax,IsDebuggerPresent_No mov eax,IsDebuggerPresent_No
.itis .itis:
mov [__imp__IsDebuggerPresent@0],eax mov [__imp__IsDebuggerPresent@0],eax
jmp eax jmp eax

44
zdoom.vcproj
View file

@ -4770,7 +4770,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4780,7 +4780,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4790,7 +4790,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)/$(InputName).obj" Outputs="$(IntDir)/$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4800,7 +4800,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)/$(InputName).obj" Outputs="$(IntDir)/$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4814,7 +4814,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4824,7 +4824,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4834,7 +4834,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)/$(InputName).obj" Outputs="$(IntDir)/$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4844,7 +4844,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)/$(InputName).obj" Outputs="$(IntDir)/$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4858,7 +4858,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4868,7 +4868,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4878,7 +4878,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4888,7 +4888,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4902,7 +4902,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4912,7 +4912,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4922,7 +4922,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4932,7 +4932,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4946,7 +4946,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4956,7 +4956,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;" CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4966,7 +4966,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -4976,7 +4976,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;" CommandLine="nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -5374,7 +5374,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>
@ -5384,7 +5384,7 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Assembling $(InputPath)..." Description="Assembling $(InputPath)..."
CommandLine="nasmw -g -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;" CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -d OBJ_FORMAT_win32 -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;"
Outputs="$(IntDir)\$(InputName).obj" Outputs="$(IntDir)\$(InputName).obj"
/> />
</FileConfiguration> </FileConfiguration>