N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

moved arm core to interpreter directory

Browse source
This commit is contained in:
bunnei 2014-04-04 21:12:05 -04:00
parent c2d4c7d4f4
commit 66299a4880
17 changed files with 73 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/core/core.vcxproj
View file

@ -137,15 +137,15 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<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\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\mmu\arm1176jzf_s_mmu.cpp" />
<ClCompile Include="src\arm\thumbemu.cpp" />
<ClCompile Include="src\core.cpp" /> <ClCompile Include="src\core.cpp" />
<ClCompile Include="src\core_timing.cpp" /> <ClCompile Include="src\core_timing.cpp" />
<ClCompile Include="src\elf\elf_reader.cpp" /> <ClCompile Include="src\elf\elf_reader.cpp" />
@ -157,19 +157,19 @@
<ClCompile Include="src\system.cpp" /> <ClCompile Include="src\system.cpp" />
</ItemGroup> </ItemGroup>
<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\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\arm1176jzf_s_mmu.h" />
<ClInclude Include="src\arm\mmu\cache.h" /> <ClInclude Include="src\arm\mmu\cache.h" />
<ClInclude Include="src\arm\mmu\rb.h" /> <ClInclude Include="src\arm\mmu\rb.h" />
<ClInclude Include="src\arm\mmu\tlb.h" /> <ClInclude Include="src\arm\mmu\tlb.h" />
<ClInclude Include="src\arm\mmu\wb.h" /> <ClInclude Include="src\arm\mmu\wb.h" />
<ClInclude Include="src\arm\skyeye_defs.h" />
<ClInclude Include="src\core.h" /> <ClInclude Include="src\core.h" />
<ClInclude Include="src\core_timing.h" /> <ClInclude Include="src\core_timing.h" />
<ClInclude Include="src\elf\elf_reader.h" /> <ClInclude Include="src\elf\elf_reader.h" />

88
src/core/core.vcxproj.filters
View file

@ -6,12 +6,6 @@
<Filter>arm\disassembler</Filter> <Filter>arm\disassembler</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\mem_map.cpp" /> <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\mem_map_funcs.cpp" />
<ClCompile Include="src\loader.cpp" /> <ClCompile Include="src\loader.cpp" />
<ClCompile Include="src\file_sys\directory_file_system.cpp"> <ClCompile Include="src\file_sys\directory_file_system.cpp">
@ -25,23 +19,29 @@
<ClCompile Include="src\elf\elf_reader.cpp"> <ClCompile Include="src\elf\elf_reader.cpp">
<Filter>elf</Filter> <Filter>elf</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\arm\armsupp.cpp">
<Filter>arm</Filter>
</ClCompile>
<ClCompile Include="src\arm\armvirt.cpp">
<Filter>arm</Filter>
</ClCompile>
<ClCompile Include="src\arm\armmmu.cpp">
<Filter>arm</Filter>
</ClCompile>
<ClCompile Include="src\arm\armos.cpp">
<Filter>arm</Filter>
</ClCompile>
<ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp"> <ClCompile Include="src\arm\mmu\arm1176jzf_s_mmu.cpp">
<Filter>arm\mmu</Filter> <Filter>arm\mmu</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\arm\thumbemu.cpp"> <ClCompile Include="src\arm\interpreter\armemu.cpp">
<Filter>arm</Filter> <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>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -60,6 +60,12 @@
<Filter Include="elf"> <Filter Include="elf">
<UniqueIdentifier>{671d3218-3771-4218-b142-1f9a1cc24a51}</UniqueIdentifier> <UniqueIdentifier>{671d3218-3771-4218-b142-1f9a1cc24a51}</UniqueIdentifier>
</Filter> </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>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\arm\disassembler\arm_disasm.h"> <ClInclude Include="src\arm\disassembler\arm_disasm.h">
@ -67,27 +73,6 @@
</ClInclude> </ClInclude>
<ClInclude Include="src\mem_map.h" /> <ClInclude Include="src\mem_map.h" />
<ClInclude Include="src\core.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"> <ClInclude Include="src\arm\mmu\arm1176jzf_s_mmu.h">
<Filter>arm\mmu</Filter> <Filter>arm\mmu</Filter>
</ClInclude> </ClInclude>
@ -121,6 +106,27 @@
<ClInclude Include="src\elf\elf_types.h"> <ClInclude Include="src\elf\elf_types.h">
<Filter>elf</Filter> <Filter>elf</Filter>
</ClInclude> </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>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <None Include="CMakeLists.txt" />

0
src/core/src/arm/arm_regformat.h → src/core/src/arm/interpreter/arm_regformat.h
View file

0
src/core/src/arm/armcpu.h → src/core/src/arm/interpreter/armcpu.h
View file

0
src/core/src/arm/armdefs.h → src/core/src/arm/interpreter/armdefs.h
View file

0
src/core/src/arm/armemu.cpp → src/core/src/arm/interpreter/armemu.cpp
View file

0
src/core/src/arm/armemu.h → src/core/src/arm/interpreter/armemu.h
View file

0
src/core/src/arm/arminit.cpp → src/core/src/arm/interpreter/arminit.cpp
View file

0
src/core/src/arm/armmmu.cpp → src/core/src/arm/interpreter/armmmu.cpp
View file

20
src/core/src/arm/armmmu.h → src/core/src/arm/interpreter/armmmu.h
View file

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

0
src/core/src/arm/armos.cpp → src/core/src/arm/interpreter/armos.cpp
View file

0
src/core/src/arm/armos.h → src/core/src/arm/interpreter/armos.h
View file

0
src/core/src/arm/armsupp.cpp → src/core/src/arm/interpreter/armsupp.cpp
View file

0
src/core/src/arm/armvirt.cpp → src/core/src/arm/interpreter/armvirt.cpp
View file

0
src/core/src/arm/skyeye_defs.h → src/core/src/arm/interpreter/skyeye_defs.h
View file

0
src/core/src/arm/thumbemu.cpp → src/core/src/arm/interpreter/thumbemu.cpp
View file

4
src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp
View file

@ -24,9 +24,9 @@
#include "mem_map.h" #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" //#include "bank_defs.h"
#if 0 #if 0
#define TLB_SIZE 1024 * 1024 #define TLB_SIZE 1024 * 1024