From 001280245685ade50326301409e8aee28602504d Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 20 May 2014 18:52:54 -0400 Subject: [PATCH] ARM_Interpreter/ARM_Interface: Fixed member variable naming to be consistent with style guide --- src/core/arm/arm_interface.h | 10 +-- src/core/arm/interpreter/arm_interpreter.cpp | 78 ++++++++++---------- src/core/arm/interpreter/arm_interpreter.h | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 52bc82115f..b73786ccd4 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -13,7 +13,7 @@ class ARM_Interface : NonCopyable { public: ARM_Interface() { - m_num_instructions = 0; + num_instructions = 0; } ~ARM_Interface() { @@ -25,7 +25,7 @@ public: */ void Run(int num_instructions) { ExecuteInstructions(num_instructions); - m_num_instructions += num_instructions; + num_instructions += num_instructions; } /// Step CPU by one instruction @@ -89,9 +89,9 @@ public: */ virtual void LoadContext(const ThreadContext& ctx) = 0; - /// Getter for m_num_instructions + /// Getter for num_instructions u64 GetNumInstructions() { - return m_num_instructions; + return num_instructions; } protected: @@ -104,6 +104,6 @@ protected: private: - u64 m_num_instructions; ///< Number of instructions executed + u64 num_instructions; ///< Number of instructions executed }; diff --git a/src/core/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp index b8c46cdfca..a9ec948207 100644 --- a/src/core/arm/interpreter/arm_interpreter.cpp +++ b/src/core/arm/interpreter/arm_interpreter.cpp @@ -9,30 +9,30 @@ const static cpu_config_t s_arm11_cpu_info = { }; ARM_Interpreter::ARM_Interpreter() { - m_state = new ARMul_State; + state = new ARMul_State; ARMul_EmulateInit(); - ARMul_NewState(m_state); + ARMul_NewState(state); - m_state->abort_model = 0; - m_state->cpu = (cpu_config_t*)&s_arm11_cpu_info; - m_state->bigendSig = LOW; + state->abort_model = 0; + state->cpu = (cpu_config_t*)&s_arm11_cpu_info; + state->bigendSig = LOW; - ARMul_SelectProcessor(m_state, ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop); - m_state->lateabtSig = LOW; - mmu_init(m_state); + ARMul_SelectProcessor(state, ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop); + state->lateabtSig = LOW; + mmu_init(state); // Reset the core to initial state - ARMul_Reset(m_state); - m_state->NextInstr = 0; - m_state->Emulate = 3; + ARMul_Reset(state); + state->NextInstr = 0; + state->Emulate = 3; - m_state->pc = m_state->Reg[15] = 0x00000000; - m_state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack + state->pc = state->Reg[15] = 0x00000000; + state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack } ARM_Interpreter::~ARM_Interpreter() { - delete m_state; + delete state; } /** @@ -40,7 +40,7 @@ ARM_Interpreter::~ARM_Interpreter() { * @param addr Address to set PC to */ void ARM_Interpreter::SetPC(u32 pc) { - m_state->pc = m_state->Reg[15] = pc; + state->pc = state->Reg[15] = pc; } /* @@ -48,7 +48,7 @@ void ARM_Interpreter::SetPC(u32 pc) { * @return Returns current PC */ u32 ARM_Interpreter::GetPC() const { - return m_state->pc; + return state->pc; } /** @@ -57,7 +57,7 @@ u32 ARM_Interpreter::GetPC() const { * @return Returns the value in the register */ u32 ARM_Interpreter::GetReg(int index) const { - return m_state->Reg[index]; + return state->Reg[index]; } /** @@ -66,7 +66,7 @@ u32 ARM_Interpreter::GetReg(int index) const { * @param value Value to set register to */ void ARM_Interpreter::SetReg(int index, u32 value) { - m_state->Reg[index] = value; + state->Reg[index] = value; } /** @@ -74,7 +74,7 @@ void ARM_Interpreter::SetReg(int index, u32 value) { * @return Returns the value of the CPSR register */ u32 ARM_Interpreter::GetCPSR() const { - return m_state->Cpsr; + return state->Cpsr; } /** @@ -82,7 +82,7 @@ u32 ARM_Interpreter::GetCPSR() const { * @param cpsr Value to set CPSR to */ void ARM_Interpreter::SetCPSR(u32 cpsr) { - m_state->Cpsr = cpsr; + state->Cpsr = cpsr; } /** @@ -90,7 +90,7 @@ void ARM_Interpreter::SetCPSR(u32 cpsr) { * @return Returns number of clock ticks */ u64 ARM_Interpreter::GetTicks() const { - return ARMul_Time(m_state); + return ARMul_Time(state); } /** @@ -98,8 +98,8 @@ u64 ARM_Interpreter::GetTicks() const { * @param num_instructions Number of instructions to executes */ void ARM_Interpreter::ExecuteInstructions(int num_instructions) { - m_state->NumInstrsToExecute = num_instructions; - ARMul_Emulate32(m_state); + state->NumInstrsToExecute = num_instructions; + ARMul_Emulate32(state); } /** @@ -108,16 +108,16 @@ void ARM_Interpreter::ExecuteInstructions(int num_instructions) { * @todo Do we need to save Reg[15] and NextInstr? */ void ARM_Interpreter::SaveContext(ThreadContext& ctx) { - memcpy(ctx.cpu_registers, m_state->Reg, sizeof(ctx.cpu_registers)); - memcpy(ctx.fpu_registers, m_state->ExtReg, sizeof(ctx.fpu_registers)); + memcpy(ctx.cpu_registers, state->Reg, sizeof(ctx.cpu_registers)); + memcpy(ctx.fpu_registers, state->ExtReg, sizeof(ctx.fpu_registers)); - ctx.sp = m_state->Reg[13]; - ctx.lr = m_state->Reg[14]; - ctx.pc = m_state->pc; - ctx.cpsr = m_state->Cpsr; + ctx.sp = state->Reg[13]; + ctx.lr = state->Reg[14]; + ctx.pc = state->pc; + ctx.cpsr = state->Cpsr; - ctx.fpscr = m_state->VFP[1]; - ctx.fpexc = m_state->VFP[2]; + ctx.fpscr = state->VFP[1]; + ctx.fpexc = state->VFP[2]; } /** @@ -126,14 +126,14 @@ void ARM_Interpreter::SaveContext(ThreadContext& ctx) { * @param Do we need to load Reg[15] and NextInstr? */ void ARM_Interpreter::LoadContext(const ThreadContext& ctx) { - memcpy(m_state->Reg, ctx.cpu_registers, sizeof(ctx.cpu_registers)); - memcpy(m_state->ExtReg, ctx.fpu_registers, sizeof(ctx.fpu_registers)); + memcpy(state->Reg, ctx.cpu_registers, sizeof(ctx.cpu_registers)); + memcpy(state->ExtReg, ctx.fpu_registers, sizeof(ctx.fpu_registers)); - m_state->Reg[13] = ctx.sp; - m_state->Reg[14] = ctx.lr; - m_state->pc = ctx.pc; - m_state->Cpsr = ctx.cpsr; + state->Reg[13] = ctx.sp; + state->Reg[14] = ctx.lr; + state->pc = ctx.pc; + state->Cpsr = ctx.cpsr; - m_state->VFP[1] = ctx.fpscr; - m_state->VFP[2] = ctx.fpexc; + state->VFP[1] = ctx.fpscr; + state->VFP[2] = ctx.fpexc; } diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h index 15240568c2..6a531e4979 100644 --- a/src/core/arm/interpreter/arm_interpreter.h +++ b/src/core/arm/interpreter/arm_interpreter.h @@ -82,6 +82,6 @@ protected: private: - ARMul_State* m_state; + ARMul_State* state; };