Browse Source

dyncom: Migrate InAPrivilegedMode to armsupp

It's a generic helper function, so it should be here anyway.
pull/15/merge
Lioncash 11 years ago
parent
commit
de6eba0288
  1. 4
      src/core/arm/dyncom/arm_dyncom_interpreter.cpp
  2. 6
      src/core/arm/interpreter/armsupp.cpp
  3. 1
      src/core/arm/skyeye_common/armdefs.h

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

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

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

@ -207,3 +207,9 @@ bool InBigEndianMode(ARMul_State* cpu)
{
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

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