Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove x86disasm, experiment with build order

Browse Source
This commit is contained in:
Henrik Rydgard committed 2012-11-20 00:48:13 +01:00
1 parent 8a6d151df5
commit 45d42f09a1
6 files changed
+2 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/CMakeLists.txt
+1 -1
View File
@@ -22,7 +22,7 @@ set(SRCS
if (ARM)
set(SRCS ${SRCS} ArmEmitter.cpp ArmABI.cpp)
else()
set(SRCS ${SRCS} CPUDetect.cpp MathUtil.cpp Thunk.cpp x64Analyzer.cpp x64Emitter.cpp x86Disasm.cpp ABI.cpp)
set(SRCS ${SRCS} CPUDetect.cpp MathUtil.cpp Thunk.cpp x64Analyzer.cpp x64Emitter.cpp ABI.cpp)
endif (ARM)
set(SRCS ${SRCS})
Common/Common.vcxproj
-2
View File
@@ -193,7 +193,6 @@
<ClInclude Include="Timer.h" />
<ClInclude Include="x64Analyzer.h" />
<ClInclude Include="x64Emitter.h" />
<ClInclude Include="x86Disasm.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@@ -243,7 +242,6 @@
<ClCompile Include="Version.cpp" />
<ClCompile Include="x64Analyzer.cpp" />
<ClCompile Include="x64Emitter.cpp" />
<ClCompile Include="x86Disasm.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />
Common/Common.vcxproj.filters
-2
View File
@@ -43,7 +43,6 @@
<ClInclude Include="x64Emitter.h" />
<ClInclude Include="ArmEmitter.h" />
<ClInclude Include="ArmABI.h" />
<ClInclude Include="x86Disasm.h" />
<ClInclude Include="Action.h" />
<ClInclude Include="FixedSizeUnorderedSet.h" />
</ItemGroup>
@@ -73,7 +72,6 @@
<ClCompile Include="x64Emitter.cpp" />
<ClCompile Include="ArmEmitter.cpp" />
<ClCompile Include="ArmABI.cpp" />
<ClCompile Include="x86Disasm.cpp" />
<ClCompile Include="Action.cpp" />
<ClCompile Include="ThunkArm.cpp" />
</ItemGroup>
Core/MIPS/x86/JitCache.cpp
-20
View File
@@ -44,8 +44,6 @@
#include "Asm.h"
// #include "JitBase.h"
#include "x86Disasm.h"
#if defined USE_OPROFILE && USE_OPROFILE
#include <opagent.h>
@@ -267,24 +265,6 @@ CompiledCode JitBlockCache::GetCompiledCodeFromBlock(int block_num)
return (CompiledCode)blockCodePointers[block_num];
}
std::string JitBlockCache::GetCompiledDisassembly(int block_num)
{
#ifndef __APPLE__
std::string buf;
const u8 *ptr = blockCodePointers[block_num];
while (ptr < blockCodePointers[block_num] + blocks[block_num].codeSize)
{
int len;
buf += std::string(disasmx86((unsigned char*)ptr, 0, &len)) + "\n";
ptr += len;
}
return buf;
#else
return "disasm not available";
#endif
}
//Block linker
Core/MIPS/x86/JitCache.h
-2
View File
@@ -130,8 +130,6 @@ public:
void InvalidateICache(u32 address, const u32 length);
void DestroyBlock(int block_num, bool invalidate);
std::string GetCompiledDisassembly(int block_num);
// Not currently used
//void DestroyBlocksWithFlag(BlockFlag death_flag);
};
SDL/CMakeLists.txt
+1 -1
View File
@@ -71,7 +71,7 @@ add_subdirectory(../Common Common)
add_subdirectory(../GPU GPU)
add_subdirectory(../Core Core)
set(LIBS ${LIBS} ${SDL_LIBRARY} ${PNG_LIBRARY} z gfx gfx_es2 image stb_image mixer net ui profiler timeutil file zip base lin vjson stb_vorbis sha1 jsonwriter common core gpu kirk)
set(LIBS ${LIBS} ${SDL_LIBRARY} ${PNG_LIBRARY} z gfx gfx_es2 mixer net ui profiler timeutil file zip base lin vjson stb_vorbis sha1 jsonwriter core common gpu kirk image stb_image)
if(BLACKBERRY)
set(LIBS ${LIBS} bps screen socket EGL GLESv2)