diff options
| author | bunnei <bunneidev@gmail.com> | 2014-09-13 00:34:51 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-10-25 20:11:39 +0200 |
| commit | 53a22b84da9690865954f666694de885ccb7c286 (patch) | |
| tree | 77fa8c9fb653173cc78ffd7b0110d695c3fbb772 /src/core/arm/interpreter | |
| parent | ARM: Reorganized file structure to move shared SkyEye code to a more common area. (diff) | |
| download | yuzu-53a22b84da9690865954f666694de885ccb7c286.tar yuzu-53a22b84da9690865954f666694de885ccb7c286.tar.gz yuzu-53a22b84da9690865954f666694de885ccb7c286.tar.bz2 yuzu-53a22b84da9690865954f666694de885ccb7c286.tar.lz yuzu-53a22b84da9690865954f666694de885ccb7c286.tar.xz yuzu-53a22b84da9690865954f666694de885ccb7c286.tar.zst yuzu-53a22b84da9690865954f666694de885ccb7c286.zip | |
Diffstat (limited to 'src/core/arm/interpreter')
| -rw-r--r-- | src/core/arm/interpreter/arm_interpreter.h | 2 | ||||
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h index 64760500c..49ae01a0c 100644 --- a/src/core/arm/interpreter/arm_interpreter.h +++ b/src/core/arm/interpreter/arm_interpreter.h @@ -10,7 +10,7 @@ #include "core/arm/skyeye_common/armdefs.h" #include "core/arm/skyeye_common/armemu.h" -class ARM_Interpreter : virtual public ARM_Interface { +class ARM_Interpreter final : virtual public ARM_Interface { public: ARM_Interpreter(); 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//#include <util.h> - -#include <string> -#include "core/arm/interpreter/armdefs.h" -#include "core/arm/interpreter/armemu.h" -#include "core/hle/coprocessor.h" +#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armemu.h" #include "core/arm/disassembler/arm_disasm.h" +#include "core/mem_map.h" -//#include "ansidecl.h" -//#include "skyeye.h" -//extern int skyeye_instr_debug; -/* Definitions for the support routines. */ static ARMword ModeToBank (ARMword); static void EnvokeList (ARMul_State *, unsigned int, unsigned int); @@ -751,7 +744,7 @@ ARMword ARMul_MRC (ARMul_State * state, ARMword instr) int cpopc = BITS(21, 23) & 0x7; if (cn == 13 && cm == 0 && cp == 3) { //c13,c0,3; returns CPU svc buffer - ARMword result = HLE::CallMRC(instr); + ARMword result = Memory::KERNEL_MEMORY_VADDR; if (result != -1) { return result; |