diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-25 23:15:19 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-25 23:15:19 +0200 |
| commit | cb0663de5147f10533ecdbf6f58865f7cbe0241c (patch) | |
| tree | 30a122d3da59134e431ab2e6ef389d8f00467038 /src/core/arm | |
| parent | added disassembly to unimplemented instruction (diff) | |
| download | yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar.gz yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar.bz2 yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar.lz yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar.xz yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.tar.zst yuzu-cb0663de5147f10533ecdbf6f58865f7cbe0241c.zip | |
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 3 | ||||
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 6074ff480..c137c61fe 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -4467,7 +4467,7 @@ ARMul_Emulate26 (ARMul_State * state) } /* Drop through. */ - case 0xe0: + //case 0xe0: case 0xe4: case 0xe6: case 0xe8: @@ -4502,6 +4502,7 @@ ARMul_Emulate26 (ARMul_State * state) /* Co-Processor Register Transfers (MRC) and Data Ops. */ + case 0xe0: case 0xe1: case 0xe3: case 0xe5: 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 @@ //#include "ansidecl.h" #include "skyeye_defs.h" -#include "core/hle/hle.h" +#include "core/hle/mrc.h" #include "core/arm/disassembler/arm_disasm.h" unsigned xscale_cp15_cp_access_allowed (ARMul_State * state, unsigned reg, @@ -738,7 +738,8 @@ ARMword ARMul_MRC (ARMul_State * state, ARMword instr) { unsigned cpab; - ARMword result = HLE::CallGetThreadCommandBuffer(); + + ARMword result = HLE::CallMRC((HLE::ARM11_MRC_OPERATION)BITS(20, 27)); ////printf("SKYEYE ARMul_MRC, CPnum is %x, instr %x\n",CPNum, instr); //if (!CP_ACCESS_ALLOWED (state, CPNum)) { |