diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 08:52:38 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 09:15:56 +0200 |
commit | 84fbbe26297652d994d203bde543ec252c2d801a (patch) | |
tree | 5f6fcc088dab9d53ee30e64b47fce2e04c8fb13c /src/common/x64 | |
parent | Remove empty newlines in #include blocks. (diff) | |
download | yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.gz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.bz2 yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.lz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.xz yuzu-84fbbe26297652d994d203bde543ec252c2d801a.tar.zst yuzu-84fbbe26297652d994d203bde543ec252c2d801a.zip |
Diffstat (limited to 'src/common/x64')
-rw-r--r-- | src/common/x64/cpu_detect.cpp | 2 | ||||
-rw-r--r-- | src/common/x64/emitter.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp index ac37c42bc..6ddf9b70c 100644 --- a/src/common/x64/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "cpu_detect.h" #include <cstring> #include <string> #include <thread> #include "common/common_types.h" +#include "cpu_detect.h" namespace Common { 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 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "emitter.h" #include <cinttypes> #include <cstring> #include "abi.h" @@ -23,6 +22,7 @@ #include "common/logging/log.h" #include "common/memory_util.h" #include "cpu_detect.h" +#include "emitter.h" namespace Gen { @@ -220,7 +220,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg, bool warn_64bit_offset) const { if (_operandReg == INVALID_REG) - _operandReg = (X64Reg) this->operandReg; + _operandReg = (X64Reg)this->operandReg; int mod = 0; int ireg = indexReg; bool SIB = false; |