ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fixing plus some cleanup i had been doing 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6969 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2011-01-29 15:58:50 +00:00
parent a22d807bf0
commit 1f8a1f8560
16 changed files with 203 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

356
Source/Core/Core/Core.vcproj
View File

@ -45,7 +45,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Src;.\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -116,7 +116,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=".\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Src;.\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -191,7 +191,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
AdditionalIncludeDirectories=".\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Src;.\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -269,7 +269,7 @@
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories=".\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Src;.\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -344,7 +344,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
AdditionalIncludeDirectories=".\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Src;.\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="true" BufferSecurityCheck="true"
@ -419,7 +419,7 @@
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
EnableFiberSafeOptimizations="false" EnableFiberSafeOptimizations="false"
AdditionalIncludeDirectories=".\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include" AdditionalIncludeDirectories=".\Src;.\Core\Core\Src;.\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\AudioCommon\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib;..\..\..\Externals\Lua;..\..\..\Externals\SFML\include"
PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" PreprocessorDefinitions="NDEBUG;_LIB;DEBUGFAST;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
RuntimeLibrary="0" RuntimeLibrary="0"
BufferSecurityCheck="false" BufferSecurityCheck="false"
@ -509,174 +509,6 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="JIT"
>
<File
RelativePath=".\Src\DSP\DSPEmitter.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPEmitter.h"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitArithmetic.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitLoadStore.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitCCUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitExtOps.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitBranch.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitMisc.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitMultiplier.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitRegCache.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitRegCache.h"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitUtil.h"
>
</File>
</Filter>
<File
RelativePath=".\Src\DSP\assemble.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\assemble.h"
>
</File>
<File
RelativePath=".\Src\DSP\disassemble.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\disassemble.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAccelerator.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAccelerator.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAnalyzer.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAnalyzer.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPBreakpoints.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCodeUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCodeUtil.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCommon.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCore.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCore.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHost.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHWInterface.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHWInterface.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPInterpreter.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPInterpreter.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPMemoryMap.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPMemoryMap.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPStacks.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPStacks.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPTables.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPTables.h"
>
</File>
<File
RelativePath=".\Src\DSP\LabelMap.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\LabelMap.h"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
<Filter <Filter
Name="HLE" Name="HLE"
> >
@ -942,10 +774,6 @@
RelativePath=".\Src\HW\DSPHLE\DSPHLE.h" RelativePath=".\Src\HW\DSPHLE\DSPHLE.h"
> >
</File> </File>
<File
RelativePath=".\Src\HW\DSPHLE\DSPHLEGlobals.h"
>
</File>
<File <File
RelativePath=".\Src\HW\DSPHLE\HLEMixer.cpp" RelativePath=".\Src\HW\DSPHLE\HLEMixer.cpp"
> >
@ -1901,6 +1729,174 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="DSPEmu"
>
<File
RelativePath=".\Src\DSP\assemble.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\assemble.h"
>
</File>
<File
RelativePath=".\Src\DSP\disassemble.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\disassemble.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAccelerator.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAccelerator.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAnalyzer.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPAnalyzer.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPBreakpoints.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCodeUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCodeUtil.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCommon.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCore.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPCore.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHost.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHWInterface.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPHWInterface.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPInterpreter.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPInterpreter.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPMemoryMap.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPMemoryMap.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPStacks.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPStacks.h"
>
</File>
<File
RelativePath=".\Src\DSP\DSPTables.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPTables.h"
>
</File>
<File
RelativePath=".\Src\DSP\LabelMap.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\LabelMap.h"
>
</File>
<Filter
Name="JIT"
>
<File
RelativePath=".\Src\DSP\DSPEmitter.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\DSPEmitter.h"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitArithmetic.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitBranch.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitCCUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitExtOps.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitLoadStore.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitMisc.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitMultiplier.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitRegCache.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitRegCache.h"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DSP\Jit\DSPJitUtil.h"
>
</File>
</Filter>
</Filter>
<File <File
RelativePath=".\CMakeLists.txt" RelativePath=".\CMakeLists.txt"
> >
@ -1997,6 +1993,10 @@
RelativePath=".\Src\SConscript" RelativePath=".\Src\SConscript"
> >
</File> </File>
<File
RelativePath=".\Src\SConscript"
>
</File>
<File <File
RelativePath=".\Src\State.cpp" RelativePath=".\Src\State.cpp"
> >

2
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.cpp
View File

@ -17,8 +17,6 @@
#include <iostream> #include <iostream>
#include "DSPHLEGlobals.h" // Local
#include "ChunkFile.h" #include "ChunkFile.h"
#include "IniFile.h" #include "IniFile.h"
#include "HLEMixer.h" #include "HLEMixer.h"

1
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
View File

