diff options
| author | 2016-09-20 23:52:38 -0700 | |
|---|---|---|
| committer | 2016-09-21 00:15:56 -0700 | |
| commit | 84fbbe26297652d994d203bde543ec252c2d801a (patch) | |
| tree | 5f6fcc088dab9d53ee30e64b47fce2e04c8fb13c /src/common/x64/emitter.cpp | |
| parent | Remove empty newlines in #include blocks. (diff) | |
| download | yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.gz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.xz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.zip | |
Use negative priorities to avoid special-casing the self-include
Diffstat (limited to 'src/common/x64/emitter.cpp')
| -rw-r--r-- | src/common/x64/emitter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp index b69e4bd5e..f5930abec 100644 --- a/src/common/x64/emitter.cpp +++ b/src/common/x64/emitter.cpp | |||
| @@ -15,7 +15,6 @@ | |||
| 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" | ||
| 19 | #include <cinttypes> | 18 | #include <cinttypes> |
| 20 | #include <cstring> | 19 | #include <cstring> |
| 21 | #include "abi.h" | 20 | #include "abi.h" |
| @@ -23,6 +22,7 @@ | |||
| 23 | #include "common/logging/log.h" | 22 | #include "common/logging/log.h" |
| 24 | #include "common/memory_util.h" | 23 | #include "common/memory_util.h" |
| 25 | #include "cpu_detect.h" | 24 | #include "cpu_detect.h" |
| 25 | #include "emitter.h" | ||
| 26 | 26 | ||
| 27 | namespace Gen { | 27 | namespace Gen { |
| 28 | 28 | ||
| @@ -220,7 +220,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp | |||
| 220 | void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg, | 220 | void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg, |
| 221 | bool warn_64bit_offset) const { | 221 | bool warn_64bit_offset) const { |
| 222 | if (_operandReg == INVALID_REG) | 222 | if (_operandReg == INVALID_REG) |
| 223 | _operandReg = (X64Reg) this->operandReg; | 223 | _operandReg = (X64Reg)this->operandReg; |
| 224 | int mod = 0; | 224 | int mod = 0; |
| 225 | int ireg = indexReg; | 225 | int ireg = indexReg; |
| 226 | bool SIB = false; | 226 | bool SIB = false; |