diff options
author | Lioncash <mathew1800@gmail.com> | 2015-02-25 16:48:10 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-02-25 16:55:50 +0100 |
commit | 1bb400be1b6df819eccfa2dfb20a63fb429abb95 (patch) | |
tree | 699ba85335e2eff87781a2dab36d4cb162ccaf69 /src/core | |
parent | Merge pull request #601 from Subv/y2r (diff) | |
download | yuzu-1bb400be1b6df819eccfa2dfb20a63fb429abb95.tar yuzu-1bb400be1b6df819eccfa2dfb20a63fb429abb95.tar.gz yuzu-1bb400be1b6df819eccfa2dfb20a63fb429abb95.tar.bz2 yuzu-1bb400be1b6df819eccfa2dfb20a63fb429abb95.tar.lz yuzu-1bb400be1b6df819eccfa2dfb20a63fb429abb95.tar.xz yuzu-1bb400be1b6df819eccfa2dfb20a63fb429abb95.tar.zst yuzu-1bb400be1b6df819eccfa2dfb20a63fb429abb95.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/interpreter/arminit.cpp | 4 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 23 |
2 files changed, 5 insertions, 22 deletions
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp index abafe226e..4ac827e0a 100644 --- a/src/core/arm/interpreter/arminit.cpp +++ b/src/core/arm/interpreter/arminit.cpp @@ -58,11 +58,7 @@ void ARMul_SelectProcessor(ARMul_State* state, unsigned properties) state->is_v4 = (properties & (ARM_v4_Prop | ARM_v5_Prop)) != 0; state->is_v5 = (properties & ARM_v5_Prop) != 0; state->is_v5e = (properties & ARM_v5e_Prop) != 0; - state->is_XScale = (properties & ARM_XScale_Prop) != 0; - state->is_iWMMXt = (properties & ARM_iWMMXt_Prop) != 0; state->is_v6 = (properties & ARM_v6_Prop) != 0; - state->is_ep9312 = (properties & ARM_ep9312_Prop) != 0; - state->is_pxa27x = (properties & ARM_PXA27X_Prop) != 0; state->is_v7 = (properties & ARM_v7_Prop) != 0; // Only initialse the coprocessor support once we diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index 070fcf7dc..16f3ac86c 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -185,10 +185,6 @@ So, if lateabtSig=1, then it means Late Abort Model(Base Updated Abort Model) bool is_v5e; // Are we emulating a v5e architecture? bool is_v6; // Are we emulating a v6 architecture? bool is_v7; // Are we emulating a v7 architecture? - bool is_XScale; // Are we emulating an XScale architecture? - bool is_iWMMXt; // Are we emulating an iWMMXt co-processor? - bool is_ep9312; // Are we emulating a Cirrus Maverick co-processor? - bool is_pxa27x; // Are we emulating a Intel PXA27x co-processor? // ARM_ARM A2-18 // 0 Base Restored Abort Model, 1 the Early Abort Model, 2 Base Updated Abort Model @@ -211,20 +207,11 @@ So, if lateabtSig=1, then it means Late Abort Model(Base Updated Abort Model) \***************************************************************************/ enum { - ARM_Nexec_Prop = 0x02, - ARM_Debug_Prop = 0x10, - ARM_Isync_Prop = ARM_Debug_Prop, - ARM_Lock_Prop = 0x20, - ARM_v4_Prop = 0x40, - ARM_v5_Prop = 0x80, - ARM_v6_Prop = 0xc0, - - ARM_v5e_Prop = 0x100, - ARM_XScale_Prop = 0x200, - ARM_ep9312_Prop = 0x400, - ARM_iWMMXt_Prop = 0x800, - ARM_PXA27X_Prop = 0x1000, - ARM_v7_Prop = 0x2000, + ARM_v4_Prop = 0x01, + ARM_v5_Prop = 0x02, + ARM_v5e_Prop = 0x04, + ARM_v6_Prop = 0x08, + ARM_v7_Prop = 0x10, }; /***************************************************************************\ |