diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-02-25 18:07:56 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-02-25 18:07:56 -0500 |
| commit | 7408de7e79b3607d4747b5e04cc70b651f58a5eb (patch) | |
| tree | 97b6d591aecd5b0d8a7f497a777ec3adef27d87d /Source/Core/Common/x64CPUDetect.cpp | |
| parent | b1fbf205ec54ad2404edb14fbf19c80abde4ab05 (diff) | |
| parent | 93b16a4a2d5f3e6d467d1315c461aff12852b26c (diff) | |
Merge pull request #2058 from Stevoisiak/Codemaid-Cleanup-Take2
Basic Formatting/Whitespace Cleanup
Diffstat (limited to 'Source/Core/Common/x64CPUDetect.cpp')
| -rw-r--r-- | Source/Core/Common/x64CPUDetect.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index d4d3eba05e..d8825d3d50 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -21,7 +21,7 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, #if defined _LP64 // Note: EBX is reserved on Mac OS X and in PIC on Linux, so it has to // restored at the end of the asm block. - __asm__ ( + __asm__( "cpuid;" "movl %%ebx,%1;" : "=a" (*eax), @@ -32,7 +32,7 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx, : "rbx" ); #else - __asm__ ( + __asm__( "cpuid;" "movl %%ebx,%1;" : "=a" (*eax), @@ -219,7 +219,8 @@ void CPUInfo::Detect() logical_cpu_count /= cores_x_package; } } - } else + } + else { // Use AMD's new method. num_cores = (cpu_id[2] & 0xFF) + 1; |