diff options
| author | 2016-09-21 11:29:48 -0700 | |
|---|---|---|
| committer | 2016-09-21 11:29:48 -0700 | |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/core/arm/arm_interface.h | |
| parent | README: Specify master branch for Travis CI badge (diff) | |
| parent | Fix Travis clang-format check (diff) | |
| download | yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/core/arm/arm_interface.h')
| -rw-r--r-- | src/core/arm/arm_interface.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 480c90e66..e466b21b2 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h | |||
| @@ -9,14 +9,13 @@ | |||
| 9 | #include "core/arm/skyeye_common/vfp/asm_vfp.h" | 9 | #include "core/arm/skyeye_common/vfp/asm_vfp.h" |
| 10 | 10 | ||
| 11 | namespace Core { | 11 | namespace Core { |
| 12 | struct ThreadContext; | 12 | struct ThreadContext; |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | /// Generic ARM11 CPU interface | 15 | /// Generic ARM11 CPU interface |
| 16 | class ARM_Interface : NonCopyable { | 16 | class ARM_Interface : NonCopyable { |
| 17 | public: | 17 | public: |
| 18 | virtual ~ARM_Interface() { | 18 | virtual ~ARM_Interface() {} |
| 19 | } | ||
| 20 | 19 | ||
| 21 | /** | 20 | /** |
| 22 | * Runs the CPU for the given number of instructions | 21 | * Runs the CPU for the given number of instructions |
| @@ -141,10 +140,10 @@ public: | |||
| 141 | return num_instructions; | 140 | return num_instructions; |
| 142 | } | 141 | } |
| 143 | 142 | ||
| 144 | s64 down_count = 0; ///< A decreasing counter of remaining cycles before the next event, decreased by the cpu run loop | 143 | s64 down_count = 0; ///< A decreasing counter of remaining cycles before the next event, |
| 144 | /// decreased by the cpu run loop | ||
| 145 | 145 | ||
| 146 | protected: | 146 | protected: |
| 147 | |||
| 148 | /** | 147 | /** |
| 149 | * Executes the given number of instructions | 148 | * Executes the given number of instructions |
| 150 | * @param num_instructions Number of instructions to executes | 149 | * @param num_instructions Number of instructions to executes |
| @@ -152,6 +151,5 @@ protected: | |||
| 152 | virtual void ExecuteInstructions(int num_instructions) = 0; | 151 | virtual void ExecuteInstructions(int num_instructions) = 0; |
| 153 | 152 | ||
| 154 | private: | 153 | private: |
| 155 | |||
| 156 | u64 num_instructions = 0; ///< Number of instructions executed | 154 | u64 num_instructions = 0; ///< Number of instructions executed |
| 157 | }; | 155 | }; |