diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 16 | ||||
| -rw-r--r-- | src/core/core.vcxproj | 4 | ||||
| -rw-r--r-- | src/core/core.vcxproj.filters | 12 | ||||
| -rw-r--r-- | src/core/hle/coprocessor.cpp (renamed from src/core/hle/mrc.cpp) | 0 | ||||
| -rw-r--r-- | src/core/hle/coprocessor.h (renamed from src/core/hle/mrc.h) | 0 |
6 files changed, 17 insertions, 17 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 3308f3c25..88cbabade 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -19,7 +19,7 @@ set(SRCS core.cpp | |||
| 19 | file_sys/directory_file_system.cpp | 19 | file_sys/directory_file_system.cpp |
| 20 | file_sys/meta_file_system.cpp | 20 | file_sys/meta_file_system.cpp |
| 21 | hle/hle.cpp | 21 | hle/hle.cpp |
| 22 | hle/mrc.cpp | 22 | hle/coprocessor.cpp |
| 23 | hle/syscall.cpp | 23 | hle/syscall.cpp |
| 24 | hle/service/apt.cpp | 24 | hle/service/apt.cpp |
| 25 | hle/service/gsp.cpp | 25 | hle/service/gsp.cpp |
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp index b2bbedc18..d913c179c 100644 --- a/src/core/arm/interpreter/armsupp.cpp +++ b/src/core/arm/interpreter/armsupp.cpp | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | //#include "ansidecl.h" | 21 | //#include "ansidecl.h" |
| 22 | #include "skyeye_defs.h" | 22 | #include "skyeye_defs.h" |
| 23 | #include "core/hle/mrc.h" | 23 | #include "core/hle/coprocessor.h" |
| 24 | #include "core/arm/disassembler/arm_disasm.h" | 24 | #include "core/arm/disassembler/arm_disasm.h" |
| 25 | 25 | ||
| 26 | unsigned xscale_cp15_cp_access_allowed (ARMul_State * state, unsigned reg, | 26 | unsigned xscale_cp15_cp_access_allowed (ARMul_State * state, unsigned reg, |
| @@ -663,13 +663,13 @@ ARMul_MCR (ARMul_State * state, ARMword instr, ARMword source) | |||
| 663 | { | 663 | { |
| 664 | unsigned cpab; | 664 | unsigned cpab; |
| 665 | 665 | ||
| 666 | //printf("SKYEYE ARMul_MCR, CPnum is %x, source %x\n",CPNum, source); | 666 | ////printf("SKYEYE ARMul_MCR, CPnum is %x, source %x\n",CPNum, source); |
| 667 | if (!CP_ACCESS_ALLOWED (state, CPNum)) { | 667 | //if (!CP_ACCESS_ALLOWED (state, CPNum)) { |
| 668 | //chy 2004-07-19 should fix in the future ????!!!! | 668 | // //chy 2004-07-19 should fix in the future ????!!!! |
| 669 | //printf("SKYEYE ARMul_MCR, ACCESS_not ALLOWed, UndefinedInstr CPnum is %x, source %x\n",CPNum, source); | 669 | // //printf("SKYEYE ARMul_MCR, ACCESS_not ALLOWed, UndefinedInstr CPnum is %x, source %x\n",CPNum, source); |
| 670 | ARMul_UndefInstr (state, instr); | 670 | // ARMul_UndefInstr (state, instr); |
| 671 | return; | 671 | // return; |
| 672 | } | 672 | //} |
| 673 | 673 | ||
| 674 | cpab = (state->MCR[CPNum]) (state, ARMul_FIRST, instr, source); | 674 | cpab = (state->MCR[CPNum]) (state, ARMul_FIRST, instr, source); |
| 675 | 675 | ||
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index a5043ea4b..7b8953327 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj | |||
| @@ -153,8 +153,8 @@ | |||
| 153 | <ClCompile Include="elf\elf_reader.cpp" /> | 153 | <ClCompile Include="elf\elf_reader.cpp" /> |
| 154 | <ClCompile Include="file_sys\directory_file_system.cpp" /> | 154 | <ClCompile Include="file_sys\directory_file_system.cpp" /> |
| 155 | <ClCompile Include="file_sys\meta_file_system.cpp" /> | 155 | <ClCompile Include="file_sys\meta_file_system.cpp" /> |
| 156 | <ClCompile Include="hle\coprocessor.cpp" /> | ||
| 156 | <ClCompile Include="hle\hle.cpp" /> | 157 | <ClCompile Include="hle\hle.cpp" /> |
| 157 | <ClCompile Include="hle\mrc.cpp" /> | ||
| 158 | <ClCompile Include="hle\service\apt.cpp" /> | 158 | <ClCompile Include="hle\service\apt.cpp" /> |
| 159 | <ClCompile Include="hle\service\gsp.cpp" /> | 159 | <ClCompile Include="hle\service\gsp.cpp" /> |
| 160 | <ClCompile Include="hle\service\hid.cpp" /> | 160 | <ClCompile Include="hle\service\hid.cpp" /> |
| @@ -193,9 +193,9 @@ | |||
| 193 | <ClInclude Include="file_sys\directory_file_system.h" /> | 193 | <ClInclude Include="file_sys\directory_file_system.h" /> |
| 194 | <ClInclude Include="file_sys\file_sys.h" /> | 194 | <ClInclude Include="file_sys\file_sys.h" /> |
| 195 | <ClInclude Include="file_sys\meta_file_system.h" /> | 195 | <ClInclude Include="file_sys\meta_file_system.h" /> |
| 196 | <ClInclude Include="hle\coprocessor.h" /> | ||
| 196 | <ClInclude Include="hle\function_wrappers.h" /> | 197 | <ClInclude Include="hle\function_wrappers.h" /> |
| 197 | <ClInclude Include="hle\hle.h" /> | 198 | <ClInclude Include="hle\hle.h" /> |
| 198 | <ClInclude Include="hle\mrc.h" /> | ||
| 199 | <ClInclude Include="hle\service\apt.h" /> | 199 | <ClInclude Include="hle\service\apt.h" /> |
| 200 | <ClInclude Include="hle\service\gsp.h" /> | 200 | <ClInclude Include="hle\service\gsp.h" /> |
| 201 | <ClInclude Include="hle\service\hid.h" /> | 201 | <ClInclude Include="hle\service\hid.h" /> |
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 9c53f9eff..fabe253ed 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters | |||
| @@ -105,12 +105,12 @@ | |||
| 105 | <ClCompile Include="hw\lcd.cpp"> | 105 | <ClCompile Include="hw\lcd.cpp"> |
| 106 | <Filter>hw</Filter> | 106 | <Filter>hw</Filter> |
| 107 | </ClCompile> | 107 | </ClCompile> |
| 108 | <ClCompile Include="hle\mrc.cpp"> | ||
| 109 | <Filter>hle</Filter> | ||
| 110 | </ClCompile> | ||
| 111 | <ClCompile Include="arm\disassembler\load_symbol_map.cpp"> | 108 | <ClCompile Include="arm\disassembler\load_symbol_map.cpp"> |
| 112 | <Filter>arm\disassembler</Filter> | 109 | <Filter>arm\disassembler</Filter> |
| 113 | </ClCompile> | 110 | </ClCompile> |
| 111 | <ClCompile Include="hle\coprocessor.cpp"> | ||
| 112 | <Filter>hle</Filter> | ||
| 113 | </ClCompile> | ||
| 114 | </ItemGroup> | 114 | </ItemGroup> |
| 115 | <ItemGroup> | 115 | <ItemGroup> |
| 116 | <ClInclude Include="arm\disassembler\arm_disasm.h"> | 116 | <ClInclude Include="arm\disassembler\arm_disasm.h"> |
| @@ -211,12 +211,12 @@ | |||
| 211 | <ClInclude Include="hw\lcd.h"> | 211 | <ClInclude Include="hw\lcd.h"> |
| 212 | <Filter>hw</Filter> | 212 | <Filter>hw</Filter> |
| 213 | </ClInclude> | 213 | </ClInclude> |
| 214 | <ClInclude Include="hle\mrc.h"> | ||
| 215 | <Filter>hle</Filter> | ||
| 216 | </ClInclude> | ||
| 217 | <ClInclude Include="arm\disassembler\load_symbol_map.h"> | 214 | <ClInclude Include="arm\disassembler\load_symbol_map.h"> |
| 218 | <Filter>arm\disassembler</Filter> | 215 | <Filter>arm\disassembler</Filter> |
| 219 | </ClInclude> | 216 | </ClInclude> |
| 217 | <ClInclude Include="hle\coprocessor.h"> | ||
| 218 | <Filter>hle</Filter> | ||
| 219 | </ClInclude> | ||
| 220 | </ItemGroup> | 220 | </ItemGroup> |
| 221 | <ItemGroup> | 221 | <ItemGroup> |
| 222 | <Text Include="CMakeLists.txt" /> | 222 | <Text Include="CMakeLists.txt" /> |
diff --git a/src/core/hle/mrc.cpp b/src/core/hle/coprocessor.cpp index 5223be7c9..5223be7c9 100644 --- a/src/core/hle/mrc.cpp +++ b/src/core/hle/coprocessor.cpp | |||
diff --git a/src/core/hle/mrc.h b/src/core/hle/coprocessor.h index d6b9f162f..d6b9f162f 100644 --- a/src/core/hle/mrc.h +++ b/src/core/hle/coprocessor.h | |||