diff options
author | bunnei <ericbunnie@gmail.com> | 2014-04-05 03:12:05 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-04-05 03:12:05 +0200 |
commit | 66299a48801fffe8e7920fc87b2d3806a4816dce (patch) | |
tree | 3d870a73bd090b88156fb512c27c5d01c1d64035 /src/core | |
parent | added some commented out ARMulator functions (diff) | |
download | yuzu-66299a48801fffe8e7920fc87b2d3806a4816dce.tar yuzu-66299a48801fffe8e7920fc87b2d3806a4816dce.tar.gz yuzu-66299a48801fffe8e7920fc87b2d3806a4816dce.tar.bz2 yuzu-66299a48801fffe8e7920fc87b2d3806a4816dce.tar.lz yuzu-66299a48801fffe8e7920fc87b2d3806a4816dce.tar.xz yuzu-66299a48801fffe8e7920fc87b2d3806a4816dce.tar.zst yuzu-66299a48801fffe8e7920fc87b2d3806a4816dce.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core.vcxproj | 28 | ||||
-rw-r--r-- | src/core/core.vcxproj.filters | 84 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/arm_regformat.h (renamed from src/core/src/arm/arm_regformat.h) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armcpu.h (renamed from src/core/src/arm/armcpu.h) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armdefs.h (renamed from src/core/src/arm/armdefs.h) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armemu.cpp (renamed from src/core/src/arm/armemu.cpp) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armemu.h (renamed from src/core/src/arm/armemu.h) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/arminit.cpp (renamed from src/core/src/arm/arminit.cpp) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armmmu.cpp (renamed from src/core/src/arm/armmmu.cpp) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armmmu.h (renamed from src/core/src/arm/armmmu.h) | 20 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armos.cpp (renamed from src/core/src/arm/armos.cpp) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armos.h (renamed from src/core/src/arm/armos.h) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armsupp.cpp (renamed from src/core/src/arm/armsupp.cpp) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/armvirt.cpp (renamed from src/core/src/arm/armvirt.cpp) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/skyeye_defs.h (renamed from src/core/src/arm/skyeye_defs.h) | 0 | ||||
-rw-r--r-- | src/core/src/arm/interpreter/thumbemu.cpp (renamed from src/core/src/arm/thumbemu.cpp) | 0 | ||||
-rw-r--r-- | src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp | 4 |
17 files changed, 71 insertions, 65 deletions
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index c97abd069..4cd55c575 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -137,15 +137,15 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <ClCompile Include="src\arm\armemu.cpp" /> - <ClCompile Include="src\arm\arminit.cpp" /> - <ClCompile Include="src\arm\armmmu.cpp" /> - <ClCompile Include="src\arm\armos.cpp" /> - <ClCompile Include="src\arm\armsupp.cpp" /> - <ClCompile Include="src\arm\armvirt.cpp" /> <ClCompile Include="src\arm\disassembler\arm_disasm.cpp" /> + <ClCompile Include="src\arm\interpreter\armemu.cpp" /> + <ClCompile Include="src\arm\interpreter\arminit.cpp" /> + <ClCompile Include="src\arm\interpreter\armmmu.cpp" /> + <ClCompile Include="src\arm\interpreter\armos.cpp" /> + <ClCompile Include="src\arm\interpreter\armsupp.cpp" /> + <ClCompile Include="src\arm\interpreter\armvirt.cpp" /> + <ClCompile Include="src\arm\interpreter\thumbemu.cpp" /> <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp" /> - <ClCompile Include="src\arm\thumbemu.cpp" /> <ClCompile Include="src\core.cpp" /> <ClCompile Include="src\core_timing.cpp" /> <ClCompile Include="src\elf\elf_reader.cpp" /> @@ -157,19 +157,19 @@ <ClCompile Include="src\system.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="src\arm\armcpu.h" /> - <ClInclude Include="src\arm\armdefs.h" /> - <ClInclude Include="src\arm\armemu.h" /> - <ClInclude Include="src\arm\armmmu.h" /> - <ClInclude Include="src\arm\armos.h" /> - <ClInclude Include="src\arm\arm_regformat.h" /> <ClInclude Include="src\arm\disassembler\arm_disasm.h" /> + <ClInclude Include="src\arm\interpreter\armcpu.h" /> + <ClInclude Include="src\arm\interpreter\armdefs.h" /> + <ClInclude Include="src\arm\interpreter\armemu.h" /> + <ClInclude Include="src\arm\interpreter\armmmu.h" /> + <ClInclude Include="src\arm\interpreter\armos.h" /> + <ClInclude Include="src\arm\interpreter\arm_regformat.h" /> + <ClInclude Include="src\arm\interpreter\skyeye_defs.h" /> <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h" /> <ClInclude Include="src\arm\mmu\cache.h" /> <ClInclude Include="src\arm\mmu\rb.h" /> <ClInclude Include="src\arm\mmu\tlb.h" /> <ClInclude Include="src\arm\mmu\wb.h" /> - <ClInclude Include="src\arm\skyeye_defs.h" /> <ClInclude Include="src\core.h" /> <ClInclude Include="src\core_timing.h" /> <ClInclude Include="src\elf\elf_reader.h" /> diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 7521c7e70..fe583127a 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -6,12 +6,6 @@ <Filter>arm\disassembler</Filter> </ClCompile> <ClCompile Include="src\mem_map.cpp" /> - <ClCompile Include="src\arm\arminit.cpp"> - <Filter>arm</Filter> - </ClCompile> - <ClCompile Include="src\arm\armemu.cpp"> - <Filter>arm</Filter> - </ClCompile> <ClCompile Include="src\mem_map_funcs.cpp" /> <ClCompile Include="src\loader.cpp" /> <ClCompile Include="src\file_sys\directory_file_system.cpp"> @@ -25,23 +19,29 @@ <ClCompile Include="src\elf\elf_reader.cpp"> <Filter>elf</Filter> </ClCompile> - <ClCompile Include="src\arm\armsupp.cpp"> - <Filter>arm</Filter> + <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp"> + <Filter>arm\mmu</Filter> </ClCompile> - <ClCompile Include="src\arm\armvirt.cpp"> - <Filter>arm</Filter> + <ClCompile Include="src\arm\interpreter\armemu.cpp"> + <Filter>arm\interpreter</Filter> </ClCompile> - <ClCompile Include="src\arm\armmmu.cpp"> - <Filter>arm</Filter> + <ClCompile Include="src\arm\interpreter\arminit.cpp"> + <Filter>arm\interpreter</Filter> </ClCompile> - <ClCompile Include="src\arm\armos.cpp"> - <Filter>arm</Filter> + <ClCompile Include="src\arm\interpreter\armmmu.cpp"> + <Filter>arm\interpreter</Filter> </ClCompile> - <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp"> - <Filter>arm\mmu</Filter> + <ClCompile Include="src\arm\interpreter\armos.cpp"> + <Filter>arm\interpreter</Filter> </ClCompile> - <ClCompile Include="src\arm\thumbemu.cpp"> - <Filter>arm</Filter> + <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> </ItemGroup> <ItemGroup> @@ -60,6 +60,12 @@ <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"> + <UniqueIdentifier>{cca8b763-8a80-4478-9bcc-3c979293c357}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="src\arm\disassembler\arm_disasm.h"> @@ -67,27 +73,6 @@ </ClInclude> <ClInclude Include="src\mem_map.h" /> <ClInclude Include="src\core.h" /> - <ClInclude Include="src\arm\armdefs.h"> - <Filter>arm</Filter> - </ClInclude> - <ClInclude Include="src\arm\armemu.h"> - <Filter>arm</Filter> - </ClInclude> - <ClInclude Include="src\arm\skyeye_defs.h"> - <Filter>arm</Filter> - </ClInclude> - <ClInclude Include="src\arm\arm_regformat.h"> - <Filter>arm</Filter> - </ClInclude> - <ClInclude Include="src\arm\armos.h"> - <Filter>arm</Filter> - </ClInclude> - <ClInclude Include="src\arm\armmmu.h"> - <Filter>arm</Filter> - </ClInclude> - <ClInclude Include="src\arm\armcpu.h"> - <Filter>arm</Filter> - </ClInclude> <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h"> <Filter>arm\mmu</Filter> </ClInclude> @@ -121,6 +106,27 @@ <ClInclude Include="src\elf\elf_types.h"> <Filter>elf</Filter> </ClInclude> + <ClInclude Include="src\arm\interpreter\arm_regformat.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> </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" /> diff --git a/src/core/src/arm/arm_regformat.h b/src/core/src/arm/interpreter/arm_regformat.h index 0ca62780b..0ca62780b 100644 --- a/src/core/src/arm/arm_regformat.h +++ b/src/core/src/arm/interpreter/arm_regformat.h diff --git a/src/core/src/arm/armcpu.h b/src/core/src/arm/interpreter/armcpu.h index d7e336b94..d7e336b94 100644 --- a/src/core/src/arm/armcpu.h +++ b/src/core/src/arm/interpreter/armcpu.h diff --git a/src/core/src/arm/armdefs.h b/src/core/src/arm/interpreter/armdefs.h index 0136a52d2..0136a52d2 100644 --- a/src/core/src/arm/armdefs.h +++ b/src/core/src/arm/interpreter/armdefs.h diff --git a/src/core/src/arm/armemu.cpp b/src/core/src/arm/interpreter/armemu.cpp index 5e3a9cfbf..5e3a9cfbf 100644 --- a/src/core/src/arm/armemu.cpp +++ b/src/core/src/arm/interpreter/armemu.cpp diff --git a/src/core/src/arm/armemu.h b/src/core/src/arm/interpreter/armemu.h index d4afa8e22..d4afa8e22 100644 --- a/src/core/src/arm/armemu.h +++ b/src/core/src/arm/interpreter/armemu.h diff --git a/src/core/src/arm/arminit.cpp b/src/core/src/arm/interpreter/arminit.cpp index f48232eec..f48232eec 100644 --- a/src/core/src/arm/arminit.cpp +++ b/src/core/src/arm/interpreter/arminit.cpp diff --git a/src/core/src/arm/armmmu.cpp b/src/core/src/arm/interpreter/armmmu.cpp index 242e6a83c..242e6a83c 100644 --- a/src/core/src/arm/armmmu.cpp +++ b/src/core/src/arm/interpreter/armmmu.cpp diff --git a/src/core/src/arm/armmmu.h b/src/core/src/arm/interpreter/armmmu.h index a8d908c20..c28d8753e 100644 --- a/src/core/src/arm/armmmu.h +++ b/src/core/src/arm/interpreter/armmmu.h @@ -172,18 +172,18 @@ typedef struct mmu_ops_s } mmu_ops_t; -#include "mmu/tlb.h" -#include "mmu/rb.h" -#include "mmu/wb.h" -#include "mmu/cache.h" +#include "arm/mmu/tlb.h" +#include "arm/mmu/rb.h" +#include "arm/mmu/wb.h" +#include "arm/mmu/cache.h" /*special process mmu.h*/ -//#include "mmu/sa_mmu.h" -//#include "mmu/arm7100_mmu.h" -//#include "mmu/arm920t_mmu.h" -//#include "mmu/arm926ejs_mmu.h" -#include "mmu/arm1176jzf_s_mmu.h" -//#include "mmu/cortex_a9_mmu.h" +//#include "arm/mmu/sa_mmu.h" +//#include "arm/mmu/arm7100_mmu.h" +//#include "arm/mmu/arm920t_mmu.h" +//#include "arm/mmu/arm926ejs_mmu.h" +#include "arm/mmu/arm1176jzf_s_mmu.h" +//#include "arm/mmu/cortex_a9_mmu.h" typedef struct mmu_state_t { diff --git a/src/core/src/arm/armos.cpp b/src/core/src/arm/interpreter/armos.cpp index 43484ee5f..43484ee5f 100644 --- a/src/core/src/arm/armos.cpp +++ b/src/core/src/arm/interpreter/armos.cpp diff --git a/src/core/src/arm/armos.h b/src/core/src/arm/interpreter/armos.h index 4b58801ad..4b58801ad 100644 --- a/src/core/src/arm/armos.h +++ b/src/core/src/arm/interpreter/armos.h diff --git a/src/core/src/arm/armsupp.cpp b/src/core/src/arm/interpreter/armsupp.cpp index 75d326f2b..75d326f2b 100644 --- a/src/core/src/arm/armsupp.cpp +++ b/src/core/src/arm/interpreter/armsupp.cpp diff --git a/src/core/src/arm/armvirt.cpp b/src/core/src/arm/interpreter/armvirt.cpp index a072b73be..a072b73be 100644 --- a/src/core/src/arm/armvirt.cpp +++ b/src/core/src/arm/interpreter/armvirt.cpp diff --git a/src/core/src/arm/skyeye_defs.h b/src/core/src/arm/interpreter/skyeye_defs.h index 6562e595a..6562e595a 100644 --- a/src/core/src/arm/skyeye_defs.h +++ b/src/core/src/arm/interpreter/skyeye_defs.h diff --git a/src/core/src/arm/thumbemu.cpp b/src/core/src/arm/interpreter/thumbemu.cpp index 032d84b65..032d84b65 100644 --- a/src/core/src/arm/thumbemu.cpp +++ b/src/core/src/arm/interpreter/thumbemu.cpp diff --git a/src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp b/src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp index a6a4aeffd..0a3206abb 100644 --- a/src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp +++ b/src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp @@ -24,9 +24,9 @@ #include "mem_map.h" -#include "arm/skyeye_defs.h" +#include "arm/interpreter/skyeye_defs.h" -#include "arm/armdefs.h" +#include "arm/interpreter/armdefs.h" //#include "bank_defs.h" #if 0 #define TLB_SIZE 1024 * 1024 |