diff options
Diffstat (limited to 'src/common/x64')
| -rw-r--r-- | src/common/x64/cpu_detect.cpp | 4 | ||||
| -rw-r--r-- | src/common/x64/emitter.cpp | 8 | ||||
| -rw-r--r-- | src/common/x64/emitter.h | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp index 19f1a4030..ac37c42bc 100644 --- a/src/common/x64/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp | |||
| @@ -2,14 +2,12 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "cpu_detect.h" | ||
| 5 | #include <cstring> | 6 | #include <cstring> |
| 6 | #include <string> | 7 | #include <string> |
| 7 | #include <thread> | 8 | #include <thread> |
| 8 | |||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | 10 | ||
| 11 | #include "cpu_detect.h" | ||
| 12 | |||
| 13 | namespace Common { | 11 | namespace Common { |
| 14 | 12 | ||
| 15 | #ifndef _MSC_VER | 13 | #ifndef _MSC_VER |
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp index 7cf350b4a..b69e4bd5e 100644 --- a/src/common/x64/emitter.cpp +++ b/src/common/x64/emitter.cpp | |||
| @@ -15,16 +15,14 @@ | |||
| 15 | // Official SVN repository and contact information can be found at | 15 | // Official SVN repository and contact information can be found at |
| 16 | // http://code.google.com/p/dolphin-emu/ | 16 | // http://code.google.com/p/dolphin-emu/ |
| 17 | 17 | ||
| 18 | #include "emitter.h" | ||
| 18 | #include <cinttypes> | 19 | #include <cinttypes> |
| 19 | #include <cstring> | 20 | #include <cstring> |
| 20 | 21 | #include "abi.h" | |
| 21 | #include "common/assert.h" | 22 | #include "common/assert.h" |
| 22 | #include "common/logging/log.h" | 23 | #include "common/logging/log.h" |
| 23 | #include "common/memory_util.h" | 24 | #include "common/memory_util.h" |
| 24 | |||
| 25 | #include "abi.h" | ||
| 26 | #include "cpu_detect.h" | 25 | #include "cpu_detect.h" |
| 27 | #include "emitter.h" | ||
| 28 | 26 | ||
| 29 | namespace Gen { | 27 | namespace Gen { |
| 30 | 28 | ||
| @@ -222,7 +220,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp | |||
| 222 | void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg, | 220 | void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg, |
| 223 | bool warn_64bit_offset) const { | 221 | bool warn_64bit_offset) const { |
| 224 | if (_operandReg == INVALID_REG) | 222 | if (_operandReg == INVALID_REG) |
| 225 | _operandReg = (X64Reg)this->operandReg; | 223 | _operandReg = (X64Reg) this->operandReg; |
| 226 | int mod = 0; | 224 | int mod = 0; |
| 227 | int ireg = indexReg; | 225 | int ireg = indexReg; |
| 228 | bool SIB = false; | 226 | bool SIB = false; |
diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h index 6c9dc3d6b..7d7cdde16 100644 --- a/src/common/x64/emitter.h +++ b/src/common/x64/emitter.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #include <cstddef> | 20 | #include <cstddef> |
| 21 | |||
| 22 | #include "common/assert.h" | 21 | #include "common/assert.h" |
| 23 | #include "common/bit_set.h" | 22 | #include "common/bit_set.h" |
| 24 | #include "common/code_block.h" | 23 | #include "common/code_block.h" |