diff options
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 4 | ||||
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 6 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 2765cb36e..1fc342d02 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |||
| @@ -3690,10 +3690,6 @@ static int clz(unsigned int x) { | |||
| 3690 | return n; | 3690 | return n; |
| 3691 | } | 3691 | } |
| 3692 | 3692 | ||
| 3693 | static bool InAPrivilegedMode(ARMul_State* core) { | ||
| 3694 | return (core->Mode != USER32MODE); | ||
| 3695 | } | ||
| 3696 | |||
| 3697 | unsigned InterpreterMainLoop(ARMul_State* state) { | 3693 | unsigned InterpreterMainLoop(ARMul_State* state) { |
| 3698 | Common::Profiling::ScopeTimer timer_execute(profile_execute); | 3694 | Common::Profiling::ScopeTimer timer_execute(profile_execute); |
| 3699 | 3695 | ||
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp index aca2bfbbd..f826ccb2d 100644 --- a/src/core/arm/interpreter/armsupp.cpp +++ b/src/core/arm/interpreter/armsupp.cpp | |||
| @@ -207,3 +207,9 @@ bool InBigEndianMode(ARMul_State* cpu) | |||
| 207 | { | 207 | { |
| 208 | return (cpu->Cpsr & (1 << 9)) != 0; | 208 | return (cpu->Cpsr & (1 << 9)) != 0; |
| 209 | } | 209 | } |
| 210 | |||
| 211 | // Whether or not the given CPU is in a mode other than user mode. | ||
| 212 | bool InAPrivilegedMode(ARMul_State* cpu) | ||
| 213 | { | ||
| 214 | return (cpu->Mode != USER32MODE); | ||
| 215 | } | ||
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index c1a19fecc..633649d3e 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h | |||
| @@ -357,3 +357,4 @@ extern u32 ARMul_SignedSatQ(s32, u8, bool*); | |||
| 357 | extern u32 ARMul_UnsignedSatQ(s32, u8, bool*); | 357 | extern u32 ARMul_UnsignedSatQ(s32, u8, bool*); |
| 358 | 358 | ||
| 359 | extern bool InBigEndianMode(ARMul_State*); | 359 | extern bool InBigEndianMode(ARMul_State*); |
| 360 | extern bool InAPrivilegedMode(ARMul_State*); | ||