diff options
| author | 2015-12-07 16:24:08 -0500 | |
|---|---|---|
| committer | 2015-12-07 16:24:08 -0500 | |
| commit | 2589a68c428da231ba7814437fa77cd432c8693c (patch) | |
| tree | 27fa840b335e0898bd7220638e5e6b9ffeef79f9 /src/core/arm/arm_interface.h | |
| parent | Merge pull request #1252 from Subv/cam (diff) | |
| parent | dyncom: Remove static keyword from header functions (diff) | |
| download | yuzu-2589a68c428da231ba7814437fa77cd432c8693c.tar.gz yuzu-2589a68c428da231ba7814437fa77cd432c8693c.tar.xz yuzu-2589a68c428da231ba7814437fa77cd432c8693c.zip | |
Merge pull request #1271 from lioncash/dyncom-misc
dyncom: Miscellaneous minor changes
Diffstat (limited to 'src/core/arm/arm_interface.h')
| -rw-r--r-- | src/core/arm/arm_interface.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 5cffe513c..533067d4f 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h | |||
| @@ -14,10 +14,6 @@ namespace Core { | |||
| 14 | /// Generic ARM11 CPU interface | 14 | /// Generic ARM11 CPU interface |
| 15 | class ARM_Interface : NonCopyable { | 15 | class ARM_Interface : NonCopyable { |
| 16 | public: | 16 | public: |
| 17 | ARM_Interface() { | ||
| 18 | num_instructions = 0; | ||
| 19 | } | ||
| 20 | |||
| 21 | virtual ~ARM_Interface() { | 17 | virtual ~ARM_Interface() { |
| 22 | } | 18 | } |
| 23 | 19 | ||
| @@ -146,11 +142,11 @@ public: | |||
| 146 | virtual void PrepareReschedule() = 0; | 142 | virtual void PrepareReschedule() = 0; |
| 147 | 143 | ||
| 148 | /// Getter for num_instructions | 144 | /// Getter for num_instructions |
| 149 | u64 GetNumInstructions() { | 145 | u64 GetNumInstructions() const { |
| 150 | return num_instructions; | 146 | return num_instructions; |
| 151 | } | 147 | } |
| 152 | 148 | ||
| 153 | s64 down_count; ///< A decreasing counter of remaining cycles before the next event, decreased by the cpu run loop | 149 | s64 down_count = 0; ///< A decreasing counter of remaining cycles before the next event, decreased by the cpu run loop |
| 154 | 150 | ||
| 155 | protected: | 151 | protected: |
| 156 | 152 | ||
| @@ -162,6 +158,5 @@ protected: | |||
| 162 | 158 | ||
| 163 | private: | 159 | private: |
| 164 | 160 | ||
| 165 | u64 num_instructions; ///< Number of instructions executed | 161 | u64 num_instructions = 0; ///< Number of instructions executed |
| 166 | |||
| 167 | }; | 162 | }; |