diff options
| -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) | |||
| 58 | state->is_v4 = (properties & (ARM_v4_Prop | ARM_v5_Prop)) != 0; | 58 | state->is_v4 = (properties & (ARM_v4_Prop | ARM_v5_Prop)) != 0; |
| 59 | state->is_v5 = (properties & ARM_v5_Prop) != 0; | 59 | state->is_v5 = (properties & ARM_v5_Prop) != 0; |
| 60 | state->is_v5e = (properties & ARM_v5e_Prop) != 0; | 60 | state->is_v5e = (properties & ARM_v5e_Prop) != 0; |
| 61 | state->is_XScale = (properties & ARM_XScale_Prop) != 0; | ||
| 62 | state->is_iWMMXt = (properties & ARM_iWMMXt_Prop) != 0; | ||
| 63 | state->is_v6 = (properties & ARM_v6_Prop) != 0; | 61 | state->is_v6 = (properties & ARM_v6_Prop) != 0; |
| 64 | state->is_ep9312 = (properties & ARM_ep9312_Prop) != 0; | ||
| 65 | state->is_pxa27x = (properties & ARM_PXA27X_Prop) != 0; | ||
| 66 | state->is_v7 = (properties & ARM_v7_Prop) != 0; | 62 | state->is_v7 = (properties & ARM_v7_Prop) != 0; |
| 67 | 63 | ||
| 68 | // Only initialse the coprocessor support once we | 64 | // 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) | |||
| 185 | bool is_v5e; // Are we emulating a v5e architecture? | 185 | bool is_v5e; // Are we emulating a v5e architecture? |
| 186 | bool is_v6; // Are we emulating a v6 architecture? | 186 | bool is_v6; // Are we emulating a v6 architecture? |
| 187 | bool is_v7; // Are we emulating a v7 architecture? | 187 | bool is_v7; // Are we emulating a v7 architecture? |
| 188 | bool is_XScale; // Are we emulating an XScale architecture? | ||
| 189 | bool is_iWMMXt; // Are we emulating an iWMMXt co-processor? | ||
| 190 | bool is_ep9312; // Are we emulating a Cirrus Maverick co-processor? | ||
| 191 | bool is_pxa27x; // Are we emulating a Intel PXA27x co-processor? | ||
| 192 | 188 | ||
| 193 | // ARM_ARM A2-18 | 189 | // ARM_ARM A2-18 |
| 194 | // 0 Base Restored Abort Model, 1 the Early Abort Model, 2 Base Updated Abort Model | 190 | // 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) | |||
| 211 | \***************************************************************************/ | 207 | \***************************************************************************/ |
| 212 | 208 | ||
| 213 | enum { | 209 | enum { |
| 214 | ARM_Nexec_Prop = 0x02, | 210 | ARM_v4_Prop = 0x01, |
| 215 | ARM_Debug_Prop = 0x10, | 211 | ARM_v5_Prop = 0x02, |
| 216 | ARM_Isync_Prop = ARM_Debug_Prop, | 212 | ARM_v5e_Prop = 0x04, |
| 217 | ARM_Lock_Prop = 0x20, | 213 | ARM_v6_Prop = 0x08, |
| 218 | ARM_v4_Prop = 0x40, | 214 | ARM_v7_Prop = 0x10, |
| 219 | ARM_v5_Prop = 0x80, | ||
| 220 | ARM_v6_Prop = 0xc0, | ||
| 221 | |||
| 222 | ARM_v5e_Prop = 0x100, | ||
| 223 | ARM_XScale_Prop = 0x200, | ||
| 224 | ARM_ep9312_Prop = 0x400, | ||
| 225 | ARM_iWMMXt_Prop = 0x800, | ||
| 226 | ARM_PXA27X_Prop = 0x1000, | ||
| 227 | ARM_v7_Prop = 0x2000, | ||
| 228 | }; | 215 | }; |
| 229 | 216 | ||
| 230 | /***************************************************************************\ | 217 | /***************************************************************************\ |