diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-02-12 23:18:40 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-12 23:18:40 -0500 |
| commit | 9b69079c835352fd7727e89624accb5115d35d36 (patch) | |
| tree | 9b1f0a7cf06bde6cbaac3230fbdbba824e7fcdfc /src/core/arm/skyeye_common | |
| parent | 209ab46baeb7a272ee12b0a5843982e6e71b0fe0 (diff) | |
| parent | b7fac494cdda9efb65168b116b1673af4ab9f242 (diff) | |
Merge pull request #569 from lioncash/modeswitch
Dyncom: Correctly set the ARM modes on dyncom initialization.
Diffstat (limited to 'src/core/arm/skyeye_common')
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 4 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfp.cpp | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index 02f54f38..dc2256a3 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -270,7 +270,7 @@ enum { * Mode and Bank Constants * \***************************************************************************/ -enum { +enum PrivilegeMode { USER32MODE = 16, FIQ32MODE = 17, IRQ32MODE = 18, @@ -288,7 +288,7 @@ enum { ABORTBANK = 4, UNDEFBANK = 5, DUMMYBANK = 6, - SYSTEMBANK = USERBANK + SYSTEMBANK = 7 }; /***************************************************************************\ diff --git a/src/core/arm/skyeye_common/vfp/vfp.cpp b/src/core/arm/skyeye_common/vfp/vfp.cpp index 1cf146c5..6f22923b 100644 --- a/src/core/arm/skyeye_common/vfp/vfp.cpp +++ b/src/core/arm/skyeye_common/vfp/vfp.cpp @@ -26,8 +26,6 @@ #include "core/arm/skyeye_common/vfp/asm_vfp.h" #include "core/arm/skyeye_common/vfp/vfp.h" -//ARMul_State* persistent_state; /* function calls from SoftFloat lib don't have an access to ARMul_state. */ - unsigned VFPInit(ARMul_State* state) { state->VFP[VFP_OFFSET(VFP_FPSID)] = VFP_FPSID_IMPLMEN<<24 | VFP_FPSID_SW<<23 | VFP_FPSID_SUBARCH<<16 | @@ -35,9 +33,6 @@ unsigned VFPInit(ARMul_State* state) state->VFP[VFP_OFFSET(VFP_FPEXC)] = 0; state->VFP[VFP_OFFSET(VFP_FPSCR)] = 0; - //persistent_state = state; - /* Reset only specify VFP_FPEXC_EN = '0' */ - return 0; } |