emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dyncom: Migrate InAPrivilegedMode to armsupp

Browse Source 
It's a generic helper function, so it should be here anyway.
This commit is contained in:
Lioncash 2015-03-26 09:21:24 -04:00
parent c4767f3bb2
commit de6eba0288
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View File

@ -3690,10 +3690,6 @@ static int clz(unsigned int x) {
return n; return n;
} }
static bool InAPrivilegedMode(ARMul_State* core) {
return (core->Mode != USER32MODE);
}
unsigned InterpreterMainLoop(ARMul_State* state) { unsigned InterpreterMainLoop(ARMul_State* state) {
Common::Profiling::ScopeTimer timer_execute(profile_execute); Common::Profiling::ScopeTimer timer_execute(profile_execute);

6
src/core/arm/interpreter/armsupp.cpp
View File

@ -207,3 +207,9 @@ bool InBigEndianMode(ARMul_State* cpu)
{ {
return (cpu->Cpsr & (1 << 9)) != 0; return (cpu->Cpsr & (1 << 9)) != 0;
} }
// Whether or not the given CPU is in a mode other than user mode.
bool InAPrivilegedMode(ARMul_State* cpu)
{
return (cpu->Mode != USER32MODE);
}

1
src/core/arm/skyeye_common/armdefs.h
View File

@ -357,3 +357,4 @@ extern u32 ARMul_SignedSatQ(s32, u8, bool*);
extern u32 ARMul_UnsignedSatQ(s32, u8, bool*); extern u32 ARMul_UnsignedSatQ(s32, u8, bool*);
extern bool InBigEndianMode(ARMul_State*); extern bool InBigEndianMode(ARMul_State*);
extern bool InAPrivilegedMode(ARMul_State*);