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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/core/core.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index fabd3f42a..ee5237096 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -26,7 +26,7 @@ namespace Core { | |||
| 26 | /*static*/ System System::s_instance; | 26 | /*static*/ System System::s_instance; |
| 27 | 27 | ||
| 28 | System::ResultStatus System::RunLoop(int tight_loop) { | 28 | System::ResultStatus System::RunLoop(int tight_loop) { |
| 29 | if (!app_core) { | 29 | if (!cpu_core) { |
| 30 | return ResultStatus::ErrorNotInitialized; | 30 | return ResultStatus::ErrorNotInitialized; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| @@ -53,7 +53,7 @@ System::ResultStatus System::RunLoop(int tight_loop) { | |||
| 53 | CoreTiming::Advance(); | 53 | CoreTiming::Advance(); |
| 54 | PrepareReschedule(); | 54 | PrepareReschedule(); |
| 55 | } else { | 55 | } else { |
| 56 | app_core->Run(tight_loop); | 56 | cpu_core->Run(tight_loop); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | HW::Update(); | 59 | HW::Update(); |
| @@ -109,7 +109,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file | |||
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | void System::PrepareReschedule() { | 111 | void System::PrepareReschedule() { |
| 112 | app_core->PrepareReschedule(); | 112 | cpu_core->PrepareReschedule(); |
| 113 | reschedule_pending = true; | 113 | reschedule_pending = true; |
| 114 | } | 114 | } |
| 115 | 115 | ||
| @@ -123,16 +123,16 @@ void System::Reschedule() { | |||
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { | 125 | System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { |
| 126 | if (app_core) { | 126 | if (cpu_core) { |
| 127 | app_core.reset(); | 127 | cpu_core.reset(); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | Memory::Init(); | 130 | Memory::Init(); |
| 131 | 131 | ||
| 132 | if (Settings::values.use_cpu_jit) { | 132 | if (Settings::values.use_cpu_jit) { |
| 133 | app_core = std::make_unique<ARM_Dynarmic>(USER32MODE); | 133 | cpu_core = std::make_unique<ARM_Dynarmic>(USER32MODE); |
| 134 | } else { | 134 | } else { |
| 135 | app_core = std::make_unique<ARM_DynCom>(USER32MODE); | 135 | cpu_core = std::make_unique<ARM_DynCom>(USER32MODE); |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | CoreTiming::Init(); | 138 | CoreTiming::Init(); |