Merge pull request #524 from lioncash/state

arm: Clean up ARMul_State

5 files changed, 84 insertions, 138 deletions

diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index 01ffbcc87..f6628ca33 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -36,9 +36,8 @@ ARM_DynCom::ARM_DynCom() {
     state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext
     state->Emulate = 3;
 
-    state->pc = state->Reg[15] = 0x00000000;
+    state->Reg[15] = 0x00000000;
     state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack
-    state->servaddr = 0xFFFF0000;
     state->NirqSig = HIGH;
 
     VFPInit(state.get()); // Initialize the VFP
@@ -50,7 +49,7 @@ ARM_DynCom::~ARM_DynCom() {
 }
 
 void ARM_DynCom::SetPC(u32 pc) {
-    state->pc = state->Reg[15] = pc;
+    state->Reg[15] = pc;
 }
 
 u32 ARM_DynCom::GetPC() const {
@@ -106,7 +105,6 @@ void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) {
     ctx.fpscr = state->VFP[1];
     ctx.fpexc = state->VFP[2];
 
-    ctx.reg_15 = state->Reg[15];
     ctx.mode = state->NextInstr;
 }
 
@@ -116,13 +114,12 @@ void ARM_DynCom::LoadContext(const Core::ThreadContext& ctx) {
 
     state->Reg[13] = ctx.sp;
     state->Reg[14] = ctx.lr;
-    state->pc = ctx.pc;
+    state->Reg[15] = ctx.pc;
     state->Cpsr = ctx.cpsr;
 
     state->VFP[1] = ctx.fpscr;
     state->VFP[2] = ctx.fpexc;
 
-    state->Reg[15] = ctx.reg_15;
     state->NextInstr = ctx.mode;
 }
 
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
index a0e041fa0..a52d14960 100644
--- a/src/core/arm/interpreter/arminit.cpp
+++ b/src/core/arm/interpreter/arminit.cpp
@@ -95,12 +95,6 @@ ARMul_State* ARMul_NewState(ARMul_State* state)
     state->lateabtSig = HIGH;
     state->bigendSig = LOW;
 
-    //chy:2003-08-19
-    state->CP14R0_CCD = -1;
-
-    memset(&state->exclusive_tag_array[0], 0xFF, sizeof(state->exclusive_tag_array[0]) * 128);
-    state->exclusive_access_state = 0;
-
     return state;
 }
 
@@ -118,15 +112,15 @@ void ARMul_SelectProcessor(ARMul_State* state, unsigned properties)
         state->data32Sig = HIGH;
     }
 
-    state->is_v4     = (properties & (ARM_v4_Prop | ARM_v5_Prop)) ? HIGH : LOW;
-    state->is_v5     = (properties & ARM_v5_Prop) ? HIGH : LOW;
-    state->is_v5e    = (properties & ARM_v5e_Prop) ? HIGH : LOW;
-    state->is_XScale = (properties & ARM_XScale_Prop) ? HIGH : LOW;
-    state->is_iWMMXt = (properties & ARM_iWMMXt_Prop) ? HIGH : LOW;
-    state->is_v6     = (properties & ARM_v6_Prop) ? HIGH : LOW;
-    state->is_ep9312 = (properties & ARM_ep9312_Prop) ? HIGH : LOW;
-    state->is_pxa27x = (properties & ARM_PXA27X_Prop) ? HIGH : LOW;
-    state->is_v7     = (properties & ARM_v7_Prop) ? HIGH : LOW;
+    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
        know what kind of chip we are dealing with.  */
@@ -164,9 +158,4 @@ void ARMul_Reset(ARMul_State* state)
     state->AbortAddr = 1;
 
     state->NumInstrs = 0;
