1 files changed, 9 insertions, 3 deletions

diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp
index 101b9807a..b2bbedc18 100644
--- a/src/core/arm/interpreter/armsupp.cpp
+++ b/src/core/arm/interpreter/armsupp.cpp
@@ -17,9 +17,11 @@
 
 #include "armdefs.h"
 #include "armemu.h"
+
 //#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,
                                         unsigned cpnum);
@@ -736,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)) {
@@ -846,7 +849,10 @@ ARMul_CDP (ARMul_State * state, ARMword instr)
 void
 ARMul_UndefInstr (ARMul_State * state, ARMword instr)
 {
-        ERROR_LOG(ARM11, "Undefined instruction!! Instr: 0x%x", instr);
+        char buff[512];
+        ARM_Disasm disasm = ARM_Disasm();
+        disasm.disasm(state->pc, instr, buff);
+        ERROR_LOG(ARM11, "Undefined instruction!! Disasm: %s Opcode: 0x%x", buff, instr);
         ARMul_Abort (state, ARMul_UndefinedInstrV);
 }