summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-05-02 01:20:44 +0200
committerbunnei <ericbunnie@gmail.com>2014-05-02 01:20:44 +0200
commitf0434249150f27d7921a57f70d6af11c12c4e08f (patch)
tree4f1d4e40eb57f729f2533b1acd50c1b8efc903f3 /src
parent- added some function wrappers for HLE (diff)
downloadyuzu-f0434249150f27d7921a57f70d6af11c12c4e08f.tar
yuzu-f0434249150f27d7921a57f70d6af11c12c4e08f.tar.gz
yuzu-f0434249150f27d7921a57f70d6af11c12c4e08f.tar.bz2
yuzu-f0434249150f27d7921a57f70d6af11c12c4e08f.tar.lz
yuzu-f0434249150f27d7921a57f70d6af11c12c4e08f.tar.xz
yuzu-f0434249150f27d7921a57f70d6af11c12c4e08f.tar.zst
yuzu-f0434249150f27d7921a57f70d6af11c12c4e08f.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/arm/interpreter/armsupp.cpp16
-rw-r--r--src/core/core.vcxproj4
-rw-r--r--src/core/core.vcxproj.filters12
-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
file_sys/directory_file_system.cpp
file_sys/meta_file_system.cpp
hle/hle.cpp
- hle/mrc.cpp
+ hle/coprocessor.cpp
hle/syscall.cpp
hle/service/apt.cpp
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 @@
//#include "ansidecl.h"
#include "skyeye_defs.h"
-#include "core/hle/mrc.h"
+#include "core/hle/coprocessor.h"
#include "core/arm/disassembler/arm_disasm.h"
unsigned xscale_cp15_cp_access_allowed (ARMul_State * state, unsigned reg,
@@ -663,13 +663,13 @@ ARMul_MCR (ARMul_State * state, ARMword instr, ARMword source)
{
unsigned cpab;
- //printf("SKYEYE ARMul_MCR, CPnum is %x, source %x\n",CPNum, source);
- if (!CP_ACCESS_ALLOWED (state, CPNum)) {
- //chy 2004-07-19 should fix in the future ????!!!!
- //printf("SKYEYE ARMul_MCR, ACCESS_not ALLOWed, UndefinedInstr CPnum is %x, source %x\n",CPNum, source);
- ARMul_UndefInstr (state, instr);
- return;
- }
+ ////printf("SKYEYE ARMul_MCR, CPnum is %x, source %x\n",CPNum, source);
+ //if (!CP_ACCESS_ALLOWED (state, CPNum)) {
+ // //chy 2004-07-19 should fix in the future ????!!!!
+ // //printf("SKYEYE ARMul_MCR, ACCESS_not ALLOWed, UndefinedInstr CPnum is %x, source %x\n",CPNum, source);
+ // ARMul_UndefInstr (state, instr);
+ // return;
+ //}
cpab = (state->MCR[CPNum]) (state, ARMul_FIRST, instr, source);
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 @@
<ClCompile Include="elf\elf_reader.cpp" />
<ClCompile Include="file_sys\directory_file_system.cpp" />
<ClCompile Include="file_sys\meta_file_system.cpp" />
+ <ClCompile Include="hle\coprocessor.cpp" />
<ClCompile Include="hle\hle.cpp" />
- <ClCompile Include="hle\mrc.cpp" />
<ClCompile Include="hle\service\apt.cpp" />
<ClCompile Include="hle\service\gsp.cpp" />
<ClCompile Include="hle\service\hid.cpp" />
@@ -193,9 +193,9 @@
<ClInclude Include="file_sys\directory_file_system.h" />
<ClInclude Include="file_sys\file_sys.h" />
<ClInclude Include="file_sys\meta_file_system.h" />
+ <ClInclude Include="hle\coprocessor.h" />
<ClInclude Include="hle\function_wrappers.h" />
<ClInclude Include="hle\hle.h" />
- <ClInclude Include="hle\mrc.h" />
<ClInclude Include="hle\service\apt.h" />
<ClInclude Include="hle\service\gsp.h" />
<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 @@
<ClCompile Include="hw\lcd.cpp">
<Filter>hw</Filter>
</ClCompile>
- <ClCompile Include="hle\mrc.cpp">
- <Filter>hle</Filter>
- </ClCompile>
<ClCompile Include="arm\disassembler\load_symbol_map.cpp">
<Filter>arm\disassembler</Filter>
</ClCompile>
+ <ClCompile Include="hle\coprocessor.cpp">
+ <Filter>hle</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="arm\disassembler\arm_disasm.h">
@@ -211,12 +211,12 @@
<ClInclude Include="hw\lcd.h">
<Filter>hw</Filter>
</ClInclude>
- <ClInclude Include="hle\mrc.h">
- <Filter>hle</Filter>
- </ClInclude>
<ClInclude Include="arm\disassembler\load_symbol_map.h">
<Filter>arm\disassembler</Filter>
</ClInclude>
+ <ClInclude Include="hle\coprocessor.h">
+ <Filter>hle</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<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