-    state->NumNcycles = 0;
-    state->NumScycles = 0;
-    state->NumIcycles = 0;
-    state->NumCcycles = 0;
-    state->NumFcycles = 0;
 }
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h
index be54ce71b..778868783 100644
--- a/src/core/arm/skyeye_common/armdefs.h
+++ b/src/core/arm/skyeye_common/armdefs.h
@@ -74,88 +74,69 @@ typedef unsigned ARMul_CPWrites(ARMul_State* state, unsigned reg, ARMword value)
 #define VFP_REG_NUM 64
 struct ARMul_State
 {
-    ARMword Emulate;       /* to start and stop emulation */
-    unsigned EndCondition; /* reason for stopping */
-    unsigned ErrorCode;    /* type of illegal instruction */
+    ARMword Emulate;       // To start and stop emulation
+    unsigned EndCondition; // Reason for stopping
+    unsigned ErrorCode;    // Type of illegal instruction
 
-    /* Order of the following register should not be modified */
-    ARMword Reg[16];            /* the current register file */
-    ARMword Cpsr;               /* the current psr */
+    // Order of the following register should not be modified
+    ARMword Reg[16];            // The current register file
+    ARMword Cpsr;               // The current PSR
     ARMword Spsr_copy;
     ARMword phys_pc;
     ARMword Reg_usr[2];
-    ARMword Reg_svc[2];         /* R13_SVC R14_SVC */
-    ARMword Reg_abort[2];       /* R13_ABORT R14_ABORT */
-    ARMword Reg_undef[2];       /* R13 UNDEF R14 UNDEF */
-    ARMword Reg_irq[2];         /* R13_IRQ R14_IRQ */
-    ARMword Reg_firq[7];        /* R8---R14 FIRQ */
-    ARMword Spsr[7];            /* the exception psr's */
-    ARMword Mode;               /* the current mode */
-    ARMword Bank;               /* the current register bank */
-    ARMword exclusive_tag;      /* the address for which the local monitor is in exclusive access mode */
+    ARMword Reg_svc[2];         // R13_SVC R14_SVC
+    ARMword Reg_abort[2];       // R13_ABORT R14_ABORT
+    ARMword Reg_undef[2];       // R13 UNDEF R14 UNDEF
+    ARMword Reg_irq[2];         // R13_IRQ R14_IRQ
+    ARMword Reg_firq[7];        // R8---R14 FIRQ
+    ARMword Spsr[7];            // The exception psr's
+    ARMword Mode;               // The current mode
+    ARMword Bank;               // The current register bank
+    ARMword exclusive_tag;      // The address for which the local monitor is in exclusive access mode
     ARMword exclusive_state;
     ARMword exclusive_result;
     ARMword CP15[VFP_BASE - CP15_BASE];
-    ARMword VFP[3]; /* FPSID, FPSCR, and FPEXC */
-    /* VFPv2 and VFPv3-D16 has 16 doubleword registers (D0-D16 or S0-S31).
-       VFPv3-D32/ASIMD may have up to 32 doubleword registers (D0-D31),
-        and only 32 singleword registers are accessible (S0-S31). */
+    ARMword VFP[3]; // FPSID, FPSCR, and FPEXC
+    // VFPv2 and VFPv3-D16 has 16 doubleword registers (D0-D16 or S0-S31).
+    // VFPv3-D32/ASIMD may have up to 32 doubleword registers (D0-D31),
+    // and only 32 singleword registers are accessible (S0-S31).
     ARMword ExtReg[VFP_REG_NUM];
     /* ---- End of the ordered registers ---- */
     
-    ARMword RegBank[7][16];    /* all the registers */
-    //chy:2003-08-19, used in arm xscale
-    /* 40 bit accumulator.  We always keep this 64 bits wide,
-       and move only 40 bits out of it in an MRA insn.  */
-    ARMdword Accumulator;
-
-    ARMword NFlag, ZFlag, CFlag, VFlag, IFFlags;    /* dummy flags for speed */
-    unsigned long long int icounter, debug_icounter, kernel_icounter;
+    ARMword RegBank[7][16]; // all the registers
+
+    ARMword NFlag, ZFlag, CFlag, VFlag, IFFlags; // Dummy flags for speed
     unsigned int shifter_carry_out;
 
-    /* add armv6 flags dyf:2010-08-09 */
+    // Add armv6 flags dyf:2010-08-09
     ARMword GEFlag, EFlag, AFlag, QFlag;
-    //chy:2003-08-19, used in arm v5e|xscale
-    ARMword SFlag;
+
 #ifdef MODET
-    ARMword TFlag;        /* Thumb state */
+    ARMword TFlag; // Thumb state
 #endif
-    ARMword instr, pc, temp;    /* saved register state */
-    ARMword loaded, decoded;    /* saved pipeline state */
-    //chy 2006-04-12 for ICE breakpoint
-    ARMword loaded_addr, decoded_addr;    /* saved pipeline state addr*/
-    unsigned int NumScycles, NumNcycles, NumIcycles, NumCcycles, NumFcycles;    /* emulated cycles used */
-    unsigned long long NumInstrs;    /* the number of instructions executed */
-    unsigned NumInstrsToExecute;
 
-    ARMword currentexaddr;
-    ARMword currentexval;
-    ARMword currentexvald;
-    ARMword servaddr;
+    unsigned long long NumInstrs; // The number of instructions executed
+    unsigned NumInstrsToExecute;
 
     unsigned NextInstr;
-    unsigned VectorCatch;                   /* caught exception mask */
-    unsigned CallDebug;                     /* set to call the debugger */
-    unsigned CanWatch;                      /* set by memory interface if its willing to suffer the
-                                               overhead of checking for watchpoints on each memory
-                                               access */
-
-    ARMul_CPInits *CPInit[16];              /* coprocessor initialisers */
-    ARMul_CPExits *CPExit[16];              /* coprocessor finalisers */
-    ARMul_LDCs *LDC[16];                    /* LDC instruction */
-    ARMul_STCs *STC[16];                    /* STC instruction */
-    ARMul_MRCs *MRC[16];                    /* MRC instruction */
-    ARMul_MCRs *MCR[16];                    /* MCR instruction */
-    ARMul_MRRCs *MRRC[16];                  /* MRRC instruction */
-    ARMul_MCRRs *MCRR[16];                  /* MCRR instruction */
-    ARMul_CDPs *CDP[16];                    /* CDP instruction */
-    ARMul_CPReads *CPRead[16];              /* Read CP register */
-    ARMul_CPWrites *CPWrite[16];            /* Write CP register */
-    unsigned char *CPData[16];              /* Coprocessor data */
-    unsigned char const *CPRegWords[16];    /* map of coprocessor register sizes */
-
-    unsigned Debug;                         /* show instructions as they are executed */
-    unsigned NresetSig;                     /* reset the processor */
+    unsigned VectorCatch;                   // Caught exception mask
+
+    ARMul_CPInits* CPInit[16];              // Coprocessor initialisers
+    ARMul_CPExits* CPExit[16];              // Coprocessor finalisers
+    ARMul_LDCs* LDC[16];                    // LDC instruction
+    ARMul_STCs* STC[16];                    // STC instruction
+    ARMul_MRCs* MRC[16];                    // MRC instruction
+    ARMul_MCRs* MCR[16];                    // MCR instruction
+    ARMul_MRRCs* MRRC[16];                  // MRRC instruction
+    ARMul_MCRRs* MCRR[16];                  // MCRR instruction
+    ARMul_CDPs* CDP[16];                    // CDP instruction
+    ARMul_CPReads* CPRead[16];              // Read CP register
+    ARMul_CPWrites* CPWrite[16];            // Write CP register
+    unsigned char* CPData[16];              // Coprocessor data
+    unsigned char const* CPRegWords[16];    // Map of coprocessor register sizes
+
+    unsigned Debug;                         // Show instructions as they are executed
+    unsigned NresetSig;                     // Reset the processor
     unsigned NfiqSig;
     unsigned NirqSig;
 
@@ -199,54 +180,34 @@ So, if lateabtSig=1, then it means Late Abort Model(Base Updated Abort Model)
 */
     unsigned lateabtSig;
 
-    ARMword Vector;              /* synthesize aborts in cycle modes */
-    ARMword Aborted;             /* sticky flag for aborts */
-    ARMword Reseted;             /* sticky flag for Reset */
-    ARMword Inted, LastInted;    /* sticky flags for interrupts */
-    ARMword Base;                /* extra hand for base writeback */
-    ARMword AbortAddr;           /* to keep track of Prefetch aborts */
-
-    int verbose;        /* non-zero means print various messages like the banner */
-
-    int mmu_inited;
-
-    //chy: 2003-08-11, for different arm core type
-    unsigned is_v4;        /* Are we emulating a v4 architecture (or higher) ?  */
-    unsigned is_v5;        /* Are we emulating a v5 architecture ?  */
-    unsigned is_v5e;       /* Are we emulating a v5e architecture ?  */
-    unsigned is_v6;        /* Are we emulating a v6 architecture ?  */
-    unsigned is_v7;        /* Are we emulating a v7 architecture ?  */
-    unsigned is_XScale;    /* Are we emulating an XScale architecture ?  */
-    unsigned is_iWMMXt;    /* Are we emulating an iWMMXt co-processor ?  */
-    unsigned is_ep9312;    /* Are we emulating a Cirrus Maverick co-processor ?  */
-    unsigned is_pxa27x;    /* Are we emulating a Intel PXA27x co-processor ?  */
-
-    //chy: seems only used in xscale's CP14
-    ARMword CP14R0_CCD;    /* used to count 64 clock cycles with CP14 R0 bit 3 set */
-
-    //teawater add for arm2x86 2005.07.05-------------------------------------------
-    //arm_arm A2-18
-    int abort_model;    //0 Base Restored Abort Model, 1 the Early Abort Model, 2 Base Updated Abort Model
-
-    /*added by ksh in 2005-10-1*/
-    cpu_config_t *cpu;
-
-    /* added LPC remap function */
-    int vector_remap_flag;
-    u32 vector_remap_addr;
-    u32 vector_remap_size;
-
-    u32 step;
-    u32 cycle;
-
-    /* monitored memory for exclusice access */
-    ARMword exclusive_tag_array[128];
-    /* 1 means exclusive access and 0 means open access */
-    ARMword exclusive_access_state;
+    ARMword Vector;           // Synthesize aborts in cycle modes
+    ARMword Aborted;          // Sticky flag for aborts
+    ARMword Reseted;          // Sticky flag for Reset
+    ARMword Inted, LastInted; // Sticky flags for interrupts
+    ARMword Base;             // Extra hand for base writeback
+    ARMword AbortAddr;        // To keep track of Prefetch aborts
+
+    // For differentiating ARM core emulaiton.
+    bool is_v4;     // Are we emulating a v4 architecture (or higher)?
+    bool is_v5;     // Are we emulating a v5 architecture?
+    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
+    int abort_model;
+
+    // Added by ksh in 2005-10-1
+    cpu_config_t* cpu;
 
     u32 CurrInstr;
-    u32 last_pc; /* the last pc executed */
-    u32 last_instr; /* the last inst executed */
+    u32 last_pc;      // The last PC executed
+    u32 last_instr;   // The last instruction executed
     u32 WriteAddr[17];
     u32 WriteData[17];
     u32 WritePc[17];
diff --git a/src/core/core.h b/src/core/core.h
index 8504bb2d9..5e132cb5a 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -23,7 +23,6 @@ struct ThreadContext {
     u32 fpexc;
 
     // These are not part of native ThreadContext, but needed by emu
-    u32 reg_15;
     u32 mode;
 };
 
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 03b492c75..56950ebd4 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -50,7 +50,7 @@ static void ResetThread(Thread* t, u32 arg, s32 lowest_priority) {
     memset(&t->context, 0, sizeof(Core::ThreadContext));
 
     t->context.cpu_registers[0] = arg;
-    t->context.pc = t->context.reg_15 = t->entry_point;
+    t->context.pc = t->entry_point;
     t->context.sp = t->stack_top;
     t->context.cpsr = 0x1F; // Usermode