summaryrefslogtreecommitdiff
path: root/src/common/wall_clock.cpp
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2020-02-10 13:33:13 -0400
committerGravatar Fernando Sahmkow2020-06-18 16:29:19 -0400
commit1bd706344e2381e11245b2f0bdc291429e46c634 (patch)
tree4abae5a2088df1eb023967d83c0b808eceb30cea /src/common/wall_clock.cpp
parentCommon: Correct fcontext fibers. (diff)
downloadyuzu-1bd706344e2381e11245b2f0bdc291429e46c634.tar.gz
yuzu-1bd706344e2381e11245b2f0bdc291429e46c634.tar.xz
yuzu-1bd706344e2381e11245b2f0bdc291429e46c634.zip
Common/Tests: Clang Format.
Diffstat (limited to 'src/common/wall_clock.cpp')
-rw-r--r--src/common/wall_clock.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp
index 8f5e17fa4..e6161c72c 100644
--- a/src/common/wall_clock.cpp
+++ b/src/common/wall_clock.cpp
@@ -58,7 +58,8 @@ private:
58 58
59#ifdef ARCHITECTURE_x86_64 59#ifdef ARCHITECTURE_x86_64
60 60
61std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency, u32 emulated_clock_frequency) { 61std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency,
62 u32 emulated_clock_frequency) {
62 const auto& caps = GetCPUCaps(); 63 const auto& caps = GetCPUCaps();
63 u64 rtsc_frequency = 0; 64 u64 rtsc_frequency = 0;
64 if (caps.invariant_tsc) { 65 if (caps.invariant_tsc) {
@@ -70,15 +71,18 @@ std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency, u
70 } 71 }
71 } 72 }
72 if (rtsc_frequency == 0) { 73 if (rtsc_frequency == 0) {
73 return std::make_unique<StandardWallClock>(emulated_cpu_frequency, emulated_clock_frequency); 74 return std::make_unique<StandardWallClock>(emulated_cpu_frequency,
75 emulated_clock_frequency);
74 } else { 76 } else {
75 return std::make_unique<X64::NativeClock>(emulated_cpu_frequency, emulated_clock_frequency, rtsc_frequency); 77 return std::make_unique<X64::NativeClock>(emulated_cpu_frequency, emulated_clock_frequency,
78 rtsc_frequency);
76 } 79 }
77} 80}
78 81
79#else 82#else
80 83
81std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency, u32 emulated_clock_frequency) { 84std::unique_ptr<WallClock> CreateBestMatchingClock(u32 emulated_cpu_frequency,
85 u32 emulated_clock_frequency) {
82 return std::make_unique<StandardWallClock>(emulated_cpu_frequency, emulated_clock_frequency); 86 return std::make_unique<StandardWallClock>(emulated_cpu_frequency, emulated_clock_frequency);
83} 87}
84 88