summaryrefslogtreecommitdiff
path: root/src/core/arm/arm_interface.h
diff options
context:
space:
mode:
authorGravatar bunnei2014-04-08 20:38:33 -0400
committerGravatar bunnei2014-04-08 20:38:33 -0400
commitd0674cc98bfa5729168274cde62a4e69343f8524 (patch)
tree78f40a0cf1afa17bbd3aac9e19e33557ea7444da /src/core/arm/arm_interface.h
parentfixed license headers in citra project (diff)
downloadyuzu-d0674cc98bfa5729168274cde62a4e69343f8524.tar.gz
yuzu-d0674cc98bfa5729168274cde62a4e69343f8524.tar.xz
yuzu-d0674cc98bfa5729168274cde62a4e69343f8524.zip
fixed licensing and updated code style naming for arm_interface/arm_interpreter frontend module
Diffstat (limited to 'src/core/arm/arm_interface.h')
-rw-r--r--src/core/arm/arm_interface.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index e5df2d971..dafde8368 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -11,7 +11,7 @@
11class ARM_Interface { 11class ARM_Interface {
12public: 12public:
13 ARM_Interface() { 13 ARM_Interface() {
14 num_instructions_ = 0; 14 m_num_instructions = 0;
15 } 15 }
16 16
17 ~ARM_Interface() { 17 ~ARM_Interface() {
@@ -20,7 +20,7 @@ public:
20 /// Step CPU by one instruction 20 /// Step CPU by one instruction
21 void Step() { 21 void Step() {
22 ExecuteInstruction(); 22 ExecuteInstruction();
23 num_instructions_++; 23 m_num_instructions++;
24 } 24 }
25 25
26 /** 26 /**
@@ -33,36 +33,38 @@ public:
33 * Get the current Program Counter 33 * Get the current Program Counter
34 * @return Returns current PC 34 * @return Returns current PC
35 */ 35 */
36 virtual u32 PC() = 0; 36 virtual u32 GetPC() const = 0;
37 37
38 /** 38 /**
39 * Get an ARM register 39 * Get an ARM register
40 * @param index Register index (0-15) 40 * @param index Register index (0-15)
41 * @return Returns the value in the register 41 * @return Returns the value in the register
42 */ 42 */
43 virtual u32 Reg(int index) = 0; 43 virtual u32 GetReg(int index) const = 0;
44 44
45 /** 45 /**
46 * Get the current CPSR register 46 * Get the current CPSR register
47 * @return Returns the value of the CPSR register 47 * @return Returns the value of the CPSR register
48 */ 48 */
49 virtual u32 CPSR() = 0; 49 virtual u32 GetCPSR() const = 0;
50 50
51 /** 51 /**
52 * Returns the number of clock ticks since the last rese 52 * Returns the number of clock ticks since the last rese
53 * @return Returns number of clock ticks 53 * @return Returns number of clock ticks
54 */ 54 */
55 virtual u64 GetTicks() = 0; 55 virtual u64 GetTicks() const = 0;
56 56
57 /// Getter for num_instructions_ 57 /// Getter for m_num_instructions
58 u64 num_instructions() { return num_instructions_; } 58 u64 GetNumInstructions() {
59 return m_num_instructions;
60 }
59 61
60private: 62private:
61 63
62 /// Execture next instruction 64 /// Execture next instruction
63 virtual void ExecuteInstruction() = 0; 65 virtual void ExecuteInstruction() = 0;
64 66
65 u64 num_instructions_; ///< Number of instructions executed 67 u64 m_num_instructions; ///< Number of instructions executed
66 68
67 DISALLOW_COPY_AND_ASSIGN(ARM_Interface); 69 DISALLOW_COPY_AND_ASSIGN(ARM_Interface);
68}; 70};