aboutsummaryrefslogtreecommitdiff
path: root/src/core/arm/interpreter/arminit.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-05-16 21:54:02 -0400
committerbunnei <bunneidev@gmail.com>2014-05-16 21:54:02 -0400
commita4fd257469bc06d1474a2e6e8df9dbd233ac79a5 (patch)
tree3b9d45d77897ba308d09df2567d3bead5dddbd25 /src/core/arm/interpreter/arminit.cpp
parentbdc54d0d4897841a4d24aee80311bfb1f0eba884 (diff)
parent92be5517c40fd9abf89455f606c321b629c0698e (diff)
Merge pull request #17 from bunnei/arm-vfp
ARM VFP support - integrated from SkyEye
Diffstat (limited to 'src/core/arm/interpreter/arminit.cpp')
-rw-r--r--src/core/arm/interpreter/arminit.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
index a8aeecdea..2c771cdda 100644
--- a/src/core/arm/interpreter/arminit.cpp
+++ b/src/core/arm/interpreter/arminit.cpp
@@ -23,8 +23,8 @@
#include <math.h>
-#include "armdefs.h"
-#include "armemu.h"
+#include "core/arm/interpreter/armdefs.h"
+#include "core/arm/interpreter/armemu.h"
/***************************************************************************\
* Definitions for the emulator architecture *
@@ -271,7 +271,7 @@ below line sould be in skyeye_mach_XXX.c 's XXX_mach_init function
/* Only initialse the coprocessor support once we
know what kind of chip we are dealing with. */
- //ARMul_CoProInit (state); Commented out /bunnei
+ ARMul_CoProInit (state);
}
@@ -318,7 +318,7 @@ ARMul_Reset (ARMul_State * state)
state->NumFcycles = 0;
//fprintf(stderr,"armul_reset 3: state-> Cpsr 0x%x, Mode %d\n",state->Cpsr,state->Mode);
- //mmu_reset (state); Commented out /bunnei
+ mmu_reset (state);
//fprintf(stderr,"armul_reset 4: state-> Cpsr 0x%x, Mode %d\n",state->Cpsr,state->Mode);
//mem_reset (state); /* move to memory/ram.c */