@ -20,7 +20,6 @@
#include "AudioCommon.h" #include "AudioCommon.h"
#include "SoundStream.h" #include "SoundStream.h"
#include "DSPHLEGlobals.h" // Local
#include "MailHandler.h" #include "MailHandler.h"
#include "../../PluginDSP.h" #include "../../PluginDSP.h"

51
Source/Core/Core/Src/HW/DSPHLE/DSPHLEGlobals.h
View File

@ -1,51 +0,0 @@
// Copyright (C) 2003 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/
// TODO: Get rid of this file.
#ifndef _GLOBALS_H
#define _GLOBALS_H
#include "Common.h"
#include "StringUtil.h"
#include "../Memmap.h"
inline u8 HLEMemory_Read_U8(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Memory::m_pRAM[_uAddress];
}
inline u16 HLEMemory_Read_U16(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap16(*(u16*)&Memory::m_pRAM[_uAddress]);
}
inline u32 HLEMemory_Read_U32(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap32(*(u32*)&Memory::m_pRAM[_uAddress]);
}
inline void* HLEMemory_Get_Pointer(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return &Memory::m_pRAM[_uAddress];
}
#endif

1
Source/Core/Core/Src/HW/DSPHLE/HLEMixer.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "DSPHLEGlobals.h"
#include "DSPHLE.h" #include "DSPHLE.h"
#include "HLEMixer.h" #include "HLEMixer.h"
#include "UCodes/UCodes.h" #include "UCodes/UCodes.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
View File

@ -19,7 +19,6 @@
#include "StringUtil.h" // For StringFromFormat() #include "StringUtil.h" // For StringFromFormat()
#include <sstream> #include <sstream>
#include "../DSPHLEGlobals.h"
#include "Mixer.h" #include "Mixer.h"
#include "../MailHandler.h" #include "../MailHandler.h"
#include "../../DSP.h" #include "../../DSP.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_ADPCM.h
View File

@ -18,7 +18,6 @@
#ifndef _UCODE_AX_ADPCM_H #ifndef _UCODE_AX_ADPCM_H
#define _UCODE_AX_ADPCM_H #define _UCODE_AX_ADPCM_H
#include "../DSPHLEGlobals.h"
#include "../../DSP.h" #include "../../DSP.h"
inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16 frac) inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16 frac)

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "../DSPHLE.h" #include "../DSPHLE.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_CARD.h" #include "UCode_CARD.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_GBA.h" #include "UCode_GBA.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_InitAudioSystem.h" #include "UCode_InitAudioSystem.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_ROM.cpp
View File

@ -15,7 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_ROM.h" #include "UCode_ROM.h"
#include "Hash.h" #include "Hash.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
View File

@ -19,7 +19,6 @@
// Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess, // Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess,
// Super Mario Galaxy // Super Mario Galaxy
#include "../DSPHLEGlobals.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_Zelda.h" #include "UCode_Zelda.h"
#include "../MailHandler.h" #include "../MailHandler.h"

1
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
View File

@ -17,7 +17,6 @@
#include <math.h> #include <math.h>
#include "../DSPHLEGlobals.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_Zelda.h" #include "UCode_Zelda.h"
#include "AudioCommon.h" #include "AudioCommon.h"

2
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
View File

@ -17,11 +17,9 @@
#include <sstream> #include <sstream>
#include "../DSPHLEGlobals.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_Zelda.h" #include "UCode_Zelda.h"
// #include "../main.h"
#include "AudioCommon.h" #include "AudioCommon.h"
#include "Mixer.h" #include "Mixer.h"
#include "../../Memmap.h" #include "../../Memmap.h"

2
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.cpp
View File

@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "../DSPHLEGlobals.h"
#include "UCodes.h" #include "UCodes.h"
#include "UCode_AX.h" #include "UCode_AX.h"

25
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCodes.h
View File

@ -23,12 +23,37 @@
#include "Thread.h" #include "Thread.h"
#include "../DSPHLE.h" #include "../DSPHLE.h"
#include "../../Memmap.h"
#define UCODE_ROM 0x0000000 #define UCODE_ROM 0x0000000
#define UCODE_INIT_AUDIO_SYSTEM 0x0000001 #define UCODE_INIT_AUDIO_SYSTEM 0x0000001
class CMailHandler; class CMailHandler;
inline u8 HLEMemory_Read_U8(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Memory::m_pRAM[_uAddress];
}
inline u16 HLEMemory_Read_U16(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap16(*(u16*)&Memory::m_pRAM[_uAddress]);
}
inline u32 HLEMemory_Read_U32(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return Common::swap32(*(u32*)&Memory::m_pRAM[_uAddress]);
}
inline void* HLEMemory_Get_Pointer(u32 _uAddress)
{
_uAddress &= Memory::RAM_MASK;
return &Memory::m_pRAM[_uAddress];
}
class IUCode class IUCode
{ {
public: public: