diff options
| author | hrydgard <hrydgard@gmail.com> | 2008-08-24 15:46:08 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2008-08-24 15:46:08 +0000 |
| commit | f44a06465ab2d05c6db793e02aa0aba787bafdda (patch) | |
| tree | 79c1965524996469cff5443c0e266af249e684b2 /Source | |
| parent | e3d7c44a8e42a1c44e1d75bd159fdba825af210e (diff) | |
Change some project settings. Reorganize the symbol database code, step 1/2.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@292 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
34 files changed, 1673 insertions, 1523 deletions
diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index 2bcd449d26..8838b2263f 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Common"
ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
RootNamespace="Common"
@@ -54,7 +54,7 @@ PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="4"
ForcedIncludeFiles="stdafx.h"
/>
@@ -89,7 +89,7 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -111,24 +111,24 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="2"
+ Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
- RuntimeLibrary="0"
- BufferSecurityCheck="true"
- EnableEnhancedInstructionSet="2"
- FloatingPointModel="2"
- RuntimeTypeInfo="false"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
+ StringPooling="true"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -163,7 +163,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -188,16 +188,21 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- FavorSizeOrSpeed="1"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="2"
AdditionalIncludeDirectories="../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="0"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -232,7 +237,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -258,18 +263,21 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="0"
BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -284,7 +292,7 @@ />
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="wsock32.lib"
+ AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)/Common.lib"
/>
<Tool
@@ -304,7 +312,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -326,24 +334,21 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
+ Optimization="3"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
- StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -358,7 +363,7 @@ />
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="wsock32.lib winmm.lib"
+ AdditionalDependencies="wsock32.lib"
OutputFile="$(OutDir)/Common.lib"
/>
<Tool
@@ -409,10 +414,12 @@ AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
RuntimeLibrary="0"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -594,7 +601,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -602,7 +609,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -610,7 +617,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -618,7 +625,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index 3227998659..dd95f17409 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Core"
ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}"
RootNamespace="Core"
@@ -54,7 +54,7 @@ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="4"
ForcedIncludeFiles="stdafx.h"
/>
@@ -88,13 +88,12 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
- WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -110,25 +109,22 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- EnableFiberSafeOptimizations="false"
+ Optimization="0"
AdditionalIncludeDirectories="..\Common\Src;..\DiscIO\Src;..\..\PluginSpecs;..\Debugger\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LOGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="true"
FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -162,7 +158,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -193,14 +189,16 @@ OmitFramePointers="true"
EnableFiberSafeOptimizations="false"
AdditionalIncludeDirectories="..\Common\Src;..\DiscIO\Src;..\..\PluginSpecs;..\Debugger\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="NDEBUG;_LIB;LOGGING;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -234,12 +232,13 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -259,18 +258,24 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ EnableFiberSafeOptimizations="false"
+ WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\DiscIO\Src;..\..\PluginSpecs;..\Debugger\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LOGGING;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BufferSecurityCheck="true"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="0"
FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- DebugInformationFormat="3"
+ WarnAsError="false"
+ DebugInformationFormat="0"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
@@ -303,7 +308,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -325,7 +330,6 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -334,18 +338,17 @@ FavorSizeOrSpeed="1"
OmitFramePointers="true"
EnableFiberSafeOptimizations="false"
- WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\Common\Src;..\DiscIO\Src;..\..\PluginSpecs;..\Debugger\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- StringPooling="true"
+ PreprocessorDefinitions="NDEBUG;_LIB;LOGGING;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="0"
BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="0"
+ EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- DebugInformationFormat="0"
+ WarnAsError="false"
+ DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
@@ -417,6 +420,7 @@ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -793,6 +797,14 @@ Name="PowerPC"
>
<File
+ RelativePath=".\Src\PowerPC\FunctionDB.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\Src\PowerPC\FunctionDB.h"
+ >
+ </File>
+ <File
RelativePath=".\Src\PowerPC\Gekko.h"
>
</File>
@@ -824,6 +836,14 @@ RelativePath=".\Src\PowerPC\PPCTables.h"
>
</File>
+ <File
+ RelativePath=".\Src\PowerPC\SignatureDB.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\Src\PowerPC\SignatureDB.h"
+ >
+ </File>
<Filter
Name="Interpreter"
>
@@ -1221,7 +1241,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1229,7 +1249,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1237,7 +1257,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1245,7 +1265,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index c1d7b354eb..42424156da 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -39,8 +39,8 @@ #include "../Host.h"
#include "../VolumeHandler.h"
#include "../PatchEngine.h"
-
-#include "../Host.h"
+#include "../PowerPC/SignatureDB.h"
+#include "../PowerPC/FunctionDB.h"
#include "../MemTools.h"
#include "MappedFile.h"
@@ -376,7 +376,6 @@ bool CBoot::EmulatedBIOS_Wii(bool _bDebug) void CBoot::UpdateDebugger_MapLoaded(const char *_gameID)
{
HLE::PatchFunctions();
- Debugger::AnalyzeBackwards();
Host_NotifyMapLoaded();
Host_UpdateMemoryView();
}
@@ -412,6 +411,7 @@ bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_game }
else
{
+ Debugger::PushMapToFunctionDB(&g_funcDB);
success = true;
}
@@ -502,19 +502,6 @@ bool CBoot::BootUp(const SCoreStartupParameter& _StartupPara) {
HLE::PatchFunctions();
}
- else
- {
-#if defined(_DEBUG) || defined(DEBUGFAST)
- //PPCAnalyst::FindFunctions(0x81300000,0x81400000);
-#if 0
- PPCAnalyst::FindFunctions(0x80003100,0x80200000);
- PPCAnalyst::LoadFuncDB("data/totaldb.dsy");
- PPCAnalyst::UseFuncDB();
-#endif
-#endif
- Debugger::GetFromAnalyzer();
- UpdateDebugger_MapLoaded();
- }
}
break;
@@ -525,14 +512,7 @@ bool CBoot::BootUp(const SCoreStartupParameter& _StartupPara) CDolLoader dolLoader(_StartupPara.m_strFilename.c_str());
PC = dolLoader.GetEntryPoint();
#ifdef _DEBUG
- if (!LoadMapFromFilename(_StartupPara.m_strFilename))
- {
- PPCAnalyst::FindFunctions(0x80003100,0x80400000);
- PPCAnalyst::LoadFuncDB("data/totaldb.dsy");
- PPCAnalyst::UseFuncDB();
- Debugger::GetFromAnalyzer();
- UpdateDebugger_MapLoaded();
- }
+ LoadMapFromFilename(_StartupPara.m_strFilename);
#endif
}
break;
@@ -592,14 +572,7 @@ bool CBoot::BootUp(const SCoreStartupParameter& _StartupPara) DVDInterface::SetDiscInside(false);
if (Load_BIOS(_StartupPara.m_strBios))
{
- if (!LoadMapFromFilename(_StartupPara.m_strFilename))
- {
- PPCAnalyst::FindFunctions(0x81300000,0x81400000);
- PPCAnalyst::LoadFuncDB("data/totaldb.dsy");
- PPCAnalyst::UseFuncDB();
- Debugger::GetFromAnalyzer();
- UpdateDebugger_MapLoaded();
- }
+ LoadMapFromFilename(_StartupPara.m_strFilename);
}
else
{
diff --git a/Source/Core/Core/Src/Boot/ElfReader.cpp b/Source/Core/Core/Src/Boot/ElfReader.cpp index 1fa0fc8d19..28241a9993 100644 --- a/Source/Core/Core/Src/Boot/ElfReader.cpp +++ b/Source/Core/Core/Src/Boot/ElfReader.cpp @@ -244,8 +244,7 @@ bool ElfReader::LoadSymbols() continue;
}
//host->AddSymbol(name, value, size, symtype);
- Debugger::AddSymbol(
- Debugger::CSymbol(value, size, symtype, name));
+ Debugger::AddSymbol(Debugger::Symbol(value, size, symtype, name));
hasSymbols = true;
//...
diff --git a/Source/Core/Core/Src/Console.cpp b/Source/Core/Core/Src/Console.cpp index 61b23255e7..4b14f63830 100644 --- a/Source/Core/Core/Src/Console.cpp +++ b/Source/Core/Core/Src/Console.cpp @@ -27,6 +27,7 @@ #include "CoreTiming.h"
#include "Core.h"
#include "PowerPC/Jit64/JitCache.h"
+#include "PowerPC/FunctionDB.h"
#include "PowerPCDisasm.h"
#define CASE(x) else if (memcmp(cmd, x, 4*sizeof(TCHAR))==0)
@@ -66,11 +67,6 @@ void Console_Submit(const char *cmd) Core::StartTrace(true);
LOG(CONSOLE, "write tracing started.");
}
- CASE("scan")
- {
- //LOG(CONSOLE,"test1");
- PPCAnalyst::FindFunctions(0x80003100, 0x80400000);
- }
CASE("trans")
{
TCHAR temp[256];
@@ -97,7 +93,7 @@ void Console_Submit(const char *cmd) sscanf(cmd, "%s %08x", temp, &addr);
if (addr!=0)
{
- PPCAnalyst::PrintCalls(addr);
+ g_funcDB.PrintCalls(addr);
}
else
{
@@ -111,7 +107,7 @@ void Console_Submit(const char *cmd) sscanf(cmd, "%s %08x", temp, &addr);
if (addr!=0)
{
- PPCAnalyst::PrintCallers(addr);
+ g_funcDB.PrintCallers(addr);
}
else
{
@@ -163,7 +159,7 @@ void Console_Submit(const char *cmd) }
CASE("lisd")
{
- PPCAnalyst::ListDB();
+ // PPCAnalyst::ListDB();
}
CASE("ipro")
{
@@ -171,7 +167,7 @@ void Console_Submit(const char *cmd) }
CASE("lisf")
{
- PPCAnalyst::ListFunctions();
+ g_funcDB.List();
}
else {
printf("blach\n");
diff --git a/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp b/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp index b40b1a77df..7160b27a7b 100644 --- a/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp +++ b/Source/Core/Core/Src/Debugger/Debugger_BreakPoints.cpp @@ -157,7 +157,7 @@ void CBreakPoints::AddAutoBreakpoints() XSymbolIndex idx = FindSymbol(bps[i]);
if (idx != 0)
{
- const CSymbol &symbol = GetSymbol(idx);
+ const Symbol &symbol = GetSymbol(idx);
AddBreakPoint(symbol.vaddress, false);
}
}
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp index 1b3ad8cc92..e1f5edd0ba 100644 --- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp @@ -22,14 +22,15 @@ #include "../HW/Memmap.h"
#include "../PowerPC/PowerPC.h"
#include "../PowerPC/PPCAnalyst.h"
+#include "../PowerPC/FunctionDB.h"
#include "../../../../Externals/Bochs_disasm/PowerPCDisasm.h"
namespace Debugger
{
-static XVectorSymbol m_VectorSymbols;
+static XVectorSymbol g_Symbols;
-CSymbol::CSymbol(u32 _Address, u32 _Size, ESymbolType _Type, const char *_rName) :
+Symbol::Symbol(u32 _Address, u32 _Size, ESymbolType _Type, const char *_rName) :
vaddress(_Address),
size(_Size),
runCount(0),
@@ -44,57 +45,57 @@ CSymbol::CSymbol(u32 _Address, u32 _Size, ESymbolType _Type, const char *_rName) }
}
-CSymbol::~CSymbol()
+Symbol::~Symbol()
{
m_vecBackwardLinks.clear();
}
void Reset()
{
- m_VectorSymbols.clear();
+ g_Symbols.clear();
// 0 is an invalid entry
- CSymbol Invalid(static_cast<u32>(-1), 0, ST_FUNCTION, "Invalid");
- m_VectorSymbols.push_back(Invalid);
+ Symbol Invalid(static_cast<u32>(-1), 0, ST_FUNCTION, "Invalid");
+ g_Symbols.push_back(Invalid);
}
-XSymbolIndex AddSymbol(const CSymbol& _rSymbolMapEntry)
+XSymbolIndex AddSymbol(const Symbol& symbol)
{
- XSymbolIndex old = 0;
- if ((old = FindSymbol(_rSymbolMapEntry.GetName().c_str())) != 0)
+ XSymbolIndex old = FindSymbol(symbol.GetName().c_str());
+ if (old != 0)
return old;
- m_VectorSymbols.push_back(_rSymbolMapEntry);
- return (XSymbolIndex)(m_VectorSymbols.size()-1);
+ g_Symbols.push_back(symbol);
+ return (XSymbolIndex)(g_Symbols.size() - 1);
}
-const CSymbol& GetSymbol(XSymbolIndex _Index)
+const Symbol& GetSymbol(XSymbolIndex _Index)
{
- if (_Index < (XSymbolIndex)m_VectorSymbols.size())
- return m_VectorSymbols[_Index];
+ if (_Index < (XSymbolIndex)g_Symbols.size())
+ return g_Symbols[_Index];
PanicAlert("GetSymbol is called with an invalid index %i", _Index);
- return m_VectorSymbols[0];
+ return g_Symbols[0];
}
const XVectorSymbol& AccessSymbols()
{
- return m_VectorSymbols;
+ return g_Symbols;
}
-CSymbol& AccessSymbol(XSymbolIndex _Index)
+Symbol& AccessSymbol(XSymbolIndex _Index)
{
- if (_Index < (XSymbolIndex)m_VectorSymbols.size())
- return m_VectorSymbols[_Index];
+ if (_Index < (XSymbolIndex)g_Symbols.size())
+ return g_Symbols[_Index];
PanicAlert("AccessSymbol is called with an invalid index %i", _Index);
- return m_VectorSymbols[0];
+ return g_Symbols[0];
}
XSymbolIndex FindSymbol(u32 _Address)
{
- for (int i = 0; i < (int)m_VectorSymbols.size(); i++)
+ for (int i = 0; i < (int)g_Symbols.size(); i++)
{
- const CSymbol& rSymbol = m_VectorSymbols[i];
+ const Symbol& rSymbol = g_Symbols[i];
if ((_Address >= rSymbol.vaddress) && (_Address < rSymbol.vaddress + rSymbol.size))
{
return (XSymbolIndex)i;
@@ -107,9 +108,9 @@ XSymbolIndex FindSymbol(u32 _Address) XSymbolIndex FindSymbol(const char *name)
{
- for (int i = 0; i < (int)m_VectorSymbols.size(); i++)
+ for (int i = 0; i < (int)g_Symbols.size(); i++)
{
- const CSymbol& rSymbol = m_VectorSymbols[i];
+ const Symbol& rSymbol = g_Symbols[i];
#ifdef _WIN32
if (!_stricmp(rSymbol.GetName().c_str(), name))
#else
@@ -124,29 +125,21 @@ XSymbolIndex FindSymbol(const char *name) return 0;
}
-// __________________________________________________________________________________________________
-// LoadSymbolMap
-//
+// This one can load both leftover map files on game discs (like Zelda), and mapfiles
+// produced by SaveSymbolMap below.
bool LoadSymbolMap(const char *_szFilename)
{
Reset();
-
FILE *f = fopen(_szFilename, "r");
if (!f)
return false;
- //char temp[256];
- //fgets(temp,255,f); //.text section layout
- //fgets(temp,255,f); // Starting Virtual
- //fgets(temp,255,f); // address Size address
- //fgets(temp,255,f); // -----------------------
-
- bool started=false;
+ bool started = false;
while (!feof(f))
{
char line[512],temp[256];
- fgets(line,511,f);
- if (strlen(line)<4)
+ fgets(line, 511, f);
+ if (strlen(line) < 4)
continue;
sscanf(line,"%s",temp);
@@ -169,43 +162,33 @@ bool LoadSymbolMap(const char *_szFilename) if (!started) continue;
- // read out the entry
u32 address, vaddress, size, unknown;
char name[512];
- sscanf(line,"%08x %08x %08x %i %s",&address, &size, &vaddress, &unknown, name);
+ sscanf(line, "%08x %08x %08x %i %s", &address, &size, &vaddress, &unknown, name);
- char *namepos = strstr(line, name);
+ const char *namepos = strstr(line, name);
if (namepos != 0) //would be odd if not :P
strcpy(name, namepos);
- name[strlen(name)-1] = 0;
+ name[strlen(name) - 1] = 0;
- // we want the function names only ....
- for (size_t i=0; i<strlen(name); i++)
+ // we want the function names only .... TODO: or do we really? aren't we wasting information here?
+ for (size_t i = 0; i < strlen(name); i++)
{
if (name[i] == ' ') name[i] = 0x00;
if (name[i] == '(') name[i] = 0x00;
}
-
-
- // check if this is a valid entry
- if (strcmp(name,".text")!=0 ||
- strcmp(name,".init")!=0 ||
- strlen(name) > 0)
+ // Check if this is a valid entry.
+ if (strcmp(name, ".text") != 0 || strcmp(name, ".init") != 0 || strlen(name) > 0)
{
- AddSymbol(CSymbol(vaddress | 0x80000000, size, ST_FUNCTION, name));
+ AddSymbol(Symbol(vaddress | 0x80000000, size, ST_FUNCTION, name));
}
}
fclose(f);
-
-// AnalyzeBackwards();
return true;
}
-// __________________________________________________________________________________________________
-// SaveSymbolMap
-//
void SaveSymbolMap(const char *_rFilename)
{
FILE *f = fopen(_rFilename,"w");
@@ -213,50 +196,41 @@ void SaveSymbolMap(const char *_rFilename) return;
fprintf(f,".text\n");
- XVectorSymbol::const_iterator itr = m_VectorSymbols.begin();
- while(itr != m_VectorSymbols.end())
+ XVectorSymbol::const_iterator itr = g_Symbols.begin();
+ while (itr != g_Symbols.end())
{
- const CSymbol& rSymbol = *itr;
+ const Symbol& rSymbol = *itr;
fprintf(f,"%08x %08x %08x %i %s\n",rSymbol.vaddress,rSymbol.size,rSymbol.vaddress,0,rSymbol.GetName().c_str());
itr++;
}
fclose(f);
}
-
-// =========================================================================================================
-
-
-void MergeMapWithDB(const char *beginning)
+void PushMapToFunctionDB(FunctionDB *func_db)
{
- XVectorSymbol::const_iterator itr = m_VectorSymbols.begin();
- while(itr != m_VectorSymbols.end())
+ XVectorSymbol::const_iterator itr = g_Symbols.begin();
+ while (itr != g_Symbols.end())
{
- const CSymbol& rSymbol = *itr;
+ const Symbol& rSymbol = *itr;
if (rSymbol.type == ST_FUNCTION && rSymbol.size>=12)
{
+ func_db->AddKnownFunction(rSymbol.vaddress, rSymbol.size / 4, rSymbol.GetName().c_str());
// if (!beginning || !strlen(beginning) || !(memcmp(beginning,rSymbol.name,strlen(beginning))))
- PPCAnalyst::AddToFuncDB(rSymbol.vaddress, rSymbol.size, rSymbol.GetName().c_str());
+// PPCAnalyst::AddToSignatureDB(rSymbol.vaddress, rSymbol.size, rSymbol.GetName().c_str());
}
itr++;
}
-
- PPCAnalyst::UseFuncDB();
-
- PPCAnalyst::SaveFuncDB("e:\\test.db");
-
- // PanicAlert("MergeMapWiintthDB : %s", beginning);
}
void GetFromAnalyzer()
{
- struct local {static void AddSymb(PPCAnalyst::SFunction *f)
+ struct local {static void AddSymb(SFunction *f)
{
- Debugger::AddSymbol(CSymbol(f->address, f->size*4, ST_FUNCTION, f->name.c_str()));
+ Debugger::AddSymbol(Symbol(f->address, f->size * 4, ST_FUNCTION, f->name.c_str()));
}};
- PPCAnalyst::GetAllFuncs(local::AddSymb);
+ g_funcDB.GetAllFuncs(local::AddSymb);
}
const char *GetDescription(u32 _Address)
@@ -268,100 +242,8 @@ const char *GetDescription(u32 _Address) return "(unk.)";
}
-//
-// --- shouldn't be here ---
-//
-
-#ifdef _WIN32
-
-
-void FillSymbolListBox(HWND listbox, ESymbolType symmask)
-{
- ShowWindow(listbox,SW_HIDE);
- ListBox_ResetContent(listbox);
-
- int style = GetWindowLong(listbox,GWL_STYLE);
-
- ListBox_SetItemData(listbox,ListBox_AddString(listbox,"_(0x80000000)"),0x80000000);
- ListBox_SetItemData(listbox,ListBox_AddString(listbox,"_(0x81FFFFFF)"),0x81FFFFFF);
- ListBox_SetItemData(listbox,ListBox_AddString(listbox,"_(0x80003100)"),0x80003100);
- ListBox_SetItemData(listbox,ListBox_AddString(listbox,"_(0x90000000)"),0x90000000);
- ListBox_SetItemData(listbox,ListBox_AddString(listbox,"_(0x93FFFFFF)"),0x93FFFFFF);
-
- XVectorSymbol::const_iterator itr = m_VectorSymbols.begin();
- while (itr != m_VectorSymbols.end())
- {
- const CSymbol& rSymbol = *itr;
- if (rSymbol.type & symmask)
- {
- int index = ListBox_AddString(listbox,rSymbol.GetName().c_str());
- ListBox_SetItemData(listbox,index,rSymbol.vaddress);
- }
- itr++;
- }
-
- ShowWindow(listbox,SW_SHOW);
-}
-
-void FillListBoxBLinks(HWND listbox, XSymbolIndex _Index)
-{
-/* ListBox_ResetContent(listbox);
-
- int style = GetWindowLong(listbox,GWL_STYLE);
-
- CSymbol &e = entries[num];*/
-#ifdef BWLINKS
- for (int i=0; i<e.backwardLinks.size(); i++)
- {
- u32 addr = e.backwardLinks[i];
- int index = ListBox_AddString(listbox,GetSymbolName(GetSymbolNum(addr)));
- ListBox_SetItemData(listbox,index,addr);
- }
-#endif
-}
-#endif
-
-
-void AnalyzeBackwards()
-{
-#ifndef BWLINKS
- return;
-#else
- for (int i=0; i<numEntries; i++)
- {
- u32 ptr = entries[i].vaddress;
- if (ptr && entries[i].type == ST_FUNCTION)
- {
- for (int a = 0; a<entries[i].size/4; a++)
- {
- u32 inst = Memory::ReadUnchecked_U32(ptr);
- switch (inst>>26)
- {
- case 18:
- if (LK) //LK
- {
- u32 addr;
- if(AA)
- addr = SignExt26(LI << 2);
- else
- addr = ptr + SignExt26(LI << 2);
-
- int funNum = GetSymbolNum(addr);
- if (funNum>=0)
- entries[funNum].backwardLinks.push_back(ptr);
- }
- break;
- default:
- ;
- }
- ptr+=4;
- }
- }
- }
-#endif
-}
-bool GetCallstack(std::vector<SCallstackEntry> &output)
+bool GetCallstack(std::vector<CallstackEntry> &output)
{
if (Core::GetState() == Core::CORE_UNINITIALIZED)
return false;
@@ -371,7 +253,7 @@ bool GetCallstack(std::vector<SCallstackEntry> &output) u32 addr = Memory::ReadUnchecked_U32(PowerPC::ppcState.gpr[1]); // SP
if (LR == 0) {
- SCallstackEntry entry;
+ CallstackEntry entry;
entry.Name = "(error: LR=0)";
entry.vAddress = 0x0;
output.push_back(entry);
@@ -380,7 +262,7 @@ bool GetCallstack(std::vector<SCallstackEntry> &output) int count = 1;
if (GetDescription(PowerPC::ppcState.pc) != GetDescription(LR))
{
- SCallstackEntry entry;
+ CallstackEntry entry;
entry.Name = StringFromFormat(" * %s [ LR = %08x ]\n", Debugger::GetDescription(LR), LR);
entry.vAddress = 0x0;
count++;
@@ -397,7 +279,7 @@ bool GetCallstack(std::vector<SCallstackEntry> &output) if (!str || strlen(str) == 0 || !strcmp(str, "Invalid"))
str = "(unknown)";
- SCallstackEntry entry;
+ CallstackEntry entry;
entry.Name = StringFromFormat(" * %s [ addr = %08x ]\n", str, func);
entry.vAddress = func;
output.push_back(entry);
@@ -438,5 +320,4 @@ void PrintCallstack() { }
}
-} // end of namespace Debugger
-
+} // end of namespace Debugger
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h index 6c65aafa58..66b3d6256c 100644 --- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.h @@ -23,6 +23,8 @@ #include "Common.h"
+class FunctionDB;
+
namespace Debugger
{
@@ -32,7 +34,7 @@ enum ESymbolType ST_DATA = 2
};
-class CSymbol
+class Symbol
{
public:
u32 vaddress;
@@ -41,8 +43,8 @@ public: ESymbolType type;
- CSymbol(u32 _Address, u32 _Size, ESymbolType _Type, const char *_rName);
- ~CSymbol();
+ Symbol(u32 _Address, u32 _Size, ESymbolType _Type, const char *_rName);
+ ~Symbol();
const std::string &GetName() const { return m_strName; }
void SetName(const char *_rName) { m_strName = _rName; }
@@ -53,14 +55,14 @@ private: };
typedef int XSymbolIndex;
-typedef std::vector<CSymbol> XVectorSymbol;
+typedef std::vector<Symbol> XVectorSymbol;
void Reset();
-XSymbolIndex AddSymbol(const CSymbol& _rSymbolMapEntry);
+XSymbolIndex AddSymbol(const Symbol& _rSymbolMapEntry);
-const CSymbol& GetSymbol(XSymbolIndex _Index);
-CSymbol& AccessSymbol(XSymbolIndex _Index);
+const Symbol& GetSymbol(XSymbolIndex _Index);
+Symbol& AccessSymbol(XSymbolIndex _Index);
const XVectorSymbol& AccessSymbols();
@@ -69,22 +71,23 @@ XSymbolIndex FindSymbol(const char *name); bool LoadSymbolMap(const char *_rFilename);
void SaveSymbolMap(const char *_rFilename);
-void PrintCallstack();
const char *GetDescription(u32 _Address);
bool RenameSymbol(XSymbolIndex _Index, const char *_Name);
-void AnalyzeBackwards();
+
void GetFromAnalyzer();
-void MergeMapWithDB(const char *beginning);
+void PushMapToFunctionDB(FunctionDB *func_db);
-struct SCallstackEntry
+struct CallstackEntry
{
std::string Name;
u32 vAddress;
};
-bool GetCallstack(std::vector<SCallstackEntry> &output);
+bool GetCallstack(std::vector<CallstackEntry> &output);
+void PrintCallstack();
+
// TODO: move outta here
#ifdef _WIN32
}
diff --git a/Source/Core/Core/Src/HLE/HLE.cpp b/Source/Core/Core/Src/HLE/HLE.cpp index d6b8098b35..192762ffba 100644 --- a/Source/Core/Core/Src/HLE/HLE.cpp +++ b/Source/Core/Core/Src/HLE/HLE.cpp @@ -67,6 +67,7 @@ static const SPatch OSPatches[] = // Super Monkey Ball
{ ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine },
{ ".evil_normalize", HLE_Misc::SMB_EvilNormalize },
+ { ".evil_vec_setlength", HLE_Misc::SMB_evil_vec_setlength },
{ "PanicAlert", HLE_Misc::PanicAlert },
{ ".sqrt_internal_needs_cr1", HLE_Misc::SMB_sqrt_internal },
{ ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal },
@@ -101,13 +102,13 @@ void PatchFunctions() int SymbolIndex = Debugger::FindSymbol(OSPatches[i].m_szPatchName);
if (SymbolIndex > 0)
{
- const Debugger::CSymbol& rSymbol = Debugger::GetSymbol(SymbolIndex);
+ const Debugger::Symbol& symbol = Debugger::GetSymbol(SymbolIndex);
u32 HLEPatchValue = (1 & 0x3f) << 26;
- for (size_t addr = rSymbol.vaddress; addr < rSymbol.vaddress + rSymbol.size; addr+=4) {
+ for (size_t addr = symbol.vaddress; addr < symbol.vaddress + symbol.size; addr += 4) {
Memory::Write_U32(HLEPatchValue | i, addr);
}
//PanicAlert("patched %s", OSPatches[i].m_szPatchName);
- LOG(HLE,"Patching %s %08x", OSPatches[i].m_szPatchName, rSymbol.vaddress);
+ LOG(HLE,"Patching %s %08x", OSPatches[i].m_szPatchName, symbol.vaddress);
}
}
@@ -116,12 +117,12 @@ void PatchFunctions() int SymbolIndex = Debugger::FindSymbol(OSBreakPoints[i].m_szPatchName);
if (SymbolIndex != -1)
{
- const Debugger::CSymbol& rSymbol = Debugger::GetSymbol(SymbolIndex);
- CBreakPoints::AddBreakPoint(rSymbol.vaddress, false);
+ const Debugger::Symbol& symbol = Debugger::GetSymbol(SymbolIndex);
+ CBreakPoints::AddBreakPoint(symbol.vaddress, false);
- LOG(HLE,"Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, rSymbol.vaddress);
+ LOG(HLE,"Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol.vaddress);
}
- }
+ }
// CBreakPoints::AddBreakPoint(0x8000D3D0, false);
}
diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp index c188be072e..52d791d67e 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp @@ -111,61 +111,39 @@ void SMB_EvilNormalize() NPC = LR;
}
+void SMB_evil_vec_setlength()
+{
+ u32 r3 = GPR(3);
+ u32 r4 = GPR(4);
+ float x = F(r3);
+ float y = F(r3 + 4);
+ float z = F(r3 + 8);
+ float inv_len = (float)(rPS0(1) / sqrt(x*x + y*y + z*z));
+ x *= inv_len;
+ y *= inv_len;
+ z *= inv_len;
+ FW(r4, x);
+ FW(r4 + 4, y);
+ FW(r4 + 8, z);
+ NPC = LR;
+}
+
+
void SMB_sqrt_internal()
{
-/*
-.sqrt_internal_needs_cr1
-800070ec: bgt+ cr1,0x80007090
-800070f0: blt+ cr1,0x80007088
-800070f4: b 0x80007080
-800070f8: frsp f0,f1
-800070fc: lis r4, 0xE000
-80007100: mcrfs cr1, cr4
-80007104: mcrfs cr0, cr3
-80007108: lfs f2, 0x01A0 (r4)
-8000710c: bso+ cr1,0x800070EC
-80007110: bso+ 0x80007088
-80007114: ble+ cr1,0x80007088
-80007118: mflr r3
-8000711c: bl 0x800070B0
-80007120: mtlr r3
-80007124: fmuls f1,f1,f0
-80007128: blr
-*/
double f = sqrt(rPS0(1));
+ rPS0(0) = rPS0(1);
+ rPS1(0) = rPS0(1);
rPS0(1) = f;
rPS1(1) = f;
- rPS0(0) = f;
- rPS1(0) = f;
NPC = LR;
}
void SMB_rsqrt_internal()
{
- /*
-.rsqrt_internal_needs_cr1
-8000712c: bgt+ cr1,0x80007088
-80007130: blt+ cr1,0x80007090
-80007134: b 0x80007080
-80007138: frsp f1,f1
-8000713c: lis r4, 0xE000
-80007140: mcrfs cr1, cr4
-80007144: mcrfs cr0, cr3
-80007148: lfs f2, 0x01A0 (r4)
-8000714c: bso+ cr1,0x8000712C
-80007150: bso+ 0x80007090
-80007154: ble+ cr1,0x80007090
-80007158: mflr r3
-8000715c: bl 0x800070B0
-80007160: mtlr r3
-80007164: frsp f1,f1
-80007168: blr
-*/
double f = 1.0 / sqrt(rPS0(1));
rPS0(1) = f;
rPS1(1) = f;
- rPS0(0) = f;
- rPS1(0) = f;
NPC = LR;
}
diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.h b/Source/Core/Core/Src/HLE/HLE_Misc.h index 82c6156479..c72fcf5535 100644 --- a/Source/Core/Core/Src/HLE/HLE_Misc.h +++ b/Source/Core/Core/Src/HLE/HLE_Misc.h @@ -32,6 +32,7 @@ namespace HLE_Misc void SMB_sqrt_internal();
void SMB_rsqrt_internal();
void SMB_atan2();
+ void SMB_evil_vec_setlength();
}
#endif
diff --git a/Source/Core/Core/Src/LogManager.cpp b/Source/Core/Core/Src/LogManager.cpp index 220961cbd5..f52dcbebb6 100644 --- a/Source/Core/Core/Src/LogManager.cpp +++ b/Source/Core/Core/Src/LogManager.cpp @@ -178,12 +178,12 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...) #endif
if (Index > 0)
{
- const Debugger::CSymbol& rSymbol = Debugger::GetSymbol(Index);
+ const Debugger::Symbol& symbol = Debugger::GetSymbol(Index);
sprintf(Msg2, "%i: %x %s (%s, %08x ) : %s%s",
++count,
PowerPC::ppcState.DebugCount,
m_Log[_type]->m_szShortName,
- rSymbol.GetName().c_str(),
+ symbol.GetName().c_str(),
PC,
Msg, eol);
}
diff --git a/Source/Core/Core/Src/PowerPC/FunctionDB.cpp b/Source/Core/Core/Src/PowerPC/FunctionDB.cpp new file mode 100644 index 0000000000..d88f6134c0 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/FunctionDB.cpp @@ -0,0 +1,170 @@ +// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "Common.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "FunctionDB.h"
+#include "SignatureDB.h"
+#include "PPCAnalyst.h"
+
+FunctionDB g_funcDB;
+
+void FunctionDB::List()
+{
+ for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); iter++)
+ {
+ LOG(HLE,"%s @ %08x: %i bytes (hash %08x) : %i calls",iter->second.name.c_str(),iter->second.address,iter->second.size,iter->second.hash,iter->second.numCalls);
+ }
+ LOG(HLE,"%i functions known in this program above.",functions.size());
+}
+
+void FunctionDB::Clear()
+{
+
+}
+
+// Adds the function to the list, unless it's already there
+SFunction *FunctionDB::AddFunction(u32 startAddr)
+{
+ if (startAddr < 0x80000010)
+ return 0;
+ XFuncMap::iterator iter = functions.find(startAddr);
+ if (iter != functions.end())
+ {
+ // it's already in the list
+ return 0;
+ }
+ else
+ {
+ SFunction tempFunc; //the current one we're working on
+ u32 targetEnd = PPCAnalyst::AnalyzeFunction(startAddr, tempFunc);
+ if (targetEnd == 0)
+ return 0; //found a dud :(
+ //LOG(HLE,"SFunction found at %08x",startAddr);
+ functions[startAddr] = tempFunc;
+ checksumToFunction[tempFunc.hash] = &(functions[startAddr]);
+ return &functions[startAddr];
+ }
+}
+
+void FunctionDB::AddKnownFunction(u32 startAddr, u32 size, const char *name)
+{
+ XFuncMap::iterator iter = functions.find(startAddr);
+ if (iter != functions.end())
+ {
+ SFunction *tempfunc = &iter->second;
+ tempfunc->name = name;
+ tempfunc->hash = SignatureDB::ComputeCodeChecksum(startAddr, startAddr + size);
+ }
+ else
+ {
+ SFunction tf;
+ tf.name = name;
+ PPCAnalyst::AnalyzeFunction(startAddr, tf);
+ functions[startAddr] = tf;
+ checksumToFunction[tf.hash] = &(functions[startAddr]);
+ }
+}
+
+void FunctionDB::FillInCallers()
+{
+ for (XFuncMap::iterator iter = functions.begin(); iter!=functions.end(); iter++)
+ {
+ SFunction &f = iter->second;
+ for (size_t i=0; i<f.calls.size(); i++)
+ {
+ SCall NewCall(iter->first, f.calls[i].callAddress);
+ u32 FunctionAddress = f.calls[i].function;
+ XFuncMap::iterator FuncIterator = functions.find(FunctionAddress);
+ if (FuncIterator != functions.end())
+ {
+ SFunction& rCalledFunction = FuncIterator->second;
+ rCalledFunction.callers.push_back(NewCall);
+ }
+ else
+ {
+ LOG(HLE,"FillInCallers tries to fill data in an unknown fuction 0x%08x.", FunctionAddress);
+ }
+ }
+ }
+}
+
+void FunctionDB::PrintCalls(u32 funcAddr)
+{
+ XFuncMap::iterator iter = functions.find(funcAddr);
+ if (iter != functions.end())
+ {
+ SFunction &f = iter->second;
+ LOG(HLE, "The function %s at %08x calls:", f.name.c_str(), f.address);
+ for (std::vector<SCall>::iterator fiter = f.calls.begin(); fiter!=f.calls.end(); fiter++)
+ {
+ XFuncMap::iterator n = functions.find(fiter->function);
+ if (n != functions.end())
+ {
+ LOG(CONSOLE,"* %08x : %s", fiter->callAddress, n->second.name.c_str());
+ }
+ }
+ }
+ else
+ {
+ LOG(CONSOLE,"SFunction does not exist");
+ }
+}
+
+void FunctionDB::PrintCallers(u32 funcAddr)
+{
+ XFuncMap::iterator iter = functions.find(funcAddr);
+ if (iter != functions.end())
+ {
+ SFunction &f = iter->second;
+ LOG(CONSOLE,"The function %s at %08x is called by:",f.name.c_str(),f.address);
+ for (std::vector<SCall>::iterator fiter = f.callers.begin(); fiter != f.callers.end(); fiter++)
+ {
+ XFuncMap::iterator n = functions.find(fiter->function);
+ if (n != functions.end())
+ {
+ LOG(CONSOLE,"* %08x : %s", fiter->callAddress, n->second.name.c_str());
+ }
+ }
+ }
+}
+
+void FunctionDB::GetAllFuncs(functionGetterCallback callback)
+{
+ XFuncMap::iterator iter = functions.begin();
+ while (iter != functions.end())
+ {
+ callback(&(iter->second));
+ iter++;
+ }
+}
+
+void FunctionDB::LogFunctionCall(u32 addr)
+{
+ //u32 from = PC;
+ XFuncMap::iterator iter = functions.find(addr);
+ if (iter != functions.end())
+ {
+ SFunction &f = iter->second;
+ f.numCalls++;
+ }
+}
+
diff --git a/Source/Core/Core/Src/PowerPC/FunctionDB.h b/Source/Core/Core/Src/PowerPC/FunctionDB.h new file mode 100644 index 0000000000..cc1bc2c78f --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/FunctionDB.h @@ -0,0 +1,113 @@ +// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "Common.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+struct SCall
+{
+ SCall(u32 a, u32 b) :
+ function(a),
+ callAddress(b)
+ {}
+ u32 function;
+ u32 callAddress;
+};
+
+struct SFunction
+{
+ SFunction() :
+ hash(0),
+ address(0),
+ flags(0),
+ size(0),
+ numCalls(0),
+ analyzed(0)
+ {}
+
+ ~SFunction()
+ {
+ callers.clear();
+ calls.clear();
+ }
+
+ std::string name;
+ std::vector<SCall> callers; //addresses of functions that call this function
+ std::vector<SCall> calls; //addresses of functions that are called by this function
+ u32 hash; //use for HLE function finding
+ u32 address;
+ u32 flags;
+ int size;
+ int numCalls;
+
+ int analyzed;
+};
+
+enum
+{
+ FFLAG_TIMERINSTRUCTIONS=(1<<0),
+ FFLAG_LEAF=(1<<1),
+ FFLAG_ONLYCALLSNICELEAFS=(1<<2),
+ FFLAG_EVIL=(1<<3),
+ FFLAG_RFI=(1<<4),
+ FFLAG_STRAIGHT=(1<<5)
+};
+
+
+// This has functionality overlapping Debugger_Symbolmap. Should merge that stuff in here later.
+class FunctionDB
+{
+public:
+ typedef std::map<u32, SFunction> XFuncMap;
+ typedef std::map<u32, SFunction*> XFuncPtrMap;
+
+private:
+ XFuncMap functions;
+ XFuncPtrMap checksumToFunction;
+
+public:
+
+ typedef void (*functionGetterCallback)(SFunction *f);
+
+ FunctionDB() {}
+
+ SFunction *AddFunction(u32 startAddr);
+ void AddKnownFunction(u32 startAddr, u32 size, const char *name);
+
+ void GetAllFuncs(functionGetterCallback callback);
+ SFunction *GetFunction(u32 hash) {
+ // TODO: sanity check
+ return checksumToFunction[hash];
+ }
+
+ XFuncMap::iterator GetIterator() { return functions.begin(); }
+ XFuncMap::const_iterator GetConstIterator() { return functions.begin(); }
+ XFuncMap::iterator End() { return functions.end(); }
+
+ void Clear();
+ void List();
+ void FillInCallers();
+
+ void PrintCalls(u32 funcAddr);
+ void PrintCallers(u32 funcAddr);
+ void LogFunctionCall(u32 addr);
+};
+
+extern FunctionDB g_funcDB;
diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp index f36a7dd426..6615fce33f 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp @@ -14,12 +14,15 @@ // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
+
#include <string>
#include "StringUtil.h"
#include "Interpreter/Interpreter.h"
#include "../HW/Memmap.h"
#include "PPCTables.h"
+#include "FunctionDB.h"
+#include "SignatureDB.h"
#include "PPCAnalyst.h"
// Analyzes PowerPC code in memory to find functions
@@ -30,49 +33,22 @@ // The results of this analysis are currently not really used for anything, other than
// finding function boundaries so that we can find, fingerprint and detect library functions.
-using namespace std;
-
-PPCAnalyst::XFuncMap PPCAnalyst::functions;
-PPCAnalyst::XFuncPtrMap PPCAnalyst::checksumToFunction;
-PPCAnalyst::XFuncDB PPCAnalyst::database;
-
-#define INVALID_TARGET ((u32)-1)
-
-//Adds a known function to the hash database
-void PPCAnalyst::AddToFuncDB(u32 startAddr, u32 size, const TCHAR *name)
-{
- if (startAddr < 0x80000000 || startAddr>0x80000000+Memory::RAM_SIZE)
- return;
+namespace PPCAnalyst {
- SFunction tf;
- SFunction *tempfunc=&tf;
-
- XFuncMap::iterator iter = functions.find(startAddr);
- if (iter != functions.end())
- {
- tempfunc = &iter->second;
- }
- else
- {
- AnalyzeFunction(startAddr,tf);
- functions[startAddr] = *tempfunc;
- checksumToFunction[tempfunc->hash] = &(functions[startAddr]);
- }
+using namespace std;
- tempfunc->name = name;
+// VERY ugly. TODO: remove.
+PPCAnalyst::CodeOp codebuffer[20000];
- SDBFunc temp;
- temp.size = size;
- temp.name = name;
+void AnalyzeFunction2(SFunction &func);
+u32 EvaluateBranchTarget(UGeckoInstruction instr, u32 pc);
+// void FixUpInternalBranches(CodeOp *code, int begin, int end);
- XFuncDB::iterator iter2 = database.find(tempfunc->hash);
- if (iter2 == database.end())
- database[tempfunc->hash] = temp;
-}
+#define INVALID_TARGET ((u32)-1)
-u32 PPCAnalyst::EvaluateBranchTarget(UGeckoInstruction instr, u32 pc)
+u32 EvaluateBranchTarget(UGeckoInstruction instr, u32 pc)
{
switch (instr.OPCD)
{
@@ -97,9 +73,13 @@ u32 PPCAnalyst::EvaluateBranchTarget(UGeckoInstruction instr, u32 pc) //If any one goes farther than the blr, assume that there is more than
//one blr, and keep scanning.
-u32 PPCAnalyst::AnalyzeFunction(u32 startAddr, SFunction &func)
+bool AnalyzeFunction(u32 startAddr, SFunction &func)
{
- func.name = StringFromFormat("zzz_%08x ??", startAddr);
+ if (!func.name.size())
+ func.name = StringFromFormat("zzz_%08x ??", startAddr);
+ if (func.analyzed >= 1)
+ return true; // No error, just already did it.
+
func.calls.clear();
func.callers.clear();
func.size = 0;
@@ -112,7 +92,7 @@ u32 PPCAnalyst::AnalyzeFunction(u32 startAddr, SFunction &func) {
func.size++;
if (func.size > 1024*16) //weird
- return 0;
+ return false;
UGeckoInstruction instr = (UGeckoInstruction)Memory::ReadUnchecked_U32(addr);
@@ -131,10 +111,10 @@ u32 PPCAnalyst::AnalyzeFunction(u32 startAddr, SFunction &func) //We're done! Looks like we have a neat valid function. Perfect.
//Let's calc the checksum and get outta here
func.address = startAddr;
- func.hash = PPCAnalyst::FuncChecksum(startAddr, addr);
+ func.hash = SignatureDB::ComputeCodeChecksum(startAddr, addr);
if (numInternalBranches == 0)
func.flags |= FFLAG_STRAIGHT;
- return addr;
+ return true;
}
}
else if (instr.hex == 0x4e800021 || instr.hex == 0x4e800420 || instr.hex == 0x4e800421)
@@ -176,16 +156,16 @@ u32 PPCAnalyst::AnalyzeFunction(u32 startAddr, SFunction &func) }
else
{
- return 0;
+ return false;
}
- addr+=4;
+ addr += 4;
}
}
// Second pass analysis, done after the first pass is done for all functions
// so we have more information to work with
-void PPCAnalyst::AnalyzeFunction2(SFunction &func)
+void AnalyzeFunction2(SFunction &func)
{
// u32 addr = func.address;
u32 flags = func.flags;
@@ -210,17 +190,14 @@ void PPCAnalyst::AnalyzeFunction2(SFunction &func) }*/
bool nonleafcall = false;
- for (size_t i = 0; i<func.calls.size(); i++)
+ for (size_t i = 0; i < func.calls.size(); i++)
{
SCall c = func.calls[i];
- XFuncMap::iterator iter = functions.find(c.function);
- if (iter != functions.end())
+ SFunction *called_func = g_funcDB.GetFunction(c.function);
+ if (called_func && (called_func->flags & FFLAG_LEAF) == 0)
{
- if (((*iter).second.flags & FFLAG_LEAF) == 0)
- {
- nonleafcall = true;
- break;
- }
+ nonleafcall = true;
+ break;
}
}
@@ -231,7 +208,7 @@ void PPCAnalyst::AnalyzeFunction2(SFunction &func) }
// Currently not used
-void PPCAnalyst::FixUpInternalBranches(CodeOp *code, int begin, int end)
+void FixUpInternalBranches(CodeOp *code, int begin, int end)
{
for (int i = begin; i < end; i++)
{
@@ -267,19 +244,15 @@ void PPCAnalyst::FixUpInternalBranches(CodeOp *code, int begin, int end) }
}
-//yaya ugly
-PPCAnalyst::CodeOp codebuffer[20000];
-
void PPCAnalyst::ShuffleUp(CodeOp *code, int first, int last)
{
CodeOp temp = code[first];
- for (int i=first; i<last; i++)
- code[i] = code[i+1];
+ for (int i = first; i < last; i++)
+ code[i] = code[i + 1];
code[last] = temp;
}
-
-PPCAnalyst::CodeOp *PPCAnalyst::Flatten(u32 address, u32 &realsize, BlockStats &st, BlockRegStats &gpa, BlockRegStats &fpa)
+CodeOp *Flatten(u32 address, u32 &realsize, BlockStats &st, BlockRegStats &gpa, BlockRegStats &fpa)
{
int numCycles = 0;
u32 blockstart = address;
@@ -299,19 +272,17 @@ PPCAnalyst::CodeOp *PPCAnalyst::Flatten(u32 address, u32 &realsize, BlockStats & };
Todo todo = Nothing;
- XFuncMap::iterator iter = functions.find(address);
+ SFunction *f = g_funcDB.GetFunction(address);
int maxsize = 20000;
-
//for now, all will return JustCopy :P
- if (iter != functions.end())
+ if (f)
{
- SFunction &f = iter->second;
- if (f.flags & FFLAG_LEAF)
+ if (f->flags & FFLAG_LEAF)
{
//no reason to flatten
todo = JustCopy;
}
- else if (f.flags & FFLAG_ONLYCALLSNICELEAFS)
+ else if (f->flags & FFLAG_ONLYCALLSNICELEAFS)
{
//inline calls if possible
//todo = Flatten;
@@ -323,7 +294,7 @@ PPCAnalyst::CodeOp *PPCAnalyst::Flatten(u32 address, u32 &realsize, BlockStats & }
todo = JustCopy;
- maxsize = f.size;
+ maxsize = f->size;
}
else
todo = JustCopy;
@@ -573,42 +544,14 @@ PPCAnalyst::CodeOp *PPCAnalyst::Flatten(u32 address, u32 &realsize, BlockStats & return code;
}
-// Adds the function to the list, unless it's already there
-PPCAnalyst::SFunction *PPCAnalyst::AddFunction(u32 startAddr)
-{
- if (startAddr < 0x80000010)
- return 0;
- XFuncMap::iterator iter = functions.find(startAddr);
- if (iter != functions.end())
- {
- // it's already in the list
- return 0;
- }
- else
- {
- SFunction tempFunc; //the current one we're working on
- u32 targetEnd = AnalyzeFunction(startAddr, tempFunc);
- if (targetEnd == 0)
- return 0; //found a dud :(
-
- //LOG(HLE,"SFunction found at %08x",startAddr);
- functions[startAddr] = tempFunc;
- checksumToFunction[tempFunc.hash] = &(functions[startAddr]);
- return &functions[startAddr];
- }
-}
-
-//Most functions that are relevant to analyze should be
-//called by another function. Therefore, let's scan the
-//entire space for bl operations and find what functions
-//get called.
+// Most functions that are relevant to analyze should be
+// called by another function. Therefore, let's scan the
+// entire space for bl operations and find what functions
+// get called.
-void PPCAnalyst::FindFunctionsFromBranches(u32 startAddr, u32 endAddr)
+void FindFunctionsFromBranches(u32 startAddr, u32 endAddr, FunctionDB *func_db)
{
- functions.clear();
- checksumToFunction.clear();
-
- for (u32 addr = startAddr; addr<endAddr; addr+=4)
+ for (u32 addr = startAddr; addr < endAddr; addr+=4)
{
UGeckoInstruction instr = (UGeckoInstruction)Memory::ReadUnchecked_U32(addr);
@@ -625,7 +568,7 @@ void PPCAnalyst::FindFunctionsFromBranches(u32 startAddr, u32 endAddr) target += addr;
if (Memory::IsRAMAddress(target))
{
- PPCAnalyst::AddFunction(target);
+ func_db->AddFunction(target);
}
}
}
@@ -637,14 +580,14 @@ void PPCAnalyst::FindFunctionsFromBranches(u32 startAddr, u32 endAddr) }
}
-void PPCAnalyst::FindFunctionsAfterBLR()
+void FindFunctionsAfterBLR(FunctionDB *func_db)
{
vector<u32> funcAddrs;
- for (XFuncMap::iterator iter = functions.begin(); iter!=functions.end(); iter++)
+ for (FunctionDB::XFuncMap::iterator iter = func_db->GetIterator(); iter != func_db->End(); iter++)
funcAddrs.push_back(iter->second.address + iter->second.size*4);
- for (vector<u32>::iterator iter = funcAddrs.begin(); iter!=funcAddrs.end(); iter++)
+ for (vector<u32>::iterator iter = funcAddrs.begin(); iter != funcAddrs.end(); iter++)
{
u32 location = *iter;
while (true)
@@ -652,7 +595,7 @@ void PPCAnalyst::FindFunctionsAfterBLR() if (PPCTables::IsValidInstruction(Memory::Read_Instruction(location)))
{
//check if this function is already mapped
- SFunction *f = AddFunction(location);
+ SFunction *f = func_db->AddFunction(location);
if (!f)
break;
else
@@ -664,30 +607,26 @@ void PPCAnalyst::FindFunctionsAfterBLR() }
}
-void PPCAnalyst::FindFunctions(u32 startAddr, u32 endAddr)
+void PPCAnalyst::FindFunctions(u32 startAddr, u32 endAddr, FunctionDB *func_db)
{
//Step 1: Find all functions
- FindFunctionsFromBranches(startAddr, endAddr);
-
-
- LOG(HLE,"Memory scan done. Found %i functions.",functions.size());
- FindFunctionsAfterBLR();
+ FindFunctionsFromBranches(startAddr, endAddr, func_db);
+ FindFunctionsAfterBLR(func_db);
- LOG(HLE,"Scanning after every function. Found %i new functions.",functions.size());
//Step 2:
- FillInCallers();
+ func_db->FillInCallers();
- int numLeafs = 0, numNice = 0, numUnNice=0, numTimer=0, numRFI=0, numStraightLeaf=0;
+ int numLeafs = 0, numNice = 0, numUnNice = 0, numTimer=0, numRFI=0, numStraightLeaf=0;
int leafSize = 0, niceSize = 0, unniceSize = 0;
- for (XFuncMap::iterator iter = functions.begin(); iter!=functions.end(); iter++)
+ for (FunctionDB::XFuncMap::iterator iter = func_db->GetIterator(); iter != func_db->End(); iter++)
{
if (iter->second.address == 4)
{
- LOG(HLE,"weird function");
+ LOG(HLE, "weird function");
continue;
}
AnalyzeFunction2(iter->second);
- SFunction &f=iter->second;
+ SFunction &f = iter->second;
if (f.flags & FFLAG_LEAF)
{
numLeafs++;
@@ -726,270 +665,50 @@ void PPCAnalyst::FindFunctions(u32 startAddr, u32 endAddr) else
unniceSize /= numUnNice;
- LOG(HLE,"Functions analyzed. %i leafs, %i nice, %i unnice. %i timer, %i rfi. %i are branchless leafs.",numLeafs,numNice,numUnNice,numTimer,numRFI,numStraightLeaf);
- LOG(HLE,"Average size: %i (leaf), %i (nice), %i(unnice)",leafSize,niceSize,unniceSize);
-// PPCAnalyst::LoadDolwinFuncDB();
+ LOG(HLE, "Functions analyzed. %i leafs, %i nice, %i unnice. %i timer, %i rfi. %i are branchless leafs.",numLeafs,numNice,numUnNice,numTimer,numRFI,numStraightLeaf);
+ LOG(HLE, "Average size: %i (leaf), %i (nice), %i(unnice)", leafSize, niceSize, unniceSize);
}
-void PPCAnalyst::ListFunctions()
+/*
+void AnalyzeBackwards()
{
- for (XFuncMap::iterator iter = functions.begin(); iter!=functions.end(); iter++)
- {
- LOG(HLE,"%s @ %08x: %i bytes (hash %08x) : %i calls",iter->second.name.c_str(),iter->second.address,iter->second.size,iter->second.hash,iter->second.numCalls);
- }
- LOG(HLE,"%i functions known in this program above.",functions.size());
-}
-
-void PPCAnalyst::ListDB()
-{
- for (XFuncDB::iterator iter = database.begin(); iter != database.end(); iter++)
- {
- LOG(HLE,"%s : %i bytes, hash = %08x",iter->second.name.c_str(), iter->second.size, iter->first);
- }
- LOG(HLE,"%i functions known in current database above.",database.size());
-}
-
-void PPCAnalyst::FillInCallers()
-{
- // TODO(ector): I HAVE NO IDEA WHY, but this function overwrites the some
- // data of "PPCAnalyst::XFuncMap PPCAnalyst::functions"
- for (XFuncMap::iterator iter = functions.begin(); iter!=functions.end(); iter++)
- {
- SFunction &f = iter->second;
- for (size_t i=0; i<f.calls.size(); i++)
+#ifndef BWLINKS
+ return;
+#else
+ for (int i=0; i<numEntries; i++)
+ {
+ u32 ptr = entries[i].vaddress;
+ if (ptr && entries[i].type == ST_FUNCTION)
{
- SCall NewCall(iter->first, f.calls[i].callAddress);
- u32 FunctioAddress = f.calls[i].function;
- XFuncMap::iterator FuncIterator = functions.find(FunctioAddress);
- if (FuncIterator != functions.end())
- {
- SFunction& rCalledFunction = FuncIterator->second;
- rCalledFunction.callers.push_back(NewCall);
- }
- else
+ for (int a = 0; a<entries[i].size/4; a++)
{
- LOG(HLE,"FillInCallers tries to fill data in an unknown fuction 0x%08x.", FunctioAddress);
+ u32 inst = Memory::ReadUnchecked_U32(ptr);
+ switch (inst >> 26)
+ {
+ case 18:
+ if (LK) //LK
+ {
+ u32 addr;
+ if(AA)
+ addr = SignExt26(LI << 2);
+ else
+ addr = ptr + SignExt26(LI << 2);
+
+ int funNum = GetSymbolNum(addr);
+ if (funNum>=0)
+ entries[funNum].backwardLinks.push_back(ptr);
+ }
+ break;
+ default:
+ ;
+ }
+ ptr+=4;
}
}
- }
-
-}
-
-
-
-u32 PPCAnalyst::FuncChecksum (u32 offsetStart, u32 offsetEnd)
-{
- u32 sum = 0, offset;
- u32 opcode, auxop, op, op2, op3;
-
- for (offset = offsetStart; offset <= offsetEnd; offset+=4)
- {
- opcode = Memory::Read_Instruction(offset);
- op = opcode & 0xFC000000;
- op2 = 0;
- op3 = 0;
- auxop = op >> 26;
- switch (auxop)
- {
- case 4: //PS instructions
- op2 = opcode & 0x0000003F;
- switch ( op2 )
- {
- case 0:
- case 8:
- case 16:
- case 21:
- case 22:
- op3 = opcode & 0x000007C0;
- }
- break;
-
- case 7: //addi muli etc
- case 8:
- case 10:
- case 11:
- case 12:
- case 13:
- case 14:
- case 15:
- op2 = opcode & 0x03FF0000;
- break;
-
- case 19: // MCRF??
- case 31: //integer
- case 63: //fpu
- op2 = opcode & 0x000007FF;
- //why not bring in the RA RB RD/S too?
- break;
- case 59: //fpu
- op2 = opcode & 0x0000003F;
- if ( op2 < 16 )
- op3 = opcode & 0x000007C0;
- break;
- default:
- if (auxop >= 32 && auxop < 56)
- op2 = opcode & 0x03FF0000;
- break;
- }
- // Checksum only uses opcode, not opcode data, because opcode data changes
- // in all compilations, but opcodes dont!
- sum = ( ( (sum << 17 ) & 0xFFFE0000 ) | ( (sum >> 15) & 0x0001FFFF ) );
- sum = sum ^ (op | op2 | op3);
- }
- return sum;
-}
-
-struct FuncDesc
-{
- u32 checkSum;
- u32 size;
- char name[128];
-};
-
-bool PPCAnalyst::SaveFuncDB(const TCHAR *filename)
-{
- FILE *f = fopen(filename,"wb");
- if (!f)
- {
- LOG(HLE,"Database save failed");
- return false;
- }
- int fcount = (int)database.size();
- fwrite(&fcount,4,1,f);
- for (XFuncDB::iterator iter = database.begin(); iter!=database.end(); iter++)
- {
- FuncDesc temp;
- memset(&temp,0,sizeof(temp));
- temp.checkSum = iter->first;
- temp.size = iter->second.size;
- strncpy(temp.name, iter->second.name.c_str(), 127);
- fwrite(&temp,sizeof(temp),1,f);
- }
- fclose(f);
- LOG(HLE,"Database save successful");
- return true;
-}
-
-bool PPCAnalyst::LoadFuncDB(const TCHAR *filename)
-{
- FILE *f = fopen(filename, "rb");
- if (!f)
- {
- LOG(HLE, "Database load failed");
- return false;
- }
- u32 fcount = 0;
- fread(&fcount, 4, 1, f);
- for (size_t i = 0; i < fcount; i++)
- {
- FuncDesc temp;
- memset(&temp, 0, sizeof(temp));
-
- fread(&temp, sizeof(temp), 1, f);
- SDBFunc f;
- f.name = temp.name;
- f.size = temp.size;
- database[temp.checkSum] = f;
- }
- fclose(f);
-
- UseFuncDB();
- LOG(HLE, "Database load successful");
- return true;
-}
-
-
-void PPCAnalyst::ClearDB()
-{
- database.clear();
-}
-
-void PPCAnalyst::UseFuncDB()
-{
- for (XFuncDB::iterator iter = database.begin(); iter!=database.end(); iter++)
- {
- u32 checkSum = iter->first;
- XFuncPtrMap::iterator i = checksumToFunction.find(checkSum);
- if (i != checksumToFunction.end())
- {
- SFunction *f = (i->second);
- if (iter->second.size == (unsigned int)f->size*4)
- {
- f->name = iter->second.name;
- }
- else
- {
- // This message is really useless.
- //LOG(HLE,"%s, Right hash, wrong size! %08x %i %i",iter->second.name.c_str(),f->address,f->size,iter->second.size);
- }
- //LOG(HLE,"Found %s at %08x (size: %08x)!",iter->second.name.c_str(),f->address,f->size);
- //found a function!
- }
- else
- {
- //function with this checksum not found
- // LOG(HLE,"Did not find %s!",name);
- }
- }
-}
-
-void PPCAnalyst::PrintCalls(u32 funcAddr)
-{
- XFuncMap::iterator iter = functions.find(funcAddr);
- if (iter != functions.end())
- {
- SFunction &f = iter->second;
- LOG(HLE,"The function %s at %08x calls:",f.name.c_str(), f.address);
- for (vector<SCall>::iterator fiter = f.calls.begin(); fiter!=f.calls.end(); fiter++)
- {
- XFuncMap::iterator n = functions.find(fiter->function);
- if (n != functions.end())
- {
- LOG(CONSOLE,"* %08x : %s", fiter->callAddress, n->second.name.c_str());
- }
- }
- }
- else
- {
- LOG(CONSOLE,"SFunction does not exist");
- }
-}
-
-void PPCAnalyst::PrintCallers(u32 funcAddr)
-{
- XFuncMap::iterator iter = functions.find(funcAddr);
- if (iter != functions.end())
- {
- SFunction &f = iter->second;
- LOG(CONSOLE,"The function %s at %08x is called by:",f.name.c_str(),f.address);
- for (vector<SCall>::iterator fiter = f.callers.begin(); fiter!=f.callers.end(); fiter++)
- {
- XFuncMap::iterator n = functions.find(fiter->function);
- if (n != functions.end())
- {
- LOG(CONSOLE,"* %08x : %s", fiter->callAddress, n->second.name.c_str());
- }
- }
- }
-}
-
-void PPCAnalyst::GetAllFuncs(functionGetterCallback callback)
-{
- XFuncMap::iterator iter = functions.begin();
- while (iter != functions.end())
- {
- callback(&(iter->second));
- iter++;
}
+#endif
}
-void PPCAnalyst::LogFunctionCall(u32 addr)
-{
- //u32 from = PC;
- XFuncMap::iterator iter = functions.find(addr);
- if (iter != functions.end())
- {
- SFunction &f = iter->second;
- f.numCalls++;
- }
-}
+*/
+
+} // namespace
\ No newline at end of file diff --git a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h index 18014e2eb7..34c180ba29 100644 --- a/Source/Core/Core/Src/PowerPC/PPCAnalyst.h +++ b/Source/Core/Core/Src/PowerPC/PPCAnalyst.h @@ -14,6 +14,7 @@ // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
+
#ifndef _PPCANALYST_H
#define _PPCANALYST_H
@@ -25,38 +26,17 @@ #include "Common.h"
#include "Gekko.h"
-class PPCAnalyst
-{
-private:
-
- struct SCall
- {
- SCall(u32 a, u32 b) :
- function(a),
- callAddress(b)
- {}
- u32 function;
- u32 callAddress;
- };
-
- struct SDBFunc
- {
- u32 size;
- std::string name;
+class FunctionDB;
+struct SFunction;
- SDBFunc() :
- size(0)
- {
- }
- };
-
-public:
+namespace PPCAnalyst
+{
struct CodeOp //16B
{
UGeckoInstruction inst;
u32 address;
u32 branchTo; //if 0, not a branch
- int branchToIndex; //index of target block
+ int branchToIndex; //index of target block
u8 regsOut[2];
u8 regsIn[3];
u8 fregOut;
@@ -90,7 +70,7 @@ public: bool any;
bool anyTimer;
- int GetTotalNumAccesses(int reg) {return numReads[reg]+numWrites[reg];}
+ int GetTotalNumAccesses(int reg) {return numReads[reg] + numWrites[reg];}
int GetUseRange(int reg) {
return max(lastRead[reg], lastWrite[reg]) -
min(firstRead[reg], firstWrite[reg]);}
@@ -98,83 +78,13 @@ public: void ShuffleUp(CodeOp *code, int first, int last);
- struct SFunction
- {
- SFunction() :
- hash(0),
- address(0),
- flags(0),
- size(0),
- numCalls(0)
- {}
-
- ~SFunction()
- {
- callers.clear();
- calls.clear();
- }
-
- std::string name;
- std::vector<SCall> callers; //addresses of functions that call this function
- std::vector<SCall> calls; //addresses of functions that are called by this function
- u32 hash; //use for HLE function finding
- u32 address;
- u32 flags;
- int size;
- int numCalls;
- };
+ CodeOp *Flatten(u32 address, u32 &realsize, BlockStats &st, BlockRegStats &gpa, BlockRegStats &fpa);
- enum
- {
- FFLAG_TIMERINSTRUCTIONS=(1<<0),
- FFLAG_LEAF=(1<<1),
- FFLAG_ONLYCALLSNICELEAFS=(1<<2),
- FFLAG_EVIL=(1<<3),
- FFLAG_RFI=(1<<4),
- FFLAG_STRAIGHT=(1<<5)
- };
-
-private:
- typedef void (*functionGetterCallback)(SFunction *f);
- typedef std::map<u32, SFunction> XFuncMap;
- typedef std::map<u32, SFunction*> XFuncPtrMap;
- typedef std::map<u32, SDBFunc> XFuncDB;
-
- static XFuncMap functions;
- static XFuncPtrMap checksumToFunction;
- static XFuncDB database;
-
- static u32 AnalyzeFunction(u32 startAddr, SFunction &func);
- static void AnalyzeFunction2(SFunction &func);
- static u32 EvaluateBranchTarget(UGeckoInstruction instr, u32 pc);
- static SFunction *AddFunction(u32 startAddr);
- static void FindFunctionsFromBranches(u32 startAddr, u32 endAddr);
- static u32 FuncChecksum (u32 offsetStart, u32 offsetEnd);
- static void FillInCallers();
- static void FindFunctionsAfterBLR();
- static void FixUpInternalBranches(CodeOp *code, int begin, int end);
-
-public:
- static CodeOp *Flatten(u32 address, u32 &realsize, BlockStats &st, BlockRegStats &gpa, BlockRegStats &fpa);
-
- static void LogFunctionCall(u32 addr);
-
- static void FindFunctions(u32 startAddr, u32 endAddr);
- static void PrintCalls(u32 funcAddr);
- static void PrintCallers(u32 funcAddr);
- static void AddToFuncDB(u32 startAddr, u32 size, const TCHAR *name);
- static void ListFunctions();
-
- static bool SaveFuncDB(const TCHAR *filename);
- static bool LoadFuncDB(const TCHAR *filename);
- static void ClearDB();
- static void ListDB();
- static void UseFuncDB();
- static void CleanDB(); //remove zzz_
-
- static void GetAllFuncs(functionGetterCallback callback);
-
-};
+ void LogFunctionCall(u32 addr);
+
+ void FindFunctions(u32 startAddr, u32 endAddr, FunctionDB *func_db);
+ bool AnalyzeFunction(u32 startAddr, SFunction &func);
+} // namespace
#endif
diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.h b/Source/Core/Core/Src/PowerPC/PPCTables.h index b7ce5b4a70..a0a08b61f4 100644 --- a/Source/Core/Core/Src/PowerPC/PPCTables.h +++ b/Source/Core/Core/Src/PowerPC/PPCTables.h @@ -14,6 +14,7 @@ // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
+
#ifndef _PPCTABLES_H
#define _PPCTABLES_H
diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.cpp b/Source/Core/Core/Src/PowerPC/SignatureDB.cpp new file mode 100644 index 0000000000..38f382c019 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/SignatureDB.cpp @@ -0,0 +1,203 @@ +// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "Common.h"
+#include "PPCAnalyst.h"
+#include "../HW/Memmap.h"
+
+#include "SignatureDB.h"
+#include "FunctionDB.h"
+
+namespace {
+
+// On-disk format for SignatureDB entries.
+struct FuncDesc
+{
+ u32 checkSum;
+ u32 size;
+ char name[128];
+};
+
+} // namespace
+
+bool SignatureDB::Load(const char *filename)
+{
+ FILE *f = fopen(filename, "rb");
+ if (!f)
+ return false;
+ u32 fcount = 0;
+ fread(&fcount, 4, 1, f);
+ for (size_t i = 0; i < fcount; i++)
+ {
+ FuncDesc temp;
+ memset(&temp, 0, sizeof(temp));
+
+ fread(&temp, sizeof(temp), 1, f);
+ DBFunc f;
+ f.name = temp.name;
+ f.size = temp.size;
+ database[temp.checkSum] = f;
+ }
+ fclose(f);
+ return true;
+}
+
+bool SignatureDB::Save(const char *filename)
+{
+ FILE *f = fopen(filename,"wb");
+ if (!f)
+ {
+ LOG(HLE,"Database save failed");
+ return false;
+ }
+ int fcount = (int)database.size();
+ fwrite(&fcount, 4, 1, f);
+ for (FuncDB::const_iterator iter = database.begin(); iter != database.end(); iter++)
+ {
+ FuncDesc temp;
+ memset(&temp, 0, sizeof(temp));
+ temp.checkSum = iter->first;
+ temp.size = iter->second.size;
+ strncpy(temp.name, iter->second.name.c_str(), 127);
+ fwrite(&temp, sizeof(temp), 1, f);
+ }
+ fclose(f);
+ LOG(HLE,"Database save successful");
+ return true;
+}
+
+//Adds a known function to the hash database
+u32 SignatureDB::Add(u32 startAddr, u32 size, const char *name)
+{
+ u32 hash = ComputeCodeChecksum(startAddr, startAddr + size);
+
+ DBFunc temp_dbfunc;
+ temp_dbfunc.size = size;
+ temp_dbfunc.name = name;
+
+ FuncDB::iterator iter = database.find(hash);
+ if (iter == database.end())
+ database[hash] = temp_dbfunc;
+ return hash;
+}
+
+void SignatureDB::List()
+{
+ for (FuncDB::iterator iter = database.begin(); iter != database.end(); iter++)
+ {
+ LOG(HLE,"%s : %i bytes, hash = %08x",iter->second.name.c_str(), iter->second.size, iter->first);
+ }
+ LOG(HLE, "%i functions known in current database.", database.size());
+}
+
+void SignatureDB::Clear()
+{
+ database.clear();
+}
+
+void SignatureDB::Apply(FunctionDB *func_db)
+{
+ for (FuncDB::const_iterator iter = database.begin(); iter != database.end(); iter++)
+ {
+ u32 checkSum = iter->first;
+ SFunction *function = func_db->GetFunction(checkSum);
+ if (function)
+ {
+ // Found the function. Let's rename it according to the symbol file.
+ if (iter->second.size == (unsigned int)function->size * 4)
+ {
+ function->name = iter->second.name;
+ LOG(HLE,"Found %s at %08x (size: %08x)!", iter->second.name.c_str(), function->address, function->size);
+ } else
+ {
+ function->name = iter->second.name;
+ LOG(HLE,"Wrong sizzze! Found %s at %08x (size: %08x instead of %08x)!", iter->second.name.c_str(), function->address, function->size, iter->second.size);
+ }
+ }
+ }
+}
+
+void SignatureDB::Initialize(FunctionDB *func_db)
+{
+ for (FunctionDB::XFuncMap::const_iterator iter = func_db->GetConstIterator(); iter != func_db->End(); iter++)
+ {
+ DBFunc temp_dbfunc;
+ temp_dbfunc.name = iter->second.name;
+ temp_dbfunc.size = iter->second.size;
+ database[iter->second.hash] = temp_dbfunc;
+ }
+}
+
+/*static*/ u32 SignatureDB::ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd)
+{
+ u32 sum = 0;
+ for (u32 offset = offsetStart; offset <= offsetEnd; offset += 4)
+ {
+ u32 opcode = Memory::Read_Instruction(offset);
+ u32 op = opcode & 0xFC000000;
+ u32 op2 = 0;
+ u32 op3 = 0;
+ u32 auxop = op >> 26;
+ switch (auxop)
+ {
+ case 4: //PS instructions
+ op2 = opcode & 0x0000003F;
+ switch ( op2 )
+ {
+ case 0:
+ case 8:
+ case 16:
+ case 21:
+ case 22:
+ op3 = opcode & 0x000007C0;
+ }
+ break;
+
+ case 7: //addi muli etc
+ case 8:
+ case 10:
+ case 11:
+ case 12:
+ case 13:
+ case 14:
+ case 15:
+ op2 = opcode & 0x03FF0000;
+ break;
+
+ case 19: // MCRF??
+ case 31: //integer
+ case 63: //fpu
+ op2 = opcode & 0x000007FF;
+ break;
+ case 59: //fpu
+ op2 = opcode & 0x0000003F;
+ if (op2 < 16)
+ op3 = opcode & 0x000007C0;
+ break;
+ default:
+ if (auxop >= 32 && auxop < 56)
+ op2 = opcode & 0x03FF0000;
+ break;
+ }
+ // Checksum only uses opcode, not opcode data, because opcode data changes
+ // in all compilations, but opcodes dont!
+ sum = ( ( (sum << 17 ) & 0xFFFE0000 ) | ( (sum >> 15) & 0x0001FFFF ) );
+ sum = sum ^ (op | op2 | op3);
+ }
+ return sum;
+}
+
diff --git a/Source/Core/Core/Src/PowerPC/SignatureDB.h b/Source/Core/Core/Src/PowerPC/SignatureDB.h new file mode 100644 index 0000000000..51b8905110 --- /dev/null +++ b/Source/Core/Core/Src/PowerPC/SignatureDB.h @@ -0,0 +1,57 @@ +// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "Common.h"
+
+#include <map>
+#include <string>
+
+// You're not meant to keep around SignatureDB objects persistently. Use 'em, throw them away.
+
+class FunctionDB;
+
+class SignatureDB
+{
+ struct DBFunc
+ {
+ std::string name;
+ u32 size;
+ DBFunc() : size(0)
+ {
+ }
+ };
+
+ // Map from signature to function. We store the DB in this map because it optimizes the
+ // most common operation - lookup. We don't care about ordering anyway.
+ typedef std::map<u32, DBFunc> FuncDB;
+ FuncDB database;
+
+public:
+ // Returns the hash.
+ u32 Add(u32 startAddr, u32 size, const char *name);
+
+ bool Load(const char *filename); // Does not clear. Remember to clear first if that's what you want.
+ bool Save(const char *filename);
+ void Clean(const char *prefix);
+ void Clear();
+ void List();
+
+ void Initialize(FunctionDB *func_db);
+ void Apply(FunctionDB *func_db);
+
+ static u32 ComputeCodeChecksum(u32 offsetStart, u32 offsetEnd);
+};
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript index 2c864c2e7e..a1b7bca50e 100644 --- a/Source/Core/Core/Src/SConscript +++ b/Source/Core/Core/Src/SConscript @@ -57,6 +57,8 @@ files = ["Console.cpp", "PowerPC/PowerPC.cpp", "PowerPC/PPCAnalyst.cpp", "PowerPC/PPCTables.cpp", + "PowerPC/SignatureDB.cpp", + "PowerPC/FunctionDB.cpp", "PowerPC/Interpreter/Interpreter.cpp", "PowerPC/Interpreter/Interpreter_Branch.cpp", "PowerPC/Interpreter/Interpreter_Integer.cpp", diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj index 5c3a87493c..7612ee032b 100644 --- a/Source/Core/DebuggerWX/DebuggerWX.vcproj +++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="DebuggerWX"
ProjectGUID="{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}"
RootNamespace="DebuggerWX"
@@ -52,7 +52,7 @@ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="4"
/>
<Tool
@@ -85,7 +85,7 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -106,16 +106,20 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\Core\Src;;..\Common\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -148,7 +152,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -172,16 +176,15 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\Core\Src;;..\Common\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__"
RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -214,7 +217,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -239,15 +242,14 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\Core\Src;;..\Common\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -280,7 +282,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -301,17 +303,21 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\Core\Src;;..\Common\Src;..\..\..\Externals\Bochs_disasm"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__"
+ PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="0"
RuntimeLibrary="0"
BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="0"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -378,6 +384,7 @@ RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp index be110880d6..3a156d0f95 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp @@ -48,6 +48,8 @@ #include "Debugger/PPCDebugInterface.h"
#include "Debugger/Debugger_SymbolMap.h"
#include "PowerPC/PPCAnalyst.h"
+#include "PowerPC/FunctionDB.h"
+#include "PowerPC/SignatureDB.h"
#include "PowerPC/PPCTables.h"
#include "PowerPC/Jit64/Jit.h"
#include "PowerPC/Jit64/JitCache.h"
@@ -72,8 +74,9 @@ BEGIN_EVENT_TABLE(CCodeWindow, wxFrame) EVT_MENU(IDM_MEMORYWINDOW, CCodeWindow::OnToggleMemoryWindow)
EVT_MENU(IDM_SCANFUNCTIONS, CCodeWindow::OnSymbolsMenu)
- EVT_MENU(IDM_LOADMAPFILE, CCodeWindow::OnSymbolsMenu)
EVT_MENU(IDM_SAVEMAPFILE, CCodeWindow::OnSymbolsMenu)
+ EVT_MENU(IDM_CREATESIGNATUREFILE, CCodeWindow::OnSymbolsMenu)
+ EVT_MENU(IDM_USESIGNATUREFILE, CCodeWindow::OnSymbolsMenu)
EVT_MENU(IDM_CLEARCODECACHE, CCodeWindow::OnJitMenu)
EVT_MENU(IDM_LOGINSTRUCTIONS, CCodeWindow::OnJitMenu)
@@ -243,9 +246,11 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam {
wxMenu *pSymbolsMenu = new wxMenu;
- pSymbolsMenu->Append(IDM_SCANFUNCTIONS, _T("&Load symbol map"));
+ pSymbolsMenu->Append(IDM_SCANFUNCTIONS, _T("&Load/generate symbol map"));
pSymbolsMenu->Append(IDM_SAVEMAPFILE, _T("&Save symbol map"));
- pSymbolsMenu->Append(IDM_RENAMEFUNCTION, _T("&Rename function..."));
+ pSymbolsMenu->AppendSeparator();
+ pSymbolsMenu->Append(IDM_CREATESIGNATUREFILE, _T("&Create signature file..."));
+ pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _T("&Use signature file..."));
pMenuBar->Append(pSymbolsMenu, _T("&Symbols"));
}
@@ -303,22 +308,51 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) case IDM_SCANFUNCTIONS:
if (!File::Exists(mapfile))
{
- PPCAnalyst::FindFunctions(0x80003100, 0x80400000);
- if (PPCAnalyst::LoadFuncDB("Data/totaldb.dsy"))
- {
- Debugger::GetFromAnalyzer();
- NotifyMapLoaded();
- }
+ g_funcDB.Clear();
+ PPCAnalyst::FindFunctions(0x80000000, 0x80400000, &g_funcDB);
+ SignatureDB db;
+ if (db.Load("data/totaldb.dsy"))
+ db.Apply(&g_funcDB);
+ Debugger::GetFromAnalyzer();
} else {
Debugger::LoadSymbolMap(mapfile.c_str());
+ Debugger::PushMapToFunctionDB(&g_funcDB);
}
+ Host_NotifyMapLoaded();
break;
-// case IDM_LOADMAPFILE:
-// Debugger::LoadSymbolMap(mapfile.c_str());
-// break;
case IDM_SAVEMAPFILE:
Debugger::SaveSymbolMap(mapfile.c_str());
break;
+ case IDM_CREATESIGNATUREFILE:
+ {
+ wxString path = wxFileSelector(
+ _T("Save signature as"), wxEmptyString, wxEmptyString, wxEmptyString,
+ _T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_SAVE,
+ this);
+ if (path) {
+ SignatureDB db;
+ db.Initialize(&g_funcDB);
+ std::string filename(path.ToAscii()); // PPCAnalyst::SaveSignatureDB(
+ db.Save(path.ToAscii());
+ }
+ }
+ break;
+ case IDM_USESIGNATUREFILE:
+ {
+ wxString path = wxFileSelector(
+ _T("Apply signature file"), wxEmptyString, wxEmptyString, wxEmptyString,
+ _T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+ this);
+ if (path) {
+ SignatureDB db;
+ db.Load(path.ToAscii());
+ db.Apply(&g_funcDB);
+ Debugger::Reset();
+ Debugger::GetFromAnalyzer();
+ }
+ }
+ Host_NotifyMapLoaded();
+ break;
}
}
@@ -395,7 +429,7 @@ void CCodeWindow::Update() callstack->Clear();
- std::vector<Debugger::SCallstackEntry>stack;
+ std::vector<Debugger::CallstackEntry> stack;
if (Debugger::GetCallstack(stack))
{
@@ -474,7 +508,7 @@ void CCodeWindow::UpdateButtonStates() void CCodeWindow::OnSymbolListChange(wxCommandEvent& event)
{
int index = symbols->GetSelection();
- Debugger::CSymbol* pSymbol = static_cast<Debugger::CSymbol*>(symbols->GetClientData(index));
+ Debugger::Symbol* pSymbol = static_cast<Debugger::Symbol *>(symbols->GetClientData(index));
if (pSymbol != NULL)
{
diff --git a/Source/Core/DebuggerWX/src/CodeWindow.h b/Source/Core/DebuggerWX/src/CodeWindow.h index 0276a99c60..45e965928e 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.h +++ b/Source/Core/DebuggerWX/src/CodeWindow.h @@ -81,9 +81,10 @@ class CCodeWindow IDM_MEMORYWINDOW,
IDM_SCANFUNCTIONS,
IDM_LOGINSTRUCTIONS,
- IDM_LOADMAPFILE,
IDM_SAVEMAPFILE,
- IDM_RENAMEFUNCTION,
+ IDM_CREATESIGNATUREFILE,
+ IDM_USESIGNATUREFILE,
+ IDM_USESYMBOLFILE,
IDM_CLEARCODECACHE,
};
diff --git a/Source/Core/DebuggerWX/src/MemoryWindow.cpp b/Source/Core/DebuggerWX/src/MemoryWindow.cpp index fac7a46e3a..7e276d8b5a 100644 --- a/Source/Core/DebuggerWX/src/MemoryWindow.cpp +++ b/Source/Core/DebuggerWX/src/MemoryWindow.cpp @@ -167,7 +167,7 @@ void CMemoryWindow::NotifyMapLoaded() void CMemoryWindow::OnSymbolListChange(wxCommandEvent& event)
{
int index = symbols->GetSelection();
- Debugger::CSymbol* pSymbol = static_cast<Debugger::CSymbol*>(symbols->GetClientData(index));
+ Debugger::Symbol* pSymbol = static_cast<Debugger::Symbol*>(symbols->GetClientData(index));
if (pSymbol != NULL)
{
diff --git a/Source/Core/DiscIO/DiscIO.vcproj b/Source/Core/DiscIO/DiscIO.vcproj index 0ae2713654..12330539c5 100644 --- a/Source/Core/DiscIO/DiscIO.vcproj +++ b/Source/Core/DiscIO/DiscIO.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="DiscIO"
ProjectGUID="{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}"
RootNamespace="DiscIO"
@@ -51,7 +51,7 @@ RuntimeLibrary="1"
UsePrecompiledHeader="2"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="4"
ForcedIncludeFiles=""
/>
@@ -84,7 +84,7 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -105,15 +105,19 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories="..\Common\Src"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles=""
/>
@@ -146,7 +150,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -173,9 +177,10 @@ AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles=""
/>
@@ -208,7 +213,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -233,14 +238,13 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\Common\Src"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="0"
UsePrecompiledHeader="2"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles=""
/>
@@ -273,7 +277,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -294,16 +298,16 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\Common\Src"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles=""
/>
@@ -366,6 +370,7 @@ RuntimeLibrary="0"
UsePrecompiledHeader="2"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles=""
/>
@@ -421,7 +426,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -430,7 +435,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -439,7 +444,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -448,7 +453,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -479,7 +484,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -488,7 +493,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -497,7 +502,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -506,7 +511,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -548,7 +553,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -556,7 +561,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -564,7 +569,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -572,7 +577,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -604,7 +609,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -612,7 +617,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -620,7 +625,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -628,7 +633,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -660,7 +665,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -668,7 +673,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -676,7 +681,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -684,7 +689,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -719,7 +724,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -727,7 +732,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -735,7 +740,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -743,7 +748,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -780,7 +785,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -788,7 +793,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -796,7 +801,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -804,7 +809,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -836,7 +841,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -844,7 +849,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -852,7 +857,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -860,7 +865,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -896,7 +901,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -904,7 +909,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -912,7 +917,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -920,7 +925,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -952,7 +957,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -960,7 +965,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -968,7 +973,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -976,7 +981,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1008,7 +1013,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1016,7 +1021,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1024,7 +1029,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1032,7 +1037,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1064,7 +1069,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1072,7 +1077,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1080,7 +1085,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1088,7 +1093,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1121,7 +1126,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1129,7 +1134,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1137,7 +1142,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1145,7 +1150,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index 9b52a08908..c916521fce 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="DolphinWX"
ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
RootNamespace="DolphinWX"
@@ -61,7 +61,7 @@ BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
EnableEnhancedInstructionSet="2"
- FloatingPointModel="2"
+ FloatingPointModel="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -69,7 +69,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles=""
@@ -127,7 +127,7 @@ />
</Configuration>
<Configuration
- Name="Debug|Win32"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -150,23 +150,27 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="WIN32,__WXMSW__,_WINDOWS,NOPCH"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\vc_mswd/toolbar.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\vc_msw/toolbar.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="false"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DiscIO\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerWX\src"
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- TreatWChar_tAsBuiltInType="true"
+ PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="false"
+ FloatingPointModel="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -174,7 +178,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles=""
@@ -184,27 +188,26 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswd;.\..\..\include;.;.\..\..\samples"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\msw;.\..\..\include;.;.\..\..\samples"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/TLBID:1"
- AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
- OutputFile="../../../Binary/Win32/DolphinWxD.exe"
- LinkIncremental="2"
+ AdditionalDependencies="comctl32.lib rpcrt4.lib"
+ OutputFile="../../../Binary/x64/DolphinWx.exe"
+ LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\lib32"
- IgnoreDefaultLibraryNames=""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2"
BaseAddress="0x00400000"
- TargetMachine="1"
+ TargetMachine="17"
+ FixedBaseAddress="1"
/>
<Tool
Name="VCALinkTool"
@@ -218,7 +221,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswd/toolbar.bsc"
+ OutputFile=".\vc_msw/toolbar.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -234,7 +237,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -257,26 +260,24 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,__WXMSW__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="WIN32,_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\vc_msw/toolbar.tlb"
+ TypeLibraryName=".\vc_mswd/toolbar.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
- Optimization="2"
- InlineFunctionExpansion="1"
- FavorSizeOrSpeed="1"
+ Optimization="0"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DiscIO\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerWX\src"
- PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
FloatingPointModel="0"
+ TreatWChar_tAsBuiltInType="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -284,7 +285,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles=""
@@ -294,24 +295,25 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\msw;.\..\..\include;.;.\..\..\samples"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswd;.\..\..\include;.;.\..\..\samples"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/TLBID:1"
AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
- OutputFile="../../../Binary/Win32/DolphinWxDF.exe"
- LinkIncremental="1"
+ OutputFile="../../../Binary/Win32/DolphinWxD.exe"
+ LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\lib32"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2"
- LargeAddressAware="1"
BaseAddress="0x00400000"
TargetMachine="1"
/>
@@ -327,7 +329,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_msw/toolbar.bsc"
+ OutputFile=".\vc_mswd/toolbar.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -343,7 +345,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -366,27 +368,24 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,__WXMSW__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="WIN32,_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
- TypeLibraryName=".\vc_msw/toolbar.tlb"
+ TypeLibraryName=".\vc_mswd/toolbar.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="false"
+ Optimization="0"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DiscIO\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerWX\src"
- PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="false"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ FloatingPointModel="0"
+ TreatWChar_tAsBuiltInType="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -394,6 +393,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles=""
@@ -403,26 +403,27 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\msw;.\..\..\include;.;.\..\..\samples"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswd;.\..\..\include;.;.\..\..\samples"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib rpcrt4.lib"
- OutputFile="../../../Binary/x64/DolphinWx.exe"
- LinkIncremental="1"
+ AdditionalOptions="/TLBID:1"
+ AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
+ OutputFile="../../../Binary/x64/DolphinWxD.exe"
+ LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2"
BaseAddress="0x00400000"
TargetMachine="17"
- FixedBaseAddress="1"
/>
<Tool
Name="VCALinkTool"
@@ -436,7 +437,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_msw/toolbar.bsc"
+ OutputFile=".\vc_mswd/toolbar.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -452,7 +453,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
@@ -475,23 +476,27 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32,_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="WIN32,__WXMSW__,_WINDOWS,NOPCH"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\vc_mswd/toolbar.tlb"
+ TargetEnvironment="1"
+ TypeLibraryName=".\vc_msw/toolbar.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DiscIO\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\DebuggerWX\src"
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- TreatWChar_tAsBuiltInType="true"
+ PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -499,6 +504,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles=""
@@ -508,27 +514,26 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG,__WXMSW__,__WXDEBUG__,_WINDOWS,NOPCH"
+ PreprocessorDefinitions="__WXMSW__,_WINDOWS,NOPCH"
Culture="1033"
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswd;.\..\..\include;.;.\..\..\samples"
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\msw;.\..\..\include;.;.\..\..\samples"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/TLBID:1"
AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib"
- OutputFile="../../../Binary/x64/DolphinWxD.exe"
- LinkIncremental="2"
+ OutputFile="../../../Binary/Win32/DolphinWxDF.exe"
+ LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""
- IgnoreDefaultLibraryNames=""
+ AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\lib32"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2"
+ LargeAddressAware="1"
BaseAddress="0x00400000"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -542,7 +547,7 @@ <Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\vc_mswd/toolbar.bsc"
+ OutputFile=".\vc_msw/toolbar.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -600,6 +605,7 @@ StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
+ FloatingPointModel="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -607,6 +613,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
WarningLevel="4"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles=""
@@ -879,7 +886,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -887,7 +894,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -895,7 +902,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -903,7 +910,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj index 32cb23a248..abbae9310c 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcproj +++ b/Source/Core/VideoCommon/VideoCommon.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="VideoCommon"
ProjectGUID="{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}"
RootNamespace="VideoCommon"
@@ -48,9 +48,10 @@ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="4"
/>
<Tool
@@ -82,12 +83,11 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -103,15 +103,20 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -143,7 +148,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -170,9 +175,10 @@ AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -204,11 +210,12 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -228,14 +235,13 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -267,7 +273,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
@@ -288,15 +294,16 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
@@ -356,8 +363,10 @@ AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
+ BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
diff --git a/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj b/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj index 5329d36716..dd85b958b3 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj +++ b/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Plugin_DSP_HLE"
ProjectGUID="{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}"
RootNamespace="Plugin_DSP"
@@ -49,10 +49,11 @@ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
ForcedIncludeFiles="stdafx.h"
@@ -104,7 +105,7 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -125,23 +126,21 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
@@ -158,15 +157,14 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
- OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_HLE.dll"
- LinkIncremental="1"
+ OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLED.dll"
+ LinkIncremental="2"
GenerateManifest="false"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/DSP_HLE.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -194,7 +192,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -227,11 +225,12 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
RuntimeLibrary="0"
BufferSecurityCheck="false"
- FloatingPointModel="2"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
@@ -284,7 +283,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -309,15 +308,20 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../Core/Common/Src;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
@@ -334,12 +338,13 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
- OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLED.dll"
- LinkIncremental="2"
+ OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLE.dll"
+ LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/DSP_HLE.pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib"
TargetMachine="17"
/>
@@ -369,7 +374,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -390,7 +395,6 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -403,10 +407,12 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
RuntimeLibrary="0"
BufferSecurityCheck="false"
- FloatingPointModel="2"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
@@ -423,7 +429,7 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
- OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_HLE.dll"
+ OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_HLE.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
@@ -431,7 +437,7 @@ OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/DSP_HLE.lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -493,10 +499,11 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
RuntimeLibrary="0"
BufferSecurityCheck="false"
- FloatingPointModel="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
@@ -652,7 +659,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -660,7 +667,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -762,7 +769,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -770,7 +777,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -778,7 +785,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -786,7 +793,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj b/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj index 68537aa47c..e703ea5cf3 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj +++ b/Source/Plugins/Plugin_DSP_LLE/Plugin_DSP_LLE.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Plugin_DSP_LLE"
ProjectGUID="{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}"
RootNamespace="Plugin_DSP_LLE"
@@ -52,7 +52,7 @@ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="4"
ForcedIncludeFiles="stdafx.h"
/>
@@ -103,12 +103,13 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
+ ManagedExtensions="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -124,21 +125,20 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../Core/Common/Src;../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -154,16 +154,15 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
- OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLE.dll"
- LinkIncremental="1"
+ OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LLED.dll"
+ LinkIncremental="2"
GenerateManifest="false"
GenerateDebugInformation="true"
+ AssemblyDebug="1"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -191,7 +190,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -221,12 +220,13 @@ FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../Core/Common/Src;../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
RuntimeLibrary="0"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -242,7 +242,7 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
- OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLEDF.dll"
+ OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLE.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
@@ -279,7 +279,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -305,15 +305,18 @@ />
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
AdditionalIncludeDirectories="../../Core/Common/Src;../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
- MinimalRebuild="false"
- BasicRuntimeChecks="0"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
+ RuntimeLibrary="0"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -329,13 +332,14 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
- OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LLED.dll"
- LinkIncremental="2"
+ OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LEE.dll"
+ LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
- AssemblyDebug="1"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17"
/>
@@ -365,13 +369,12 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
- ManagedExtensions="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -387,7 +390,6 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -397,11 +399,13 @@ FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="../../Core/Common/Src;../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST"
RuntimeLibrary="0"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -417,7 +421,7 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dsound.lib"
- OutputFile="../../../Binary/x64/Plugins/Plugin_DSP_LEE.dll"
+ OutputFile="../../../Binary/Win32/Plugins/Plugin_DSP_LLEDF.dll"
LinkIncremental="1"
GenerateManifest="false"
GenerateDebugInformation="true"
@@ -426,7 +430,7 @@ OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -491,6 +495,7 @@ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
@@ -734,7 +739,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -742,7 +747,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -750,7 +755,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -758,7 +763,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/Source/Plugins/Plugin_PadDX9/Plugin_PadDX9.vcproj b/Source/Plugins/Plugin_PadDX9/Plugin_PadDX9.vcproj index f2669dfb1b..df5498fe42 100644 --- a/Source/Plugins/Plugin_PadDX9/Plugin_PadDX9.vcproj +++ b/Source/Plugins/Plugin_PadDX9/Plugin_PadDX9.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Plugin_PadDX9"
ProjectGUID="{805B34AA-82A5-4875-8DC7-3C85BDC0BCEE}"
RootNamespace="Plugin_PadDX9"
@@ -58,7 +58,7 @@ RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -66,7 +66,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
/>
@@ -118,7 +118,7 @@ />
</Configuration>
<Configuration
- Name="Debug|Win32"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -141,37 +141,40 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/Pad_DirectX9.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Release/Pad_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="0"
+ UsePrecompiledHeader="1"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1053"
/>
<Tool
@@ -180,14 +183,13 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib odbc32.lib odbccp32.lib"
- OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadDX9D.dll"
- LinkIncremental="2"
+ OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadDX9.dll"
+ LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/Pad_DirectX9.pdb"
- ImportLibrary=".\Debug/Pad_DirectX9.lib"
- TargetMachine="1"
+ ProgramDatabaseFile=".\Release/Pad_DirectX9.pdb"
+ ImportLibrary=".\Release/Pad_DirectX9.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -215,9 +217,9 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug|Win32"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -238,41 +240,38 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/Pad_DirectX9.tlb"
+ TypeLibraryName=".\Debug/Pad_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
- UsePrecompiledHeader="1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ FloatingPointModel="0"
+ UsePrecompiledHeader="0"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1053"
/>
<Tool
@@ -281,12 +280,13 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib odbc32.lib odbccp32.lib"
- OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadDX9.dll"
- LinkIncremental="1"
+ OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadDX9D.dll"
+ LinkIncremental="2"
SuppressStartupBanner="true"
GenerateManifest="false"
- ProgramDatabaseFile=".\Release/Pad_DirectX9.pdb"
- ImportLibrary=".\Release/Pad_DirectX9.lib"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/Pad_DirectX9.pdb"
+ ImportLibrary=".\Debug/Pad_DirectX9.lib"
TargetMachine="1"
/>
<Tool
@@ -315,7 +315,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -338,39 +338,38 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
- TypeLibraryName=".\Release/Pad_DirectX9.tlb"
+ TypeLibraryName=".\Debug/Pad_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
- UsePrecompiledHeader="1"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ FloatingPointModel="0"
+ UsePrecompiledHeader="0"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1053"
/>
<Tool
@@ -379,12 +378,13 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib odbc32.lib odbccp32.lib"
- OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadDX9.dll"
+ OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadDX9D.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- ProgramDatabaseFile=".\Release/Pad_DirectX9.pdb"
- ImportLibrary=".\Release/Pad_DirectX9.lib"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/Pad_DirectX9.pdb"
+ ImportLibrary=".\Debug/Pad_DirectX9.lib"
TargetMachine="17"
/>
<Tool
@@ -413,9 +413,9 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="DebugFast|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -436,27 +436,32 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/Pad_DirectX9.tlb"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/Pad_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="0"
+ UsePrecompiledHeader="1"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
/>
@@ -465,7 +470,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1053"
/>
<Tool
@@ -474,14 +479,13 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib odbc32.lib odbccp32.lib"
- OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadDX9D.dll"
+ OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadDX9.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/Pad_DirectX9.pdb"
- ImportLibrary=".\Debug/Pad_DirectX9.lib"
- TargetMachine="17"
+ ProgramDatabaseFile=".\Release/Pad_DirectX9.pdb"
+ ImportLibrary=".\Release/Pad_DirectX9.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -549,7 +553,7 @@ RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -557,6 +561,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
/>
<Tool
@@ -679,17 +684,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_DIRECTX9_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -698,12 +693,13 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_DIRECTX9_EXPORTS;$(NoInherit)"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_DIRECTX9_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
@@ -717,6 +713,15 @@ />
</FileConfiguration>
<FileConfiguration
+ Name="DebugFast|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_DIRECTX9_EXPORTS;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="DebugFast|x64"
>
<Tool
diff --git a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj index 397b1720b7..b74fb33cc0 100644 --- a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj +++ b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Plugin_PadSimple"
ProjectGUID="{9A183B48-ECC2-4121-876A-9B3793686073}"
RootNamespace="Plugin_PadSimple"
@@ -59,7 +59,7 @@ BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="2"
- FloatingPointModel="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -67,7 +67,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
@@ -120,7 +120,7 @@ />
</Configuration>
<Configuration
- Name="Debug|Win32"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -143,20 +143,26 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/Pad_Simple.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Release/Pad_Simple.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs;../../Core/Common/Src"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -164,9 +170,8 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
@@ -174,7 +179,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1053"
/>
<Tool
@@ -183,14 +188,13 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib"
- OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimpleD.dll"
- LinkIncremental="2"
+ OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadSimple.dll"
+ LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -218,7 +222,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -241,25 +245,21 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/Pad_Simple.tlb"
+ TypeLibraryName=".\Debug/Pad_Simple.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs;../../Core/Common/Src"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;DEBUGFAST"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="2"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -267,9 +267,9 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
@@ -277,7 +277,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1053"
/>
<Tool
@@ -286,10 +286,11 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib"
- OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimpleDF.dll"
- LinkIncremental="1"
+ OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimpleD.dll"
+ LinkIncremental="2"
SuppressStartupBanner="true"
GenerateManifest="false"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1"
@@ -320,7 +321,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -343,26 +344,21 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
- TypeLibraryName=".\Release/Pad_Simple.tlb"
+ TypeLibraryName=".\Debug/Pad_Simple.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs;../../Core/Common/Src"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -370,7 +366,9 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
@@ -378,7 +376,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1053"
/>
<Tool
@@ -387,10 +385,11 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib"
- OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadSimple.dll"
+ OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadSimpleD.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17"
@@ -421,7 +420,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -444,20 +443,25 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/Pad_Simple.tlb"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/Pad_Simple.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../Externals/WTL80;../../PluginSpecs;../../Core/Common/Src"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;DEBUGFAST"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -465,6 +469,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
@@ -474,7 +479,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1053"
/>
<Tool
@@ -483,14 +488,13 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dxguid.lib dxerr9.lib dinput8.lib xinput.lib"
- OutputFile="..\..\..\Binary\x64\plugins\Plugin_PadSimpleD.dll"
+ OutputFile="..\..\..\Binary\Win32/plugins\Plugin_PadSimpleDF.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -560,7 +564,7 @@ BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
+ FloatingPointModel="0"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
@@ -568,6 +572,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
ForcedIncludeFiles="stdafx.h"
/>
@@ -662,17 +667,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -681,12 +676,13 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
@@ -700,6 +696,15 @@ />
</FileConfiguration>
<FileConfiguration
+ Name="DebugFast|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="DebugFast|x64"
>
<Tool
@@ -739,17 +744,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DebugFast|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -758,12 +753,13 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
@@ -777,6 +773,15 @@ />
</FileConfiguration>
<FileConfiguration
+ Name="DebugFast|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="DebugFast|x64"
>
<Tool
@@ -804,44 +809,44 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"
+ Optimization="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
+ BasicRuntimeChecks="3"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
- BasicRuntimeChecks="3"
+ Optimization="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;PAD_SIMPLE_EXPORTS;$(NoInherit)"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj index 04fb918a3a..0ea331d0b7 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Plugin_VideoDX9"
ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
RootNamespace="Plugin_VideoDX9"
@@ -63,6 +63,7 @@ RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
@@ -71,7 +72,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -126,7 +127,7 @@ />
</Configuration>
<Configuration
- Name="Debug|Win32"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -134,6 +135,7 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -149,20 +151,30 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/Video_DirectX9.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Release/Video_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="false"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;"
- PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
+ ExceptionHandling="1"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)/Video_DirectX9.pch"
@@ -170,9 +182,9 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
CompileAs="0"
ForcedIncludeFiles="stdafx.h"
/>
@@ -181,7 +193,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1053"
/>
<Tool
@@ -189,16 +201,14 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalOptions=""..\..\core\common\win32\debug\common.lib""
AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"
- OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9D.dll"
+ OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoDX9.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -226,7 +236,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -234,7 +244,6 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -250,28 +259,20 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/Video_DirectX9.tlb"
+ TypeLibraryName=".\Debug/Video_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="false"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;"
- PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
+ PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)/Video_DirectX9.pch"
@@ -279,9 +280,9 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
CompileAs="0"
ForcedIncludeFiles="stdafx.h"
/>
@@ -290,7 +291,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1053"
/>
<Tool
@@ -298,12 +299,13 @@ />
<Tool
Name="VCLinkerTool"
+ AdditionalOptions=""..\..\core\common\win32\debug\common.lib""
AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"
- OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9DF.dll"
+ OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9D.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- IgnoreDefaultLibraryNames="LIBCMTD.lib"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="1"
@@ -334,7 +336,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -342,7 +344,6 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -358,30 +359,20 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
- TypeLibraryName=".\Release/Video_DirectX9.tlb"
+ TypeLibraryName=".\Debug/Video_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="false"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- StringPooling="true"
- ExceptionHandling="1"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="false"
- EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)/Video_DirectX9.pch"
@@ -389,6 +380,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -399,7 +391,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1053"
/>
<Tool
@@ -408,10 +400,11 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"
- OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoDX9.dll"
+ OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoDX9D.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17"
@@ -442,7 +435,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -450,6 +443,7 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -465,20 +459,29 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/Video_DirectX9.tlb"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/Video_DirectX9.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="false"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;VIDEO_DIRECTX9_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile="$(IntDir)/Video_DirectX9.pch"
@@ -486,6 +489,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -496,7 +500,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1053"
/>
<Tool
@@ -505,14 +509,14 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="dsound.lib odbc32.lib odbccp32.lib comctl32.lib d3d9.lib d3dx9.lib winmm.lib"
- OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoDX9D.dll"
+ OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoDX9DF.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
- GenerateDebugInformation="true"
+ IgnoreDefaultLibraryNames="LIBCMTD.lib"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -595,6 +599,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -681,7 +686,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -691,7 +696,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -701,7 +706,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -711,7 +716,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -749,7 +754,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -759,7 +764,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -769,7 +774,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -779,7 +784,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -817,7 +822,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -827,7 +832,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -837,7 +842,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -847,7 +852,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -886,7 +891,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -897,7 +902,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -908,7 +913,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -919,7 +924,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -960,7 +965,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -971,7 +976,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -982,7 +987,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -993,7 +998,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1034,7 +1039,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1045,7 +1050,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1056,7 +1061,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1067,7 +1072,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1107,7 +1112,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1117,7 +1122,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1127,7 +1132,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1137,7 +1142,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1175,7 +1180,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1185,7 +1190,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1195,7 +1200,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1205,7 +1210,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1495,7 +1500,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1504,7 +1509,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1513,7 +1518,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -1522,7 +1527,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp b/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp index 914acd7f29..d9bdc337da 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/OpcodeDecoding.cpp @@ -38,6 +38,14 @@ extern int FAKE_GetFifoSize(); CDataReader_Fifo g_fifoReader;
+template <class T>
+void Xchg(T& a, T&b)
+{
+ T c = a;
+ a = b;
+ b = c;
+}
+
void ExecuteDisplayList(u32 address, u32 size)
{
IDataReader* pOldReader = g_pDataReader;
@@ -46,11 +54,24 @@ void ExecuteDisplayList(u32 address, u32 size) CDataReader_Memory memoryReader(address);
g_pDataReader = &memoryReader;
+ // temporarily swap dl and non-dl(small "hack" for the stats)
+ Xchg(stats.thisFrame.numDLPrims,stats.thisFrame.numPrims);
+ Xchg(stats.thisFrame.numXFLoadsInDL,stats.thisFrame.numXFLoads);
+ Xchg(stats.thisFrame.numCPLoadsInDL,stats.thisFrame.numCPLoads);
+ Xchg(stats.thisFrame.numBPLoadsInDL,stats.thisFrame.numBPLoads);
+
while((memoryReader.GetReadAddress() - address) < size)
{
Decode();
}
- INCSTAT(stats.numDListsAlive);
+
+ // un-swap
+ Xchg(stats.thisFrame.numDLPrims,stats.thisFrame.numPrims);
+ Xchg(stats.thisFrame.numXFLoadsInDL,stats.thisFrame.numXFLoads);
+ Xchg(stats.thisFrame.numCPLoadsInDL,stats.thisFrame.numCPLoads);
+ Xchg(stats.thisFrame.numBPLoadsInDL,stats.thisFrame.numBPLoads);
+
+ INCSTAT(stats.numDListsCalled);
// reset to the old reader
g_pDataReader = pOldReader;
}
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj index 75f44e0627..a33c162276 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="Plugin_VideoOGL"
ProjectGUID="{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}"
RootNamespace="Plugin_VideoOGL"
@@ -62,6 +62,7 @@ RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="2"
FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Globals.h"
@@ -70,7 +71,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -125,7 +126,7 @@ />
</Configuration>
<Configuration
- Name="Debug|Win32"
+ Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -133,6 +134,7 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -148,56 +150,67 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/VideoOGL.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Release/VideoOGL.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="false"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"
- PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ StringPooling="true"
+ ExceptionHandling="1"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Globals.h"
- PrecompiledHeaderFile="$(IntDir)/Globals.pch"
+ PrecompiledHeaderFile="$(IntDir)/VideoOGL.pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1053"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib"
- OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoOGLD.dll"
+ AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib rpcrt4.lib glew64s.lib"
+ OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGL.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
+ AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
GenerateManifest="false"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="1"
+ TargetMachine="17"
+ FixedBaseAddress="1"
/>
<Tool
Name="VCALinkTool"
@@ -225,7 +238,7 @@ />
</Configuration>
<Configuration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -233,7 +246,6 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
- WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -249,27 +261,20 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/VideoOGL.tlb"
+ TypeLibraryName=".\Debug/VideoOGL.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- OmitFramePointers="true"
- WholeProgramOptimization="false"
+ Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"
- PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"
- StringPooling="true"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
- FloatingPointModel="2"
+ PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Globals.h"
PrecompiledHeaderFile="$(IntDir)/Globals.pch"
@@ -277,7 +282,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
- WarnAsError="true"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -288,7 +293,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -296,13 +301,12 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib"
- OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoOGLDF.dll"
+ AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib"
+ OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoOGLD.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
GenerateManifest="false"
- IgnoreDefaultLibraryNames="LIBCMTD.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
ImportLibrary="$(TargetDir)$(TargetName).lib"
@@ -334,7 +338,7 @@ />
</Configuration>
<Configuration
- Name="Release|x64"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -342,7 +346,6 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -358,30 +361,20 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
- TypeLibraryName=".\Release/VideoOGL.tlb"
+ TypeLibraryName=".\Debug/VideoOGL.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="3"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="false"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- StringPooling="true"
- ExceptionHandling="1"
- RuntimeLibrary="0"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="false"
- EnableEnhancedInstructionSet="0"
- FloatingPointModel="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Globals.h"
PrecompiledHeaderFile="$(IntDir)/VideoOGL.pch"
@@ -389,6 +382,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -399,7 +393,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1053"
/>
<Tool
@@ -407,17 +401,17 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib rpcrt4.lib glew64s.lib"
- OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGL.dll"
+ AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib glew64s.lib rpcrt4.lib"
+ OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGLD.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
GenerateManifest="false"
- GenerateDebugInformation="false"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ LargeAddressAware="1"
ImportLibrary="$(TargetDir)$(TargetName).lib"
TargetMachine="17"
- FixedBaseAddress="1"
/>
<Tool
Name="VCALinkTool"
@@ -445,7 +439,7 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
@@ -453,6 +447,7 @@ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
+ WholeProgramOptimization="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -468,56 +463,65 @@ />
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/VideoOGL.tlb"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/VideoOGL.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="3"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ OmitFramePointers="true"
+ WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ EnableEnhancedInstructionSet="2"
+ FloatingPointModel="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Globals.h"
- PrecompiledHeaderFile="$(IntDir)/VideoOGL.pch"
+ PrecompiledHeaderFile="$(IntDir)/Globals.pch"
AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
- ForcedIncludeFiles="stdafx.h"
+ ForcedIncludeFiles=""
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1053"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib glew64s.lib rpcrt4.lib"
- OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGLD.dll"
+ AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib"
+ OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoOGLDF.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
+ AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"
GenerateManifest="false"
+ IgnoreDefaultLibraryNames="LIBCMTD.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- LargeAddressAware="1"
ImportLibrary="$(TargetDir)$(TargetName).lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -600,6 +604,7 @@ ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
+ WarnAsError="false"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
@@ -672,7 +677,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -680,7 +685,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -688,7 +693,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -696,7 +701,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -860,7 +865,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -868,7 +873,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -876,7 +881,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -884,7 +889,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -925,7 +930,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -933,7 +938,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -941,7 +946,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
@@ -949,7 +954,7 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -989,15 +994,17 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
- Name="DebugFast|Win32"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1005,17 +1012,15 @@ />
</FileConfiguration>
<FileConfiguration
- Name="Release|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
|