diff options
| author | 2016-12-22 00:00:01 -0500 | |
|---|---|---|
| committer | 2016-12-22 00:27:46 -0500 | |
| commit | e26fbfd1d72c026d0f25c09595e7123459b1734f (patch) | |
| tree | 5d99608b33c991b59c25cd2014be8bacb136c29b /src/core/core.h | |
| parent | Address clang-format issues. (diff) | |
| download | yuzu-e26fbfd1d72c026d0f25c09595e7123459b1734f.tar.gz yuzu-e26fbfd1d72c026d0f25c09595e7123459b1734f.tar.xz yuzu-e26fbfd1d72c026d0f25c09595e7123459b1734f.zip | |
core: Replace "AppCore" nomenclature with just "CPU".
Diffstat (limited to 'src/core/core.h')
| -rw-r--r-- | src/core/core.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/core.h b/src/core/core.h index 728c24c1c..b0f8df441 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -88,18 +88,18 @@ public: | |||
| 88 | * @returns True if the emulated system is powered on, otherwise false. | 88 | * @returns True if the emulated system is powered on, otherwise false. |
| 89 | */ | 89 | */ |
| 90 | bool IsPoweredOn() const { | 90 | bool IsPoweredOn() const { |
| 91 | return app_core != nullptr; | 91 | return cpu_core != nullptr; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | /// Prepare the core emulation for a reschedule | 94 | /// Prepare the core emulation for a reschedule |
| 95 | void PrepareReschedule(); | 95 | void PrepareReschedule(); |
| 96 | 96 | ||
| 97 | /** | 97 | /** |
| 98 | * Gets a reference to the emulated AppCore CPU. | 98 | * Gets a reference to the emulated CPU. |
| 99 | * @returns A reference to the emulated AppCore CPU. | 99 | * @returns A reference to the emulated CPU. |
| 100 | */ | 100 | */ |
| 101 | ARM_Interface& AppCore() { | 101 | ARM_Interface& CPU() { |
| 102 | return *app_core; | 102 | return *cpu_core; |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | private: | 105 | private: |
| @@ -117,8 +117,8 @@ private: | |||
| 117 | /// AppLoader used to load the current executing application | 117 | /// AppLoader used to load the current executing application |
| 118 | std::unique_ptr<Loader::AppLoader> app_loader; | 118 | std::unique_ptr<Loader::AppLoader> app_loader; |
| 119 | 119 | ||
| 120 | ///< ARM11 application core | 120 | ///< ARM11 CPU core |
| 121 | std::unique_ptr<ARM_Interface> app_core; | 121 | std::unique_ptr<ARM_Interface> cpu_core; |
| 122 | 122 | ||
| 123 | /// When true, signals that a reschedule should happen | 123 | /// When true, signals that a reschedule should happen |
| 124 | bool reschedule_pending{}; | 124 | bool reschedule_pending{}; |
| @@ -126,8 +126,8 @@ private: | |||
| 126 | static System s_instance; | 126 | static System s_instance; |
| 127 | }; | 127 | }; |
| 128 | 128 | ||
| 129 | static ARM_Interface& AppCore() { | 129 | static ARM_Interface& CPU() { |
| 130 | return System::GetInstance().AppCore(); | 130 | return System::GetInstance().CPU(); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | } // namespace Core | 133 | } // namespace Core |