diff options
Diffstat (limited to 'src/core/arm/interpreter/armsupp.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp index 3d3545c65..2568b93ef 100644 --- a/src/core/arm/interpreter/armsupp.cpp +++ b/src/core/arm/interpreter/armsupp.cpp | |||
| @@ -15,18 +15,11 @@ | |||
| 15 | along with this program; if not, write to the Free Software | 15 | along with this program; if not, write to the Free Software |
| 16 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | 16 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ |
| 17 | 17 | ||
| 18 | //#include <util.h> | 18 | #include "core/arm/skyeye_common/armdefs.h" |
| 19 | 19 | #include "core/arm/skyeye_common/armemu.h" | |
| 20 | #include <string> | ||
| 21 | #include "core/arm/interpreter/armdefs.h" | ||
| 22 | #include "core/arm/interpreter/armemu.h" | ||
| 23 | #include "core/hle/coprocessor.h" | ||
| 24 | #include "core/arm/disassembler/arm_disasm.h" | 20 | #include "core/arm/disassembler/arm_disasm.h" |
| 21 | #include "core/mem_map.h" | ||
| 25 | 22 | ||
| 26 | //#include "ansidecl.h" | ||
| 27 | //#include "skyeye.h" | ||
| 28 | //extern int skyeye_instr_debug; | ||
| 29 | /* Definitions for the support routines. */ | ||
| 30 | 23 | ||
| 31 | static ARMword ModeToBank (ARMword); | 24 | static ARMword ModeToBank (ARMword); |
| 32 | static void EnvokeList (ARMul_State *, unsigned int, unsigned int); | 25 | static void EnvokeList (ARMul_State *, unsigned int, unsigned int); |
| @@ -751,7 +744,7 @@ ARMword ARMul_MRC (ARMul_State * state, ARMword instr) | |||
| 751 | int cpopc = BITS(21, 23) & 0x7; | 744 | int cpopc = BITS(21, 23) & 0x7; |
| 752 | 745 | ||
| 753 | if (cn == 13 && cm == 0 && cp == 3) { //c13,c0,3; returns CPU svc buffer | 746 | if (cn == 13 && cm == 0 && cp == 3) { //c13,c0,3; returns CPU svc buffer |
| 754 | ARMword result = HLE::CallMRC(instr); | 747 | ARMword result = Memory::KERNEL_MEMORY_VADDR; |
| 755 | 748 | ||
| 756 | if (result != -1) { | 749 | if (result != -1) { |
| 757 | return result; | 750 | return result; |