diff options
| author | 2014-04-25 17:15:19 -0400 | |
|---|---|---|
| committer | 2014-04-25 17:15:19 -0400 | |
| commit | cb0663de5147f10533ecdbf6f58865f7cbe0241c (patch) | |
| tree | 30a122d3da59134e431ab2e6ef389d8f00467038 /src/core/arm/interpreter/armsupp.cpp | |
| parent | added disassembly to unimplemented instruction (diff) | |
| download | yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar.gz yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar.xz yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.zip | |
moved HLE::MRC to its own module, added support for catching data synchronization barrier command
Diffstat (limited to 'src/core/arm/interpreter/armsupp.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp index 48e55c63a..b2bbedc18 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/hle.h" | 23 | #include "core/hle/mrc.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, |
| @@ -738,7 +738,8 @@ ARMword | |||
| 738 | ARMul_MRC (ARMul_State * state, ARMword instr) | 738 | ARMul_MRC (ARMul_State * state, ARMword instr) |
| 739 | { | 739 | { |
| 740 | unsigned cpab; | 740 | unsigned cpab; |
| 741 | ARMword result = HLE::CallGetThreadCommandBuffer(); | 741 | |
| 742 | ARMword result = HLE::CallMRC((HLE::ARM11_MRC_OPERATION)BITS(20, 27)); | ||
| 742 | 743 | ||
| 743 | ////printf("SKYEYE ARMul_MRC, CPnum is %x, instr %x\n",CPNum, instr); | 744 | ////printf("SKYEYE ARMul_MRC, CPnum is %x, instr %x\n",CPNum, instr); |
| 744 | //if (!CP_ACCESS_ALLOWED (state, CPNum)) { | 745 | //if (!CP_ACCESS_ALLOWED (state, CPNum)) { |