Merge pull request #647 from lioncash/disasm

Common: Introduce the new Gekko disassembler to Common.
dolphin-emu · Aug 4, 2014 · 6befa34 · 6befa34
2 parents 05a9f5b + 0718937
commit 6befa34
Show file tree

Hide file tree

Showing 21 changed files with 2,552 additions and 2,433 deletions.
diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -48,12 +48,10 @@
     <ClInclude Include="config.h" />
     <ClInclude Include="disasm.h" />
     <ClInclude Include="dis_tables.h" />
-    <ClInclude Include="PowerPCDisasm.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dis_decode.cpp" />
     <ClCompile Include="dis_groups.cpp" />
-    <ClCompile Include="PowerPCDisasm.cpp" />
     <ClCompile Include="resolve.cpp" />
     <ClCompile Include="syntax.cpp" />
   </ItemGroup>

diff --git a/Externals/Bochs_disasm/CMakeLists.txt b/Externals/Bochs_disasm/CMakeLists.txt
@@ -1,11 +1,10 @@
-set(SRCS	dis_decode.cpp
-			dis_groups.cpp
-			resolve.cpp
-			syntax.cpp
-			PowerPCDisasm.cpp)
+set(SRCS dis_decode.cpp
+         dis_groups.cpp
+         resolve.cpp
+         syntax.cpp)
 
 if(WIN32)
-	set(SRCS ${SRCS} stdafx.cpp)
+    set(SRCS ${SRCS} stdafx.cpp)
 endif(WIN32)
 
 add_library(bdisasm STATIC ${SRCS})