Loader: Moved elf and loader modules to a "loader" subdirectory.

11 files changed, 38 insertions, 33 deletions

diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 5a8642d1b..f6bb10f29 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -8,7 +8,7 @@
 
 #include "core/system.h"
 #include "core/core.h"
-#include "core/loader.h"
+#include "core/loader/loader.h"
 
 #include "citra/emu_window/emu_window_glfw.h"
 
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index f85116419..421b2af55 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -5,7 +5,7 @@
 #include "bootmanager.hxx"
 
 #include "core/core.h"
-#include "core/loader.h"
+#include "core/loader/loader.h"
 #include "core/hw/hw.h"
 
 #include "video_core/video_core.h"
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 087716c01..cff0b6a2a 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -23,9 +23,10 @@
 #include "debugger/graphics_cmdlists.hxx"
 
 #include "core/system.h"
-#include "core/loader.h"
 #include "core/core.h"
+#include "core/loader/loader.h"
 #include "core/arm/disassembler/load_symbol_map.h"
+
 #include "version.h"
 
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 7116b88e9..2361fd2e3 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(SRCS    core.cpp
             core_timing.cpp
-            loader.cpp
+            loader/elf_reader.cpp
+            loader/loader.cpp
             mem_map.cpp
             mem_map_funcs.cpp
             system.cpp
@@ -27,7 +28,6 @@ set(SRCS    core.cpp
             arm/interpreter/mmu/tlb.cpp
             arm/interpreter/mmu/wb.cpp
             arm/interpreter/mmu/xscale_copro.cpp
-            elf/elf_reader.cpp
             file_sys/directory_file_system.cpp
             file_sys/meta_file_system.cpp
             hle/hle.cpp
@@ -50,7 +50,9 @@ set(SRCS    core.cpp
 
 set(HEADERS core.h
             core_timing.h
-            loader.h
+            loader/elf_reader.h
+            loader/elf_types.h
+            loader/loader.h
             mem_map.h
             system.h
             arm/disassembler/arm_disasm.h
@@ -72,8 +74,6 @@ set(HEADERS core.h
             arm/interpreter/vfp/asm_vfp.h
             arm/interpreter/vfp/vfp.h
             arm/interpreter/vfp/vfp_helper.h
-            elf/elf_reader.h
-            elf/elf_types.h
             file_sys/directory_file_system.h
             file_sys/file_sys.h
             file_sys/meta_file_system.h
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 8eb189a8b..07d3d57c8 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -162,7 +162,6 @@
     <ClCompile Include="arm\interpreter\vfp\vfpsingle.cpp" />
     <ClCompile Include="core.cpp" />
     <ClCompile Include="core_timing.cpp" />
-    <ClCompile Include="elf\elf_reader.cpp" />
     <ClCompile Include="file_sys\directory_file_system.cpp" />
     <ClCompile Include="file_sys\meta_file_system.cpp" />
     <ClCompile Include="hle\config_mem.cpp" />
@@ -182,7 +181,8 @@
     <ClCompile Include="hw\gpu.cpp" />
     <ClCompile Include="hw\hw.cpp" />
     <ClCompile Include="hw\ndma.cpp" />
-    <ClCompile Include="loader.cpp" />
+    <ClCompile Include="loader\elf_reader.cpp" />
+    <ClCompile Include="loader\loader.cpp" />
     <ClCompile Include="mem_map.cpp" />
     <ClCompile Include="mem_map_funcs.cpp" />
     <ClCompile Include="system.cpp" />
@@ -210,8 +210,6 @@
     <ClInclude Include="arm\interpreter\vfp\vfp_helper.h" />
     <ClInclude Include="core.h" />
     <ClInclude Include="core_timing.h" />
-    <ClInclude Include="elf\elf_reader.h" />
-    <ClInclude Include="elf\elf_types.h" />
     <ClInclude Include="file_sys\directory_file_system.h" />
     <ClInclude Include="file_sys\file_sys.h" />
     <ClInclude Include="file_sys\meta_file_system.h" />
@@ -233,7 +231,9 @@
     <ClInclude Include="hw\gpu.h" />
     <ClInclude Include="hw\hw.h" />
     <ClInclude Include="hw\ndma.h" />
-    <ClInclude Include="loader.h" />
+    <ClInclude Include="loader\elf_reader.h" />
+    <ClInclude Include="loader\elf_types.h" />
+    <ClInclude Include="loader\loader.h" />
     <ClInclude Include="mem_map.h" />
     <ClInclude Include="system.h" />
   </ItemGroup>
@@ -243,4 +243,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index da781f816..5b2be3398 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -16,9 +16,6 @@
     <Filter Include="hw">
       <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="elf">
-      <UniqueIdentifier>{7ae34319-6d72-4d12-bc62-9b438ba9241f}</UniqueIdentifier>
-    </Filter>
     <Filter Include="hle">
       <UniqueIdentifier>{8b62769e-3e2a-4a57-a7bc-b3b2933c2bc7}</UniqueIdentifier>
     </Filter>
@@ -34,6 +31,9 @@
     <Filter Include="hle\kernel">
       <UniqueIdentifier>{8089d94b-5faa-43dc-854b-ffd2fa2e7fe3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="loader">
+      <UniqueIdentifier>{491d5558-5f3a-4283-8ba4-0a58b1984e37}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="arm\disassembler\arm_disasm.cpp">
@@ -72,11 +72,7 @@
     <ClCompile Include="hw\hw.cpp">
       <Filter>hw</Filter>
     </ClCompile>
-    <ClCompile Include="elf\elf_reader.cpp">
-      <Filter>elf</Filter>
-    </ClCompile>
     <ClCompile Include="core.cpp" />
-    <ClCompile Include="loader.cpp" />
     <ClCompile Include="mem_map.cpp" />
     <ClCompile Include="mem_map_funcs.cpp" />
     <ClCompile Include="system.cpp" />
@@ -171,6 +167,12 @@
     <ClCompile Include="hle\service\ndm.cpp">
       <Filter>hle\service</Filter>
     </ClCompile>
+    <ClCompile Include="loader\elf_reader.cpp">
+      <Filter>loader</Filter>
+    </ClCompile>
+    <ClCompile Include="loader\loader.cpp">
+      <Filter>loader</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arm\disassembler\arm_disasm.h">
@@ -212,18 +214,11 @@
     <ClInclude Include="hw\hw.h">
       <Filter>hw</Filter>
     </ClInclude>
-    <ClInclude Include="elf\elf_reader.h">
-      <Filter>elf</Filter>
-    </ClInclude>
-    <ClInclude Include="elf\elf_types.h">
-      <Filter>elf</Filter>
-    </ClInclude>
     <ClInclude Include="arm\arm_interface.h">
       <Filter>arm</Filter>
     </ClInclude>
     <ClInclude Include="core.h" />
     <ClInclude Include="core_timing.h" />
-    <ClInclude Include="loader.h" />
     <ClInclude Include="mem_map.h" />
     <ClInclude Include="system.h" />
     <ClInclude Include="hle\hle.h">
@@ -307,8 +302,17 @@
     <ClInclude Include="hle\service\ndm.h">
       <Filter>hle\service</Filter>
     </ClInclude>
+    <ClInclude Include="loader\elf_reader.h">
+      <Filter>loader</Filter>
+    </ClInclude>
+    <ClInclude Include="loader\elf_types.h">
+      <Filter>loader</Filter>
+    </ClInclude>
+    <ClInclude Include="loader\loader.h">
+      <Filter>loader</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/core/elf/elf_reader.cpp b/src/core/loader/elf_reader.cpp
index c62332cec..123747f8e 100644
--- a/src/core/elf/elf_reader.cpp
+++ b/src/core/loader/elf_reader.cpp
@@ -8,7 +8,7 @@
 
 #include "common/symbols.h"
 #include "core/mem_map.h"
-#include "core/elf/elf_reader.h"
+#include "core/loader/elf_reader.h"
 
 //void bswap(Elf32_Word &w) {w = Common::swap32(w);}
 //void bswap(Elf32_Half &w) {w = Common::swap16(w);}
diff --git a/src/core/elf/elf_reader.h b/src/core/loader/elf_reader.h
index 3e2869f87..6f0ad84b3 100644
--- a/src/core/elf/elf_reader.h
+++ b/src/core/loader/elf_reader.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/elf/elf_types.h"
+#include "core/loader/elf_types.h"
 
 enum KnownElfTypes
 {
diff --git a/src/core/elf/elf_types.h b/src/core/loader/elf_types.h
index f1bf3db72..f1bf3db72 100644
--- a/src/core/elf/elf_types.h
+++ b/src/core/loader/elf_types.h
diff --git a/src/core/loader.cpp b/src/core/loader/loader.cpp
index 94b59e5da..7e6922e0c 100644
--- a/src/core/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -5,10 +5,10 @@
 #include "common/common_types.h"
 #include "common/file_util.h"
 
-#include "core/loader.h"
+#include "core/loader/loader.h"
+#include "core/loader/elf_reader.h"
 #include "core/system.h"
 #include "core/core.h"
-#include "core/elf/elf_reader.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/mem_map.h"
 
diff --git a/src/core/loader.h b/src/core/loader/loader.h
index 9d4aaa874..9d4aaa874 100644
--- a/src/core/loader.h
+++ b/src/core/loader/loader.h