OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 21:20:05 +00:00
Code Issues Projects Releases Wiki Activity

fixed project includes to use new directory structure

Browse Source
This commit is contained in:
bunnei 2014-04-08 20:15:08 -04:00
parent 63e46abdb8
commit de0a034a84
95 changed files with 655 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/citra/citra.cpp
View File

@ -22,17 +22,17 @@
* http://code.google.com/p/gekko-gc-emu/ * http://code.google.com/p/gekko-gc-emu/
*/ */
#include "common.h" #include "common/common.h"
#include "log_manager.h" #include "common/log_manager.h"
#include "file_util.h" #include "common/file_util.h"
#include "system.h" #include "core/system.h"
#include "core.h" #include "core/core.h"
#include "loader.h" #include "core/loader.h"
#include "emu_window/emu_window_glfw.h" #include "citra/emu_window/emu_window_glfw.h"
#include "citra.h" #include "citra/citra.h"
#define E_ERR -1 #define E_ERR -1
@ -52,7 +52,7 @@ int __cdecl main(int argc, char **argv) {
System::Init(emu_window); System::Init(emu_window);
std::string boot_filename = "homebrew.elf"; std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf";
std::string error_str; std::string error_str;
bool res = Loader::LoadFile(boot_filename, &error_str); bool res = Loader::LoadFile(boot_filename, &error_str);

15
src/citra/citra.vcxproj
View File

@ -199,20 +199,17 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\citra.cpp" /> <ClCompile Include="citra.cpp" />
<ClCompile Include="src\emu_window\emu_window_glfw.cpp" /> <ClCompile Include="emu_window\emu_window_glfw.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="citra.h" />
<ClInclude Include="emu_window\emu_window_glfw.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="src\citra.h" /> <ClInclude Include="version.h" />
<ClInclude Include="src\emu_window\emu_window_glfw.h" />
<ClInclude Include="src\version.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="citra.rc" /> <Text Include="CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

33
src/citra/citra.vcxproj.filters
View File

@ -1,28 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="src\citra.cpp" />
<ClCompile Include="src\emu_window\emu_window_glfw.cpp">
<Filter>emu_window</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
<ClInclude Include="src\version.h" />
<ClInclude Include="src\citra.h" />
<ClInclude Include="src\emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="citra.rc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="emu_window"> <Filter Include="emu_window">
<UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier> <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <ClCompile Include="citra.cpp" />
<ClCompile Include="emu_window\emu_window_glfw.cpp">
<Filter>emu_window</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="citra.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="version.h" />
<ClInclude Include="emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/citra/emu_window/emu_window_glfw.cpp
View File

@ -22,9 +22,9 @@
* http://code.google.com/p/gekko-gc-emu/ * http://code.google.com/p/gekko-gc-emu/
*/ */
#include "common.h" #include "common/common.h"
#include "video_core.h" #include "video_core/video_core.h"
#include "emu_window_glfw.h" #include "citra/emu_window/emu_window_glfw.h"
static void OnKeyEvent(GLFWwindow* win, int key, int action) { static void OnKeyEvent(GLFWwindow* win, int key, int action) {
// EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); // EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);

2
src/citra/emu_window/emu_window_glfw.h
View File

@ -27,7 +27,7 @@
#include <GL/glew.h> #include <GL/glew.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "emu_window.h" #include "common/emu_window.h"
class EmuWindow_GLFW : public EmuWindow { class EmuWindow_GLFW : public EmuWindow {
public: public:

72
src/citra_qt/citra_qt.vcxproj
View File

@ -127,43 +127,21 @@
<ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" /> <ClCompile Include="..\..\externals\qhexedit\qhexedit.cpp" />
<ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" /> <ClCompile Include="..\..\externals\qhexedit\qhexedit_p.cpp" />
<ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" /> <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp" />
<ClCompile Include="src\bootmanager.cpp" /> <ClCompile Include="bootmanager.cpp" />
<ClCompile Include="src\callstack.cpp" /> <ClCompile Include="callstack.cpp" />
<ClCompile Include="src\config\controller_config.cpp" /> <ClCompile Include="config\controller_config.cpp" />
<ClCompile Include="src\config\controller_config_util.cpp" /> <ClCompile Include="config\controller_config_util.cpp" />
<ClCompile Include="src\disasm.cpp" /> <ClCompile Include="cpu_regs.cpp" />
<ClCompile Include="src\cpu_regs.cpp" /> <ClCompile Include="disasm.cpp" />
<ClCompile Include="src\hotkeys.cpp" /> <ClCompile Include="hotkeys.cpp" />
<ClCompile Include="src\main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="src\ramview.cpp" /> <ClCompile Include="ramview.cpp" />
</ItemGroup>
<ItemGroup>
<MOC Include="src\bootmanager.hxx" />
<MOC Include="src\callstack.hxx" />
<MOC Include="src\config\controller_config.hxx" />
<MOC Include="src\config\controller_config_util.hxx" />
<MOC Include="src\disasm.hxx" />
<MOC Include="src\cpu_regs.hxx" />
<MOC Include="src\hotkeys.hxx" />
<MOC Include="src\main.hxx" />
<MOC Include="src\ramview.hxx" />
</ItemGroup>
<ItemGroup>
<UIC Include="src\callstack.ui" />
<UIC Include="src\config\controller_config.ui">
<QtUicPrefix>src/config/ui_</QtUicPrefix>
</UIC>
<UIC Include="src\disasm.ui" />
<UIC Include="src\cpu_regs.ui" />
<UIC Include="src\hotkeys.ui" />
<UIC Include="src\main.ui" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MOC Include="..\..\externals\qhexedit\commands.h" /> <MOC Include="..\..\externals\qhexedit\commands.h" />
<MOC Include="..\..\externals\qhexedit\qhexedit.h" /> <MOC Include="..\..\externals\qhexedit\qhexedit.h" />
<MOC Include="..\..\externals\qhexedit\qhexedit_p.h" /> <MOC Include="..\..\externals\qhexedit\qhexedit_p.h" />
<MOC Include="..\..\externals\qhexedit\xbytearray.h" /> <MOC Include="..\..\externals\qhexedit\xbytearray.h" />
<ClInclude Include="src\version.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\common\common.vcxproj"> <ProjectReference Include="..\common\common.vcxproj">
@ -173,6 +151,38 @@
<Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project> <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="bootmanager.hxx" />
<ClInclude Include="callstack.hxx" />
<ClInclude Include="config\controller_config.hxx" />
<ClInclude Include="config\controller_config_util.hxx" />
<ClInclude Include="config\ui_controller_config.h" />
<ClInclude Include="cpu_regs.hxx" />
<ClInclude Include="disasm.hxx" />
<ClInclude Include="hotkeys.hxx" />
<ClInclude Include="main.hxx" />
<ClInclude Include="ramview.hxx" />
<ClInclude Include="ui_callstack.h" />
<ClInclude Include="ui_cpu_regs.h" />
<ClInclude Include="ui_disasm.h" />
<ClInclude Include="ui_gfx_fifo_player.h" />
<ClInclude Include="ui_hotkeys.h" />
<ClInclude Include="ui_image_info.h" />
<ClInclude Include="ui_main.h" />
<ClInclude Include="ui_welcome_wizard.h" />
<ClInclude Include="version.h" />
</ItemGroup>
<ItemGroup>
<UIC Include="callstack.ui" />
<UIC Include="config\controller_config.ui" />
<UIC Include="cpu_regs.ui" />
<UIC Include="disasm.ui" />
<UIC Include="hotkeys.ui" />
<UIC Include="main.ui" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="qt-build.targets" /> <Import Project="qt-build.targets" />

124
src/citra_qt/citra_qt.vcxproj.filters
View File

@ -12,20 +12,6 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\main.cpp" />
<ClCompile Include="src\disasm.cpp">
<Filter>debugger</Filter>
</ClCompile>
<ClCompile Include="src\cpu_regs.cpp">
<Filter>debugger</Filter>
</ClCompile>
<ClCompile Include="src\bootmanager.cpp" />
<ClCompile Include="src\callstack.cpp">
<Filter>debugger</Filter>
</ClCompile>
<ClCompile Include="src\ramview.cpp">
<Filter>debugger</Filter>
</ClCompile>
<ClCompile Include="..\..\externals\qhexedit\commands.cpp"> <ClCompile Include="..\..\externals\qhexedit\commands.cpp">
<Filter>qhexedit</Filter> <Filter>qhexedit</Filter>
</ClCompile> </ClCompile>
@ -38,22 +24,29 @@
<ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp"> <ClCompile Include="..\..\externals\qhexedit\xbytearray.cpp">
<Filter>qhexedit</Filter> <Filter>qhexedit</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\hotkeys.cpp" /> <ClCompile Include="bootmanager.cpp" />
<ClCompile Include="src\config\controller_config.cpp"> <ClCompile Include="hotkeys.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="config\controller_config.cpp">
<Filter>config</Filter> <Filter>config</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\config\controller_config_util.cpp"> <ClCompile Include="config\controller_config_util.cpp">
<Filter>config</Filter> <Filter>config</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="cpu_regs.cpp">
<Filter>debugger</Filter>
</ClCompile>
<ClCompile Include="disasm.cpp">
<Filter>debugger</Filter>
</ClCompile>
<ClCompile Include="ramview.cpp">
<Filter>debugger</Filter>
</ClCompile>
<ClCompile Include="callstack.cpp">
<Filter>debugger</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MOC Include="src\main.hxx" />
<MOC Include="src\cpu_regs.hxx">
<Filter>debugger</Filter>
</MOC>
<MOC Include="src\callstack.hxx">
<Filter>debugger</Filter>
</MOC>
<MOC Include="..\..\externals\qhexedit\commands.h"> <MOC Include="..\..\externals\qhexedit\commands.h">
<Filter>qhexedit</Filter> <Filter>qhexedit</Filter>
</MOC> </MOC>
@ -66,38 +59,67 @@
<MOC Include="..\..\externals\qhexedit\qhexedit.h"> <MOC Include="..\..\externals\qhexedit\qhexedit.h">
<Filter>qhexedit</Filter> <Filter>qhexedit</Filter>
</MOC> </MOC>
<MOC Include="src\ramview.hxx">
<Filter>debugger</Filter>
</MOC>
<MOC Include="src\disasm.hxx">
<Filter>debugger</Filter>
</MOC>
<MOC Include="src\bootmanager.hxx" />
<MOC Include="src\hotkeys.hxx" />
<MOC Include="src\config\controller_config.hxx">
<Filter>config</Filter>
</MOC>
<MOC Include="src\config\controller_config_util.hxx">
<Filter>config</Filter>
</MOC>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<UIC Include="src\main.ui" /> <ClInclude Include="bootmanager.hxx" />
<UIC Include="src\cpu_regs.ui"> <ClInclude Include="hotkeys.hxx" />
<Filter>debugger</Filter> <ClInclude Include="main.hxx" />
</UIC> <ClInclude Include="ui_hotkeys.h" />
<UIC Include="src\disasm.ui"> <ClInclude Include="ui_image_info.h" />
<Filter>debugger</Filter> <ClInclude Include="ui_main.h" />
</UIC> <ClInclude Include="ui_welcome_wizard.h" />
<UIC Include="src\callstack.ui"> <ClInclude Include="version.h" />
<Filter>debugger</Filter> <ClInclude Include="config\controller_config.hxx">
</UIC>
<UIC Include="src\hotkeys.ui" />
<UIC Include="src\config\controller_config.ui">
<Filter>config</Filter> <Filter>config</Filter>
</ClInclude>
<ClInclude Include="config\controller_config_util.hxx">
<Filter>config</Filter>
</ClInclude>
<ClInclude Include="config\ui_controller_config.h">
<Filter>config</Filter>
</ClInclude>
<ClInclude Include="cpu_regs.hxx">
<Filter>debugger</Filter>
</ClInclude>
<ClInclude Include="disasm.hxx">
<Filter>debugger</Filter>
</ClInclude>
<ClInclude Include="ramview.hxx">
<Filter>debugger</Filter>
</ClInclude>
<ClInclude Include="ui_callstack.h">
<Filter>debugger</Filter>
</ClInclude>
<ClInclude Include="ui_cpu_regs.h">
<Filter>debugger</Filter>
</ClInclude>
<ClInclude Include="ui_disasm.h">
<Filter>debugger</Filter>
</ClInclude>
<ClInclude Include="ui_gfx_fifo_player.h">
<Filter>debugger</Filter>
</ClInclude>
<ClInclude Include="callstack.hxx">
<Filter>debugger</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<UIC Include="hotkeys.ui" />
<UIC Include="main.ui" />
<UIC Include="config\controller_config.ui">
<Filter>config</Filter>
</UIC>
<UIC Include="callstack.ui">
<Filter>debugger</Filter>
</UIC>
<UIC Include="cpu_regs.ui">
<Filter>debugger</Filter>
</UIC>
<UIC Include="disasm.ui">
<Filter>debugger</Filter>
</UIC> </UIC>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\version.h" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/common/atomic.h
View File

@ -7,12 +7,12 @@
#ifdef _WIN32 #ifdef _WIN32
#include "atomic_win32.h" #include "common/atomic_win32.h"
#else #else
// GCC-compatible compiler assumed! // GCC-compatible compiler assumed!
#include "atomic_gcc.h" #include "common/atomic_gcc.h"
#endif #endif

2
src/common/atomic_gcc.h
View File

@ -5,7 +5,7 @@
#ifndef _ATOMIC_GCC_H_ #ifndef _ATOMIC_GCC_H_
#define _ATOMIC_GCC_H_ #define _ATOMIC_GCC_H_
#include "common.h" #include "common/common.h"
// Atomic operations are performed in a single step by the CPU. It is // Atomic operations are performed in a single step by the CPU. It is
// impossible for other threads to see the operation "half-done." // impossible for other threads to see the operation "half-done."

2
src/common/atomic_win32.h
View File

@ -5,7 +5,7 @@
#ifndef _ATOMIC_WIN32_H_ #ifndef _ATOMIC_WIN32_H_
#define _ATOMIC_WIN32_H_ #define _ATOMIC_WIN32_H_
#include "common.h" #include "common/common.h"
#include <intrin.h> #include <intrin.h>
#include <Windows.h> #include <Windows.h>

6
src/common/break_points.cpp
View File

@ -2,9 +2,9 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "debug_interface.h" #include "common/debug_interface.h"
#include "break_points.h" #include "common/break_points.h"
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>

2
src/common/break_points.h
View File

@ -8,7 +8,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "common.h" #include "common/common.h"
class DebugInterface; class DebugInterface;

4
src/common/chunk_file.h
View File

@ -41,8 +41,8 @@
#endif #endif
#endif #endif
#include "common.h" #include "common/common.h"
#include "file_util.h" #include "common/file_util.h"
//#include "../ext/snappy/snappy-c.h" //#include "../ext/snappy/snappy-c.h"
#if defined(IOS) || defined(MACGNUSTD) #if defined(IOS) || defined(MACGNUSTD)

12
src/common/common.h
View File

@ -43,12 +43,12 @@ private:
}; };
#endif #endif
#include "log.h" #include "common/log.h"
#include "common_types.h" #include "common/common_types.h"
#include "msg_handler.h" #include "common/msg_handler.h"
#include "common_funcs.h" #include "common/common_funcs.h"
#include "common_paths.h" #include "common/common_paths.h"
#include "platform.h" #include "common/platform.h"
#ifdef __APPLE__ #ifdef __APPLE__
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.

121
src/common/common.vcxproj
View File

@ -146,67 +146,6 @@
</Link> </Link>
<Lib /> <Lib />
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="src\atomic.h" />
<ClInclude Include="src\atomic_gcc.h" />
<ClInclude Include="src\atomic_win32.h" />
<ClInclude Include="src\break_points.h" />
<ClInclude Include="src\chunk_file.h" />
<ClInclude Include="src\common.h" />
<ClInclude Include="src\common_funcs.h" />
<ClInclude Include="src\common_paths.h" />
<ClInclude Include="src\common_types.h" />
<ClInclude Include="src\console_listener.h" />
<ClInclude Include="src\cpu_detect.h" />
<ClInclude Include="src\debug_interface.h" />
<ClInclude Include="src\emu_window.h" />
<ClInclude Include="src\extended_trace.h" />
<ClInclude Include="src\fifo_queue.h" />
<ClInclude Include="src\file_search.h" />
<ClInclude Include="src\file_util.h" />
<ClInclude Include="src\fixed_size_queue.h" />
<ClInclude Include="src\hash.h" />
<ClInclude Include="src\linear_disk_cache.h" />
<ClInclude Include="src\log.h" />
<ClInclude Include="src\log_manager.h" />
<ClInclude Include="src\math_util.h" />
<ClInclude Include="src\memory_util.h" />
<ClInclude Include="src\mem_arena.h" />
<ClInclude Include="src\msg_handler.h" />
<ClInclude Include="src\platform.h" />
<ClInclude Include="src\scm_rev.h" />
<ClInclude Include="src\std_condition_variable.h" />
<ClInclude Include="src\std_mutex.h" />
<ClInclude Include="src\std_thread.h" />
<ClInclude Include="src\string_util.h" />
<ClInclude Include="src\swap.h" />
<ClInclude Include="src\thread.h" />
<ClInclude Include="src\thunk.h" />
<ClInclude Include="src\timer.h" />
<ClInclude Include="src\utf8.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\break_points.cpp" />
<ClCompile Include="src\console_listener.cpp" />
<ClCompile Include="src\extended_trace.cpp" />
<ClCompile Include="src\file_search.cpp" />
<ClCompile Include="src\file_util.cpp" />
<ClCompile Include="src\hash.cpp" />
<ClCompile Include="src\log_manager.cpp" />
<ClCompile Include="src\math_util.cpp" />
<ClCompile Include="src\memory_util.cpp" />
<ClCompile Include="src\mem_arena.cpp" />
<ClCompile Include="src\misc.cpp" />
<ClCompile Include="src\msg_handler.cpp" />
<ClCompile Include="src\string_util.cpp" />
<ClCompile Include="src\thread.cpp" />
<ClCompile Include="src\timer.cpp" />
<ClCompile Include="src\utf8.cpp" />
<ClCompile Include="src\version.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@ -214,6 +153,66 @@
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="atomic.h" />
<ClInclude Include="atomic_gcc.h" />
<ClInclude Include="atomic_win32.h" />
<ClInclude Include="break_points.h" />
<ClInclude Include="chunk_file.h" />
<ClInclude Include="common.h" />
<ClInclude Include="common_funcs.h" />
<ClInclude Include="common_paths.h" />
<ClInclude Include="common_types.h" />
<ClInclude Include="console_listener.h" />
<ClInclude Include="cpu_detect.h" />
<ClInclude Include="debug_interface.h" />
<ClInclude Include="emu_window.h" />
<ClInclude Include="extended_trace.h" />
<ClInclude Include="fifo_queue.h" />
<ClInclude Include="file_search.h" />
<ClInclude Include="file_util.h" />
<ClInclude Include="fixed_size_queue.h" />
<ClInclude Include="hash.h" />
<ClInclude Include="linear_disk_cache.h" />
<ClInclude Include="log.h" />
<ClInclude Include="log_manager.h" />
<ClInclude Include="math_util.h" />
<ClInclude Include="memory_util.h" />
<ClInclude Include="mem_arena.h" />
<ClInclude Include="msg_handler.h" />
<ClInclude Include="platform.h" />
<ClInclude Include="std_condition_variable.h" />
<ClInclude Include="std_mutex.h" />
<ClInclude Include="std_thread.h" />
<ClInclude Include="string_util.h" />
<ClInclude Include="swap.h" />
<ClInclude Include="thread.h" />
<ClInclude Include="thunk.h" />
<ClInclude Include="timer.h" />
<ClInclude Include="utf8.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="break_points.cpp" />
<ClCompile Include="console_listener.cpp" />
<ClCompile Include="extended_trace.cpp" />
<ClCompile Include="file_search.cpp" />
<ClCompile Include="file_util.cpp" />
<ClCompile Include="hash.cpp" />
<ClCompile Include="log_manager.cpp" />
<ClCompile Include="math_util.cpp" />
<ClCompile Include="memory_util.cpp" />
<ClCompile Include="mem_arena.cpp" />
<ClCompile Include="misc.cpp" />
<ClCompile Include="msg_handler.cpp" />
<ClCompile Include="string_util.cpp" />
<ClCompile Include="thread.cpp" />
<ClCompile Include="timer.cpp" />
<ClCompile Include="utf8.cpp" />
<ClCompile Include="version.cpp" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

109
src/common/common.vcxproj.filters
View File

@ -1,64 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="src\break_points.cpp" /> <ClInclude Include="atomic.h" />
<ClCompile Include="src\console_listener.cpp" /> <ClInclude Include="atomic_gcc.h" />
<ClCompile Include="src\extended_trace.cpp" /> <ClInclude Include="atomic_win32.h" />
<ClCompile Include="src\file_search.cpp" /> <ClInclude Include="break_points.h" />
<ClCompile Include="src\file_util.cpp" /> <ClInclude Include="chunk_file.h" />
<ClCompile Include="src\hash.cpp" /> <ClInclude Include="common.h" />
<ClCompile Include="src\log_manager.cpp" /> <ClInclude Include="common_funcs.h" />
<ClCompile Include="src\math_util.cpp" /> <ClInclude Include="common_paths.h" />
<ClCompile Include="src\memory_util.cpp" /> <ClInclude Include="common_types.h" />
<ClCompile Include="src\mem_arena.cpp" /> <ClInclude Include="console_listener.h" />
<ClCompile Include="src\misc.cpp" /> <ClInclude Include="cpu_detect.h" />
<ClCompile Include="src\msg_handler.cpp" /> <ClInclude Include="debug_interface.h" />
<ClCompile Include="src\string_util.cpp" /> <ClInclude Include="emu_window.h" />
<ClCompile Include="src\thread.cpp" /> <ClInclude Include="extended_trace.h" />
<ClCompile Include="src\timer.cpp" /> <ClInclude Include="fifo_queue.h" />
<ClCompile Include="src\version.cpp" /> <ClInclude Include="file_search.h" />
<ClCompile Include="src\utf8.cpp" /> <ClInclude Include="file_util.h" />
<ClInclude Include="fixed_size_queue.h" />
<ClInclude Include="hash.h" />
<ClInclude Include="linear_disk_cache.h" />
<ClInclude Include="log.h" />
<ClInclude Include="log_manager.h" />
<ClInclude Include="math_util.h" />
<ClInclude Include="mem_arena.h" />
<ClInclude Include="memory_util.h" />
<ClInclude Include="msg_handler.h" />
<ClInclude Include="platform.h" />
<ClInclude Include="std_condition_variable.h" />
<ClInclude Include="std_mutex.h" />
<ClInclude Include="std_thread.h" />
<ClInclude Include="string_util.h" />
<ClInclude Include="swap.h" />
<ClInclude Include="thread.h" />
<ClInclude Include="thunk.h" />
<ClInclude Include="timer.h" />
<ClInclude Include="utf8.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\atomic.h" /> <ClCompile Include="break_points.cpp" />
<ClInclude Include="src\break_points.h" /> <ClCompile Include="console_listener.cpp" />
<ClInclude Include="src\chunk_file.h" /> <ClCompile Include="extended_trace.cpp" />
<ClInclude Include="src\common.h" /> <ClCompile Include="file_search.cpp" />
<ClInclude Include="src\common_funcs.h" /> <ClCompile Include="file_util.cpp" />
<ClInclude Include="src\common_paths.h" /> <ClCompile Include="hash.cpp" />
<ClInclude Include="src\common_types.h" /> <ClCompile Include="log_manager.cpp" />
<ClInclude Include="src\console_listener.h" /> <ClCompile Include="math_util.cpp" />
<ClInclude Include="src\cpu_detect.h" /> <ClCompile Include="mem_arena.cpp" />
<ClInclude Include="src\debug_interface.h" /> <ClCompile Include="memory_util.cpp" />
<ClInclude Include="src\extended_trace.h" /> <ClCompile Include="misc.cpp" />
<ClInclude Include="src\fifo_queue.h" /> <ClCompile Include="msg_handler.cpp" />
<ClInclude Include="src\file_search.h" /> <ClCompile Include="string_util.cpp" />
<ClInclude Include="src\file_util.h" /> <ClCompile Include="thread.cpp" />
<ClInclude Include="src\fixed_size_queue.h" /> <ClCompile Include="timer.cpp" />
<ClInclude Include="src\hash.h" /> <ClCompile Include="utf8.cpp" />
<ClInclude Include="src\linear_disk_cache.h" /> <ClCompile Include="version.cpp" />
<ClInclude Include="src\log.h" />
<ClInclude Include="src\log_manager.h" />
<ClInclude Include="src\math_util.h" />
<ClInclude Include="src\memory_util.h" />
<ClInclude Include="src\mem_arena.h" />
<ClInclude Include="src\msg_handler.h" />
<ClInclude Include="src\scm_rev.h" />
<ClInclude Include="src\std_condition_variable.h" />
<ClInclude Include="src\std_mutex.h" />
<ClInclude Include="src\std_thread.h" />
<ClInclude Include="src\string_util.h" />
<ClInclude Include="src\thread.h" />
<ClInclude Include="src\thunk.h" />
<ClInclude Include="src\timer.h" />
<ClInclude Include="src\atomic_gcc.h" />
<ClInclude Include="src\atomic_win32.h" />
<ClInclude Include="src\emu_window.h" />
<ClInclude Include="src\platform.h" />
<ClInclude Include="src\swap.h" />
<ClInclude Include="src\utf8.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/common/common_paths.h
View File

@ -6,7 +6,7 @@
#define _COMMON_PATHS_H_ #define _COMMON_PATHS_H_
// Make sure we pick up USER_DIR if set in config.h // Make sure we pick up USER_DIR if set in config.h
#include "common.h" #include "common/common.h"
// Directory seperators, do we need this? // Directory seperators, do we need this?
#define DIR_SEP "/" #define DIR_SEP "/"

2
src/common/common_types.h
View File

@ -62,7 +62,7 @@ typedef signed long long s64; ///< 64-bit signed int
typedef float f32; ///< 32-bit floating point typedef float f32; ///< 32-bit floating point
typedef double f64; ///< 64-bit floating point typedef double f64; ///< 64-bit floating point
#include "swap.h" #include "common/swap.h"
/// Union for fast 16-bit type casting /// Union for fast 16-bit type casting
union t16 { union t16 {

6
src/common/console_listener.cpp
View File

@ -13,9 +13,9 @@
#include <stdarg.h> #include <stdarg.h>
#endif #endif
#include "common.h" #include "common/common.h"
#include "log_manager.h" // Common #include "common/log_manager.h" // Common
#include "console_listener.h" // Common #include "common/console_listener.h" // Common
ConsoleListener::ConsoleListener() ConsoleListener::ConsoleListener()
{ {

2
src/common/console_listener.h
View File

@ -5,7 +5,7 @@
#ifndef _CONSOLELISTENER_H #ifndef _CONSOLELISTENER_H
#define _CONSOLELISTENER_H #define _CONSOLELISTENER_H
#include "log_manager.h" #include "common/log_manager.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>

2
src/common/emu_window.h
View File

@ -25,7 +25,7 @@
#ifndef CORE_EMUWINDOW_H_ #ifndef CORE_EMUWINDOW_H_
#define CORE_EMUWINDOW_H_ #define CORE_EMUWINDOW_H_
#include "common.h" #include "common/common.h"
//namespace input_common //namespace input_common
//{ //{

4
src/common/extended_trace.cpp
View File

@ -16,8 +16,8 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include "extended_trace.h" #include "common/extended_trace.h"
#include "string_util.h" #include "common/string_util.h"
using namespace std; using namespace std;
#include <tchar.h> #include <tchar.h>

2
src/common/fifo_queue.h
View File

@ -5,7 +5,7 @@
// a simple lockless thread-safe, // a simple lockless thread-safe,
// single reader, single writer queue // single reader, single writer queue
#include "atomic.h" #include "common/atomic.h"
namespace Common namespace Common
{ {

9
src/common/file_search.cpp
View File

@ -3,8 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "common_paths.h" #include "common/common_paths.h"
#ifndef _WIN32 #ifndef _WIN32
#include <sys/types.h> #include <sys/types.h>
#include <dirent.h> #include <dirent.h>
@ -15,9 +15,8 @@
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include "file_search.h" #include "common/file_search.h"
#include "common/string_util.h"
#include "string_util.h"
CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories) CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)

10
src/common/file_util.cpp
View File

@ -3,10 +3,10 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "common_paths.h" #include "common/common_paths.h"
#include "file_util.h" #include "common/file_util.h"
#include "string_util.h" #include "common/string_util.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
@ -32,7 +32,7 @@
#include <algorithm> #include <algorithm>
#include <sys/stat.h> #include <sys/stat.h>
#include "string_util.h" #include "common/string_util.h"
#ifndef S_ISDIR #ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)

4
src/common/file_util.h
View File

@ -12,8 +12,8 @@
#include <vector> #include <vector>
#include <string.h> #include <string.h>
#include "common.h" #include "common/common.h"
#include "string_util.h" #include "common/string_util.h"
// User directory indices for GetUserPath // User directory indices for GetUserPath
enum { enum {

4
src/common/hash.cpp
View File

@ -3,9 +3,9 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "hash.h" #include "common/hash.h"
#if _M_SSE >= 0x402 #if _M_SSE >= 0x402
#include "cpu_detect.h" #include "common/cpu_detect.h"
#include <nmmintrin.h> #include <nmmintrin.h>
#endif #endif

2
src/common/hash.h
View File

@ -6,7 +6,7 @@
#ifndef _HASH_H_ #ifndef _HASH_H_
#define _HASH_H_ #define _HASH_H_
#include "common.h" #include "common/common.h"
u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0.
u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower

2
src/common/linear_disk_cache.h
View File

@ -6,7 +6,7 @@
#ifndef _LINEAR_DISKCACHE #ifndef _LINEAR_DISKCACHE
#define _LINEAR_DISKCACHE #define _LINEAR_DISKCACHE
#include "common.h" #include "common/common.h"
#include <fstream> #include <fstream>
// defined in Version.cpp // defined in Version.cpp

13
src/common/log_manager.cpp
View File

@ -4,14 +4,11 @@
#include <algorithm> #include <algorithm>
#ifdef ANDROID #include "common/log_manager.h"
#include "Host.h" #include "common/console_listener.h"
#endif #include "common/timer.h"
#include "log_manager.h" #include "common/thread.h"
#include "console_listener.h" #include "common/file_util.h"
#include "timer.h"
#include "thread.h"
#include "file_util.h"
void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
const char *file, int line, const char* fmt, ...) const char *file, int line, const char* fmt, ...)

8
src/common/log_manager.h
View File

@ -5,10 +5,10 @@
#ifndef _LOGMANAGER_H_ #ifndef _LOGMANAGER_H_
#define _LOGMANAGER_H_ #define _LOGMANAGER_H_
#include "log.h" #include "common/log.h"
#include "string_util.h" #include "common/string_util.h"
#include "thread.h" #include "common/thread.h"
#include "file_util.h" #include "common/file_util.h"
#include <set> #include <set>
#include <string.h> #include <string.h>

4
src/common/math_util.cpp
View File

@ -3,8 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "math_util.h" #include "common/math_util.h"
#include <cmath> #include <cmath>
#include <numeric> #include <numeric>

2
src/common/math_util.h
View File

@ -6,7 +6,7 @@
#ifndef _MATH_UTIL_H_ #ifndef _MATH_UTIL_H_
#define _MATH_UTIL_H_ #define _MATH_UTIL_H_
#include "common.h" #include "common/common.h"
#include <vector> #include <vector>

8
src/common/mem_arena.cpp
View File

@ -17,12 +17,10 @@
#include <string> #include <string>
#include "memory_util.h" #include "common/memory_util.h"
#include "mem_arena.h" #include "common/mem_arena.h"
#ifdef _WIN32 #ifndef _WIN32
//#include "CommonWindows.h"
#else
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>

2
src/common/mem_arena.h
View File

@ -26,7 +26,7 @@
#include <e32std.h> #include <e32std.h>
#endif #endif
#include "common.h" #include "common/common.h"
// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
// Multiple views can mirror the same section of the block, which makes it very convient for emulating // Multiple views can mirror the same section of the block, which makes it very convient for emulating

6
src/common/memory_util.cpp
View File

@ -3,9 +3,9 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "memory_util.h" #include "common/memory_util.h"
#include "string_util.h" #include "common/string_util.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>

2
src/common/misc.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>

4
src/common/msg_handler.cpp
View File

@ -4,8 +4,8 @@
#include <stdio.h> // System #include <stdio.h> // System
#include "common.h" // Local #include "common/common.h" // Local
#include "string_util.h" #include "common/string_util.h"
bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
static MsgAlertHandler msg_handler = DefaultMsgHandler; static MsgAlertHandler msg_handler = DefaultMsgHandler;

2
src/common/platform.h
View File

@ -25,7 +25,7 @@
#ifndef COMMON_PLATFORM_H_ #ifndef COMMON_PLATFORM_H_
#define COMMON_PLATFORM_H_ #define COMMON_PLATFORM_H_
#include "common_types.h" #include "common/common_types.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Platform definitions // Platform definitions

7
src/common/scm_rev_gen.vcxproj
View File

@ -19,12 +19,11 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="scm_rev_gen.js"> <ClInclude Include="force_rebuild.h" />
</None> <ClInclude Include="scm_rev.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="force_rebuild.h" /> <None Include="scm_rev_gen.js" />
<ClInclude Include="src\scm_rev.h" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid>

2
src/common/std_condition_variable.h
View File

@ -29,7 +29,7 @@
// partial std::condition_variable implementation for win32/pthread // partial std::condition_variable implementation for win32/pthread
#include "std_mutex.h" #include "common/std_mutex.h"
#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__) #if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
#define USE_RVALUE_REFERENCES #define USE_RVALUE_REFERENCES

6
src/common/string_util.cpp
View File

@ -6,9 +6,9 @@
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>
#include "common.h" #include "common/common.h"
#include "common_paths.h" #include "common/common_paths.h"
#include "string_util.h" #include "common/string_util.h"
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>

2
src/common/string_util.h
View File

@ -12,7 +12,7 @@
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include "common.h" #include "common/common.h"
std::string StringFromFormat(const char* format, ...); std::string StringFromFormat(const char* format, ...);
// Cheap! // Cheap!

4
src/common/thread.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "thread.h" #include "common/thread.h"
#include "common.h" #include "common/common.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach/mach.h> #include <mach/mach.h>

8
src/common/thread.h
View File

@ -5,12 +5,12 @@
#ifndef _THREAD_H_ #ifndef _THREAD_H_
#define _THREAD_H_ #define _THREAD_H_
#include "std_condition_variable.h" #include "common/std_condition_variable.h"
#include "std_mutex.h" #include "common/std_mutex.h"
#include "std_thread.h" #include "common/std_thread.h"
// Don't include common.h here as it will break LogManager // Don't include common.h here as it will break LogManager
#include "common_types.h" #include "common/common_types.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

3
src/common/thunk.h
View File

@ -7,8 +7,7 @@
#include <map> #include <map>
#include "common.h" #include "common/common.h"
#include "x64Emitter.h"
// This simple class creates a wrapper around a C/C++ function that saves all fp state // This simple class creates a wrapper around a C/C++ function that saves all fp state
// before entering it, and restores it upon exit. This is required to be able to selectively // before entering it, and restores it upon exit. This is required to be able to selectively

6
src/common/timer.cpp
View File

@ -12,9 +12,9 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "common.h" #include "common/common.h"
#include "timer.h" #include "common/timer.h"
#include "string_util.h" #include "common/string_util.h"
namespace Common namespace Common
{ {

2
src/common/timer.h
View File

@ -5,7 +5,7 @@
#ifndef _TIMER_H_ #ifndef _TIMER_H_
#define _TIMER_H_ #define _TIMER_H_
#include "common.h" #include "common/common.h"
#include <string> #include <string>
namespace Common namespace Common

4
src/common/utf8.cpp
View File

@ -26,8 +26,8 @@
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include "common_types.h" #include "common/common_types.h"
#include "utf8.h" #include "common/utf8.h"
// is start of UTF sequence // is start of UTF sequence
inline bool isutf(char c) { inline bool isutf(char c) {

2
src/common/utf8.h
View File

@ -16,7 +16,7 @@
#pragma once #pragma once
#include "common_types.h" #include "common/common_types.h"
#include <string> #include <string>
u32 u8_nextchar(const char *s, int *i); u32 u8_nextchar(const char *s, int *i);

4
src/common/version.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "scm_rev.h" #include "common/scm_rev.h"
#ifdef _DEBUG #ifdef _DEBUG
#define BUILD_TYPE_STR "Debug " #define BUILD_TYPE_STR "Debug "

4
src/core/arm/arm_interface.h
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "common.h" #include "common/common.h"
#include "common_types.h" #include "common/common_types.h"
/// Generic ARM11 CPU interface /// Generic ARM11 CPU interface
class ARM_Interface { class ARM_Interface {

3
src/core/arm/disassembler/arm_disasm.cpp
View File

@ -2,7 +2,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "arm_disasm.h"
#include "core/arm/disassembler/arm_disasm.h"
static const char *cond_names[] = { static const char *cond_names[] = {
"eq", "eq",

9
src/core/arm/interpreter/arm_interpreter.h
View File

@ -24,12 +24,11 @@
#pragma once #pragma once
#include "common.h" #include "common/common.h"
#include "common_types.h"
#include "arm/arm_interface.h"
#include "arm/interpreter/armdefs.h" #include "core/arm/arm_interface.h"
#include "arm/interpreter/armemu.h" #include "core/arm/interpreter/armdefs.h"
#include "core/arm/interpreter/armemu.h"
class ARM_Interpreter : virtual public ARM_Interface { class ARM_Interpreter : virtual public ARM_Interface {
public: public:

2
src/core/arm/interpreter/armcpu.h
View File

@ -28,7 +28,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include "thread.h" #include "common/thread.h"
typedef struct ARM_CPU_State_s { typedef struct ARM_CPU_State_s {

4
src/core/arm/interpreter/armdefs.h
View File

@ -32,7 +32,7 @@
//#include "portable/mman.h" //#include "portable/mman.h"
#include "arm_regformat.h" #include "arm_regformat.h"
#include "platform.h" #include "common/platform.h"
#include "skyeye_defs.h" #include "skyeye_defs.h"
//AJ2D-------------------------------------------------------------------------- //AJ2D--------------------------------------------------------------------------
@ -82,7 +82,7 @@
//teawater add DBCT_TEST_SPEED 2005.10.04--------------------------------------- //teawater add DBCT_TEST_SPEED 2005.10.04---------------------------------------
#include <signal.h> #include <signal.h>
#include "platform.h" #include "common/platform.h"
#if EMU_PLATFORM == PLATFORM_LINUX #if EMU_PLATFORM == PLATFORM_LINUX
#include <sys/time.h> #include <sys/time.h>

2
src/core/arm/interpreter/armemu.h
View File

@ -17,7 +17,7 @@
#ifndef __ARMEMU_H__ #ifndef __ARMEMU_H__
#define __ARMEMU_H__ #define __ARMEMU_H__
#include "common.h" #include "common/common.h"
#include "armdefs.h" #include "armdefs.h"
//#include "skyeye.h" //#include "skyeye.h"

2
src/core/arm/interpreter/arminit.cpp
View File

@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "platform.h" #include "common/platform.h"
#if EMU_PLATFORM == PLATFORM_LINUX #if EMU_PLATFORM == PLATFORM_LINUX
#include <unistd.h> #include <unistd.h>
#endif #endif

20
src/core/arm/interpreter/armmmu.h
View File

@ -172,18 +172,18 @@ typedef struct mmu_ops_s
} mmu_ops_t; } mmu_ops_t;
#include "arm/mmu/tlb.h" #include "core/arm/mmu/tlb.h"
#include "arm/mmu/rb.h" #include "core/arm/mmu/rb.h"
#include "arm/mmu/wb.h" #include "core/arm/mmu/wb.h"
#include "arm/mmu/cache.h" #include "core/arm/mmu/cache.h"
/*special process mmu.h*/ /*special process mmu.h*/
//#include "arm/mmu/sa_mmu.h" //#include "core/arm/mmu/sa_mmu.h"
//#include "arm/mmu/arm7100_mmu.h" //#include "core/arm/mmu/arm7100_mmu.h"
//#include "arm/mmu/arm920t_mmu.h" //#include "core/arm/mmu/arm920t_mmu.h"
//#include "arm/mmu/arm926ejs_mmu.h" //#include "core/arm/mmu/arm926ejs_mmu.h"
#include "arm/mmu/arm1176jzf_s_mmu.h" #include "core/arm/mmu/arm1176jzf_s_mmu.h"
//#include "arm/mmu/cortex_a9_mmu.h" //#include "core/arm/mmu/cortex_a9_mmu.h"
typedef struct mmu_state_t typedef struct mmu_state_t
{ {

2
src/core/arm/interpreter/skyeye_defs.h
View File

@ -1,7 +1,7 @@
#ifndef CORE_ARM_SKYEYE_DEFS_H_ #ifndef CORE_ARM_SKYEYE_DEFS_H_
#define CORE_ARM_SKYEYE_DEFS_H_ #define CORE_ARM_SKYEYE_DEFS_H_
#include "common.h" #include "common/common.h"
#define MODE32 #define MODE32
#define MODET #define MODET

6
src/core/arm/mmu/arm1176jzf_s_mmu.cpp
View File

@ -22,11 +22,11 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include "mem_map.h" #include "core/mem_map.h"
#include "arm/interpreter/skyeye_defs.h" #include "core/arm/interpreter/skyeye_defs.h"
#include "arm/interpreter/armdefs.h" #include "core/arm/interpreter/armdefs.h"
//#include "bank_defs.h" //#include "bank_defs.h"
#if 0 #if 0
#define TLB_SIZE 1024 * 1024 #define TLB_SIZE 1024 * 1024

14
src/core/core.cpp
View File

@ -2,12 +2,14 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "log.h" #include "common/common_types.h"
#include "core.h" #include "common/log.h"
#include "mem_map.h" #include "core/core.h"
#include "hw/hw.h"
#include "arm/disassembler/arm_disasm.h" #include "core/mem_map.h"
#include "arm/interpreter/arm_interpreter.h" #include "core/hw/hw.h"
#include "core/arm/disassembler/arm_disasm.h"
#include "core/arm/interpreter/arm_interpreter.h"
namespace Core { namespace Core {

4
src/core/core.h
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "arm/arm_interface.h" #include "core/arm/arm_interface.h"
#include "arm/interpreter/armdefs.h" #include "core/arm/interpreter/armdefs.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

98
src/core/core.vcxproj
View File

@ -137,59 +137,59 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\arm\disassembler\arm_disasm.cpp" /> <ClCompile Include="arm\disassembler\arm_disasm.cpp" />
<ClCompile Include="src\arm\interpreter\armemu.cpp" /> <ClCompile Include="arm\interpreter\armemu.cpp" />
<ClCompile Include="src\arm\interpreter\arminit.cpp" /> <ClCompile Include="arm\interpreter\arminit.cpp" />
<ClCompile Include="src\arm\interpreter\armmmu.cpp" /> <ClCompile Include="arm\interpreter\armmmu.cpp" />
<ClCompile Include="src\arm\interpreter\armos.cpp" /> <ClCompile Include="arm\interpreter\armos.cpp" />
<ClCompile Include="src\arm\interpreter\armsupp.cpp" /> <ClCompile Include="arm\interpreter\armsupp.cpp" />
<ClCompile Include="src\arm\interpreter\armvirt.cpp" /> <ClCompile Include="arm\interpreter\armvirt.cpp" />
<ClCompile Include="src\arm\interpreter\arm_interpreter.cpp" /> <ClCompile Include="arm\interpreter\arm_interpreter.cpp" />
<ClCompile Include="src\arm\interpreter\thumbemu.cpp" /> <ClCompile Include="arm\interpreter\thumbemu.cpp" />
<ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp" /> <ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp" />
<ClCompile Include="src\core.cpp" /> <ClCompile Include="core.cpp" />
<ClCompile Include="src\core_timing.cpp" /> <ClCompile Include="core_timing.cpp" />
<ClCompile Include="src\elf\elf_reader.cpp" /> <ClCompile Include="elf\elf_reader.cpp" />
<ClCompile Include="src\file_sys\directory_file_system.cpp" /> <ClCompile Include="file_sys\directory_file_system.cpp" />
<ClCompile Include="src\file_sys\meta_file_system.cpp" /> <ClCompile Include="file_sys\meta_file_system.cpp" />
<ClCompile Include="src\hw\hw.cpp" /> <ClCompile Include="hw\hw.cpp" />
<ClCompile Include="src\hw\hw_lcd.cpp" /> <ClCompile Include="hw\hw_lcd.cpp" />
<ClCompile Include="src\loader.cpp" /> <ClCompile Include="loader.cpp" />
<ClCompile Include="src\mem_map.cpp" /> <ClCompile Include="mem_map.cpp" />
<ClCompile Include="src\mem_map_funcs.cpp" /> <ClCompile Include="mem_map_funcs.cpp" />
<ClCompile Include="src\system.cpp" /> <ClCompile Include="system.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\arm\arm_interface.h" /> <ClInclude Include="arm\arm_interface.h" />
<ClInclude Include="src\arm\disassembler\arm_disasm.h" /> <ClInclude Include="arm\disassembler\arm_disasm.h" />
<ClInclude Include="src\arm\interpreter\armcpu.h" /> <ClInclude Include="arm\interpreter\armcpu.h" />
<ClInclude Include="src\arm\interpreter\armdefs.h" /> <ClInclude Include="arm\interpreter\armdefs.h" />
<ClInclude Include="src\arm\interpreter\armemu.h" /> <ClInclude Include="arm\interpreter\armemu.h" />
<ClInclude Include="src\arm\interpreter\armmmu.h" /> <ClInclude Include="arm\interpreter\armmmu.h" />
<ClInclude Include="src\arm\interpreter\armos.h" /> <ClInclude Include="arm\interpreter\armos.h" />
<ClInclude Include="src\arm\interpreter\arm_interpreter.h" /> <ClInclude Include="arm\interpreter\arm_interpreter.h" />
<ClInclude Include="src\arm\interpreter\arm_regformat.h" /> <ClInclude Include="arm\interpreter\arm_regformat.h" />
<ClInclude Include="src\arm\interpreter\skyeye_defs.h" /> <ClInclude Include="arm\interpreter\skyeye_defs.h" />
<ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h" /> <ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h" />
<ClInclude Include="src\arm\mmu\cache.h" /> <ClInclude Include="arm\mmu\cache.h" />
<ClInclude Include="src\arm\mmu\rb.h" /> <ClInclude Include="arm\mmu\rb.h" />
<ClInclude Include="src\arm\mmu\tlb.h" /> <ClInclude Include="arm\mmu\tlb.h" />
<ClInclude Include="src\arm\mmu\wb.h" /> <ClInclude Include="arm\mmu\wb.h" />
<ClInclude Include="src\core.h" /> <ClInclude Include="core.h" />
<ClInclude Include="src\core_timing.h" /> <ClInclude Include="core_timing.h" />
<ClInclude Include="src\elf\elf_reader.h" /> <ClInclude Include="elf\elf_reader.h" />
<ClInclude Include="src\elf\elf_types.h" /> <ClInclude Include="elf\elf_types.h" />
<ClInclude Include="src\file_sys\directory_file_system.h" /> <ClInclude Include="file_sys\directory_file_system.h" />
<ClInclude Include="src\file_sys\file_sys.h" /> <ClInclude Include="file_sys\file_sys.h" />
<ClInclude Include="src\file_sys\meta_file_system.h" /> <ClInclude Include="file_sys\meta_file_system.h" />
<ClInclude Include="src\hw\hw.h" /> <ClInclude Include="hw\hw.h" />
<ClInclude Include="src\hw\hw_lcd.h" /> <ClInclude Include="hw\hw_lcd.h" />
<ClInclude Include="src\loader.h" /> <ClInclude Include="loader.h" />
<ClInclude Include="src\mem_map.h" /> <ClInclude Include="mem_map.h" />
<ClInclude Include="src\system.h" /> <ClInclude Include="system.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

211
src/core/core.vcxproj.filters
View File

@ -1,58 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="src\core.cpp" />
<ClCompile Include="src\arm\disassembler\arm_disasm.cpp">
<Filter>arm\disassembler</Filter>
</ClCompile>
<ClCompile Include="src\mem_map.cpp" />
<ClCompile Include="src\mem_map_funcs.cpp" />
<ClCompile Include="src\loader.cpp" />
<ClCompile Include="src\file_sys\directory_file_system.cpp">
<Filter>file_sys</Filter>
</ClCompile>
<ClCompile Include="src\file_sys\meta_file_system.cpp">
<Filter>file_sys</Filter>
</ClCompile>
<ClCompile Include="src\system.cpp" />
<ClCompile Include="src\core_timing.cpp" />
<ClCompile Include="src\elf\elf_reader.cpp">
<Filter>elf</Filter>
</ClCompile>
<ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp">
<Filter>arm\mmu</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\armemu.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\arminit.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\armmmu.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\armos.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\armsupp.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\armvirt.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\thumbemu.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\arm\interpreter\arm_interpreter.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="src\hw\hw.cpp">
<Filter>hw</Filter>
</ClCompile>
<ClCompile Include="src\hw\hw_lcd.cpp">
<Filter>hw</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="arm"> <Filter Include="arm">
<UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier> <UniqueIdentifier>{b84ab55c-588b-45f0-a5ba-f9ebb0442f13}</UniqueIdentifier>
@ -66,93 +13,143 @@
<Filter Include="file_sys"> <Filter Include="file_sys">
<UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier> <UniqueIdentifier>{7f618562-73d1-4f55-9628-887497c27654}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="elf">
<UniqueIdentifier>{671d3218-3771-4218-b142-1f9a1cc24a51}</UniqueIdentifier>
</Filter>
<Filter Include="hle">
<UniqueIdentifier>{794616f8-739f-4643-9c3f-869e50831d4f}</UniqueIdentifier>
</Filter>
<Filter Include="arm\interpreter"> <Filter Include="arm\interpreter">
<UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier> <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="hw"> <Filter Include="hw">
<UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier> <UniqueIdentifier>{d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="elf">
<UniqueIdentifier>{7ae34319-6d72-4d12-bc62-9b438ba9241f}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\arm\disassembler\arm_disasm.h"> <ClCompile Include="arm\disassembler\arm_disasm.cpp">
<Filter>arm\disassembler</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\arm_interpreter.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\armemu.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\arminit.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\armmmu.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\armos.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\armsupp.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\armvirt.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\interpreter\thumbemu.cpp">
<Filter>arm\interpreter</Filter>
</ClCompile>
<ClCompile Include="arm\mmu\arm1176jzf_s_mmu.cpp">
<Filter>arm\mmu</Filter>
</ClCompile>
<ClCompile Include="file_sys\directory_file_system.cpp">
<Filter>file_sys</Filter>
</ClCompile>
<ClCompile Include="file_sys\meta_file_system.cpp">
<Filter>file_sys</Filter>
</ClCompile>
<ClCompile Include="hw\hw.cpp">
<Filter>hw</Filter>
</ClCompile>
<ClCompile Include="hw\hw_lcd.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" />
<ClCompile Include="core_timing.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="arm\disassembler\arm_disasm.h">
<Filter>arm\disassembler</Filter> <Filter>arm\disassembler</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\mem_map.h" /> <ClInclude Include="arm\interpreter\arm_interpreter.h">
<ClInclude Include="src\core.h" /> <Filter>arm\interpreter</Filter>
<ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h"> </ClInclude>
<ClInclude Include="arm\interpreter\arm_regformat.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="arm\interpreter\armcpu.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="arm\interpreter\armdefs.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="arm\interpreter\armemu.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="arm\interpreter\armmmu.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="arm\interpreter\armos.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="arm\interpreter\skyeye_defs.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="arm\mmu\arm1176jzf_s_mmu.h">
<Filter>arm\mmu</Filter> <Filter>arm\mmu</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\arm\mmu\cache.h"> <ClInclude Include="arm\mmu\cache.h">
<Filter>arm\mmu</Filter> <Filter>arm\mmu</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\arm\mmu\rb.h"> <ClInclude Include="arm\mmu\rb.h">
<Filter>arm\mmu</Filter> <Filter>arm\mmu</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\arm\mmu\tlb.h"> <ClInclude Include="arm\mmu\tlb.h">
<Filter>arm\mmu</Filter> <Filter>arm\mmu</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\arm\mmu\wb.h"> <ClInclude Include="arm\mmu\wb.h">
<Filter>arm\mmu</Filter> <Filter>arm\mmu</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\loader.h" /> <ClInclude Include="file_sys\directory_file_system.h">
<ClInclude Include="src\file_sys\file_sys.h">
<Filter>file_sys</Filter> <Filter>file_sys</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\file_sys\directory_file_system.h"> <ClInclude Include="file_sys\file_sys.h">
<Filter>file_sys</Filter> <Filter>file_sys</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\file_sys\meta_file_system.h"> <ClInclude Include="file_sys\meta_file_system.h">
<Filter>file_sys</Filter> <Filter>file_sys</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\system.h" /> <ClInclude Include="hw\hw.h">
<ClInclude Include="src\core_timing.h" /> <Filter>hw</Filter>
<ClInclude Include="src\elf\elf_reader.h"> </ClInclude>
<ClInclude Include="hw\hw_lcd.h">
<Filter>hw</Filter>
</ClInclude>
<ClInclude Include="elf\elf_reader.h">
<Filter>elf</Filter> <Filter>elf</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\elf\elf_types.h"> <ClInclude Include="elf\elf_types.h">
<Filter>elf</Filter> <Filter>elf</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\arm\interpreter\arm_regformat.h"> <ClInclude Include="arm\arm_interface.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="src\arm\interpreter\armcpu.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="src\arm\interpreter\armdefs.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="src\arm\interpreter\armemu.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="src\arm\interpreter\armmmu.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="src\arm\interpreter\armos.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="src\arm\interpreter\skyeye_defs.h">
<Filter>arm\interpreter</Filter>
</ClInclude>
<ClInclude Include="src\arm\arm_interface.h">
<Filter>arm</Filter> <Filter>arm</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\arm\interpreter\arm_interpreter.h"> <ClInclude Include="core.h" />
<Filter>arm\interpreter</Filter> <ClInclude Include="core_timing.h" />
</ClInclude> <ClInclude Include="loader.h" />
<ClInclude Include="src\hw\hw.h"> <ClInclude Include="mem_map.h" />
<Filter>hw</Filter> <ClInclude Include="system.h" />
</ClInclude>
<ClInclude Include="src\hw\hw_lcd.h">
<Filter>hw</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

13
src/core/core_timing.cpp
View File

@ -5,12 +5,13 @@
#include <vector> #include <vector>
#include <cstdio> #include <cstdio>
#include "msg_handler.h" #include "common/msg_handler.h"
#include "std_mutex.h" #include "common/std_mutex.h"
#include "atomic.h" #include "common/atomic.h"
#include "core_timing.h" #include "common/chunk_file.h"
#include "core.h"
#include "chunk_file.h" #include "core/core_timing.h"
#include "core/core.h"
int g_clock_rate_arm11 = 268123480; int g_clock_rate_arm11 = 268123480;

2
src/core/core_timing.h
View File

@ -17,7 +17,7 @@
// inside callback: // inside callback:
// ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") // ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
#include "common.h" #include "common/common.h"
class PointerWrap; class PointerWrap;

7
src/core/elf/elf_reader.cpp
View File

@ -4,10 +4,11 @@
#include <string> #include <string>
#include "common.h" #include "common/common.h"
#include "mem_map.h"
#include "core/mem_map.h"
#include "core/elf/elf_reader.h"
#include "elf/elf_reader.h"
//#include "Core/Debugger/Debugger_SymbolMap.h" //#include "Core/Debugger/Debugger_SymbolMap.h"
//#include "Core/HW/Memmap.h" //#include "Core/HW/Memmap.h"
//#include "Core/PowerPC/PPCSymbolDB.h" //#include "Core/PowerPC/PPCSymbolDB.h"

2
src/core/elf/elf_reader.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "elf/elf_types.h" #include "core/elf/elf_types.h"
enum KnownElfTypes enum KnownElfTypes
{ {

12
src/core/file_sys/directory_file_system.cpp
View File

@ -15,13 +15,11 @@
// Official git repository and contact information can be found at // Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "chunk_file.h" #include "common/chunk_file.h"
#include "file_util.h" #include "common/file_util.h"
#include "directory_file_system.h" #include "common/utf8.h"
//#include "ISOFileSystem.h"
//#include "Core/HLE/sceKernel.h" #include "core/file_sys/directory_file_system.h"
//#include "file/zip_read.h"
#include "utf8.h"
#if EMU_PLATFORM == PLATFORM_WINDOWS #if EMU_PLATFORM == PLATFORM_WINDOWS
#include <windows.h> #include <windows.h>

7
src/core/file_sys/directory_file_system.h
View File

@ -15,14 +15,13 @@
// Official git repository and contact information can be found at // Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#ifndef CORE_FILE_SYS_DIRECTORY_H_ #pragma once
#define CORE_FILE_SYS_DIRECTORY_H_
// TODO: Remove the Windows-specific code, FILE is fine there too. // TODO: Remove the Windows-specific code, FILE is fine there too.
#include <map> #include <map>
#include "file_sys.h" #include "core/file_sys/file_sys.h"
#ifdef _WIN32 #ifdef _WIN32
typedef void * HANDLE; typedef void * HANDLE;
@ -154,5 +153,3 @@ private:
std::string GetLocalPath(std::string localpath); std::string GetLocalPath(std::string localpath);
}; };
#endif // CORE_FILE_SYS_DIRECTORY_H_

4
src/core/file_sys/file_sys.h
View File

@ -17,8 +17,8 @@
#pragma once #pragma once
#include "common.h" #include "common/common.h"
#include "chunk_file.h" #include "common/chunk_file.h"
enum FileAccess { enum FileAccess {
FILEACCESS_NONE=0, FILEACCESS_NONE=0,

7
src/core/file_sys/meta_file_system.cpp
View File

@ -17,10 +17,9 @@
#include <set> #include <set>
#include <algorithm> #include <algorithm>
#include "string_util.h"
#include "file_sys/meta_file_system.h" #include "common/string_util.h"
//#include "Core/HLE/sceKernelThread.h" #include "core/file_sys/meta_file_system.h"
//#include "Core/Reporting.h"
static bool ApplyPathStringToComponentsVector(std::vector<std::string> &vector, const std::string &pathString) static bool ApplyPathStringToComponentsVector(std::vector<std::string> &vector, const std::string &pathString)
{ {

5
src/core/file_sys/meta_file_system.h
View File

@ -17,8 +17,9 @@
#pragma once #pragma once
#include "std_mutex.h" #include "common/std_mutex.h"
#include "file_sys.h"
#include "core/file_sys/file_sys.h"
class MetaFileSystem : public IHandleAllocator, public IFileSystem class MetaFileSystem : public IHandleAllocator, public IFileSystem
{ {

8
src/core/hw/hw.cpp
View File

@ -2,9 +2,11 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "log.h" #include "common/common_types.h"
#include "hw/hw.h" #include "common/log.h"
#include "hw/hw_lcd.h"
#include "core/hw/hw.h"
#include "core/hw/hw_lcd.h"
namespace HW { namespace HW {

2
src/core/hw/hw.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "common_types.h" #include "common/common_types.h"
namespace HW { namespace HW {

11
src/core/hw/hw_lcd.cpp
View File

@ -2,10 +2,13 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "log.h" #include "common/common_types.h"
#include "core.h" #include "common/log.h"
#include "hw_lcd.h"
#include "video_core.h" #include "core/core.h"
#include "core/hw/hw_lcd.h"
#include "video_core/video_core.h"
namespace LCD { namespace LCD {

2
src/core/hw/hw_lcd.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "common_types.h" #include "common/common_types.h"
namespace LCD { namespace LCD {

14
src/core/loader.cpp
View File

@ -2,12 +2,14 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "file_util.h" #include "common/common_types.h"
#include "loader.h" #include "common/file_util.h"
#include "system.h"
#include "core.h" #include "core/loader.h"
#include "file_sys/directory_file_system.h" #include "core/system.h"
#include "elf/elf_reader.h" #include "core/core.h"
#include "core/file_sys/directory_file_system.h"
#include "core/elf/elf_reader.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

2
src/core/loader.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "common.h" #include "common/common.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

8
src/core/mem_map.cpp
View File

@ -2,11 +2,11 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "mem_arena.h" #include "common/mem_arena.h"
#include "mem_map.h" #include "core/mem_map.h"
#include "core.h" #include "core/core.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

4
src/core/mem_map.h
View File

@ -6,8 +6,8 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
#include "common.h" #include "common/common.h"
#include "common_types.h" #include "common/common_types.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

6
src/core/mem_map_funcs.cpp
View File

@ -2,10 +2,10 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "mem_map.h" #include "core/mem_map.h"
#include "hw/hw.h" #include "core/hw/hw.h"
namespace Memory { namespace Memory {

13
src/core/system.cpp
View File

@ -2,12 +2,13 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "core.h" #include "core/core.h"
#include "hw/hw.h" #include "core/core_timing.h"
#include "core_timing.h" #include "core/mem_map.h"
#include "mem_map.h" #include "core/system.h"
#include "system.h" #include "core/hw/hw.h"
#include "video_core.h"
#include "video_core/video_core.h"
namespace System { namespace System {

4
src/core/system.h
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "emu_window.h" #include "common/emu_window.h"
#include "file_sys/meta_file_system.h" #include "core/file_sys/meta_file_system.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

3
src/video_core/renderer_base.h
View File

@ -4,8 +4,7 @@
#pragma once #pragma once
#include "common.h" #include "common/common.h"
#include "hash.h"
class RendererBase { class RendererBase {
public: public:

7
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -2,9 +2,10 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "mem_map.h" #include "video_core/video_core.h"
#include "video_core.h" #include "video_core/renderer_opengl/renderer_opengl.h"
#include "renderer_opengl/renderer_opengl.h"
#include "core/mem_map.h"
/// RendererOpenGL constructor /// RendererOpenGL constructor

6
src/video_core/renderer_opengl/renderer_opengl.h
View File

@ -6,10 +6,10 @@
#include <GL/glew.h> #include <GL/glew.h>
#include "common.h" #include "common/common.h"
#include "emu_window.h" #include "common/emu_window.h"
#include "renderer_base.h" #include "video_core/renderer_base.h"
class RendererOpenGL : virtual public RendererBase { class RendererOpenGL : virtual public RendererBase {

2
src/video_core/utils.cpp
View File

@ -5,7 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "utils.h" #include "video_core/utils.h"
namespace VideoCore { namespace VideoCore {

2
src/video_core/utils.h
View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include "common_types.h" #include "common/common_types.h"
namespace FormatPrecision { namespace FormatPrecision {

14
src/video_core/video_core.cpp
View File

@ -2,15 +2,15 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common.h" #include "common/common.h"
#include "emu_window.h" #include "common/emu_window.h"
#include "log.h" #include "common/log.h"
#include "core.h" #include "core/core.h"
#include "video_core.h" #include "video_core/video_core.h"
#include "renderer_base.h" #include "video_core/renderer_base.h"
#include "renderer_opengl/renderer_opengl.h" #include "video_core/renderer_opengl/renderer_opengl.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Video Core namespace // Video Core namespace

5
src/video_core/video_core.h
View File

@ -4,8 +4,9 @@
#pragma once #pragma once
#include "common.h" #include "common/common.h"
#include "emu_window.h" #include "common/emu_window.h"
#include "renderer_base.h" #include "renderer_base.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

14
src/video_core/video_core.vcxproj
View File

@ -19,15 +19,15 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\renderer_opengl\renderer_opengl.cpp" /> <ClCompile Include="renderer_opengl\renderer_opengl.cpp" />
<ClCompile Include="src\utils.cpp" /> <ClCompile Include="utils.cpp" />
<ClCompile Include="src\video_core.cpp" /> <ClCompile Include="video_core.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\renderer_base.h" /> <ClInclude Include="renderer_base.h" />
<ClInclude Include="src\renderer_opengl\renderer_opengl.h" /> <ClInclude Include="renderer_opengl\renderer_opengl.h" />
<ClInclude Include="src\utils.h" /> <ClInclude Include="utils.h" />
<ClInclude Include="src\video_core.h" /> <ClInclude Include="video_core.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />

36
src/video_core/video_core.vcxproj.filters
View File

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="src\video_core.cpp" />
<ClCompile Include="src\utils.cpp" />
<ClCompile Include="src\renderer_opengl\renderer_opengl.cpp">
<Filter>renderer_opengl</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\renderer_base.h" />
<ClInclude Include="src\video_core.h" />
<ClInclude Include="src\utils.h" />
<ClInclude Include="src\renderer_opengl\renderer_opengl.h">
<Filter>renderer_opengl</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="renderer_opengl"> <Filter Include="renderer_opengl">
<UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier> <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="renderer_opengl\renderer_opengl.cpp">
<Filter>renderer_opengl</Filter>
</ClCompile>
<ClCompile Include="utils.cpp" />
<ClCompile Include="video_core.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="renderer_opengl\renderer_opengl.h">
<Filter>renderer_opengl</Filter>
</ClInclude>
<ClInclude Include="renderer_base.h" />
<ClInclude Include="utils.h" />
<ClInclude Include="video_core.h" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
</Project> </Project>

2
vsprops/base.props
View File

@ -12,7 +12,7 @@
<StructMemberAlignment>16Bytes</StructMemberAlignment> <StructMemberAlignment>16Bytes</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\video_core\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions> <PreprocessorDefinitions>
</PreprocessorDefinitions> </PreprocessorDefinitions>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>