mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-02 08:25:07 +01:00
Merge pull request #609 from lioncash/rem
arm: Remove unnecessary booleans
This commit is contained in:
commit
593e74ce3d
@ -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_v4 = (properties & (ARM_v4_Prop | ARM_v5_Prop)) != 0;
|
||||||
state->is_v5 = (properties & ARM_v5_Prop) != 0;
|
state->is_v5 = (properties & ARM_v5_Prop) != 0;
|
||||||
state->is_v5e = (properties & ARM_v5e_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_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;
|
state->is_v7 = (properties & ARM_v7_Prop) != 0;
|
||||||
|
|
||||||
// Only initialse the coprocessor support once we
|
// Only initialse the coprocessor support once we
|
||||||
|
@ -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_v5e; // Are we emulating a v5e architecture?
|
||||||
bool is_v6; // Are we emulating a v6 architecture?
|
bool is_v6; // Are we emulating a v6 architecture?
|
||||||
bool is_v7; // Are we emulating a v7 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
|
// ARM_ARM A2-18
|
||||||
// 0 Base Restored Abort Model, 1 the Early Abort Model, 2 Base Updated Abort Model
|
// 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 {
|
enum {
|
||||||
ARM_Nexec_Prop = 0x02,
|
ARM_v4_Prop = 0x01,
|
||||||
ARM_Debug_Prop = 0x10,
|
ARM_v5_Prop = 0x02,
|
||||||
ARM_Isync_Prop = ARM_Debug_Prop,
|
ARM_v5e_Prop = 0x04,
|
||||||
ARM_Lock_Prop = 0x20,
|
ARM_v6_Prop = 0x08,
|
||||||
ARM_v4_Prop = 0x40,
|
ARM_v7_Prop = 0x10,
|
||||||
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,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/***************************************************************************\
|
/***************************************************************************\
|
||||||
|
Loading…
Reference in New Issue
Block a user