summaryrefslogtreecommitdiff
path: root/src/common/x64
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-09-18 18:01:46 -0700
committerGravatar Yuri Kunde Schlesner2016-09-18 21:14:25 -0700
commit396a8d91a4423d9c793eeff0798d544613647511 (patch)
treee0203961233db1ffcbbca2e15154d71d142c5822 /src/common/x64
parentTweak formatting settings (diff)
downloadyuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.gz
yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.xz
yuzu-396a8d91a4423d9c793eeff0798d544613647511.zip
Manually tweak source formatting and then re-run clang-format
Diffstat (limited to 'src/common/x64')
-rw-r--r--src/common/x64/emitter.cpp2
-rw-r--r--src/common/x64/emitter.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp
index 1a9fd6a6b..7cf350b4a 100644
--- a/src/common/x64/emitter.cpp
+++ b/src/common/x64/emitter.cpp
@@ -222,7 +222,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp
222void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg, 222void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
223 bool warn_64bit_offset) const { 223 bool warn_64bit_offset) const {
224 if (_operandReg == INVALID_REG) 224 if (_operandReg == INVALID_REG)
225 _operandReg = (X64Reg) this->operandReg; 225 _operandReg = (X64Reg)this->operandReg;
226 int mod = 0; 226 int mod = 0;
227 int ireg = indexReg; 227 int ireg = indexReg;
228 bool SIB = false; 228 bool SIB = false;
diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h
index 467f7812f..6c9dc3d6b 100644
--- a/src/common/x64/emitter.h
+++ b/src/common/x64/emitter.h
@@ -233,8 +233,7 @@ struct OpArg {
233 constexpr OpArg() = default; // dummy op arg, used for storage 233 constexpr OpArg() = default; // dummy op arg, used for storage
234 constexpr OpArg(u64 offset_, int scale_, X64Reg rmReg = RAX, X64Reg scaledReg = RAX) 234 constexpr OpArg(u64 offset_, int scale_, X64Reg rmReg = RAX, X64Reg scaledReg = RAX)
235 : scale(static_cast<u8>(scale_)), offsetOrBaseReg(static_cast<u16>(rmReg)), 235 : scale(static_cast<u8>(scale_)), offsetOrBaseReg(static_cast<u16>(rmReg)),
236 indexReg(static_cast<u16>(scaledReg)), offset(offset_) { 236 indexReg(static_cast<u16>(scaledReg)), offset(offset_) {}
237 }
238 237
239 constexpr bool operator==(const OpArg& b) const { 238 constexpr bool operator==(const OpArg& b) const {
240 return operandReg == b.operandReg && scale == b.scale && 239 return operandReg == b.operandReg && scale == b.scale &&
@@ -454,8 +453,7 @@ public:
454 code = code_ptr; 453 code = code_ptr;
455 flags_locked = false; 454 flags_locked = false;
456 } 455 }
457 virtual ~XEmitter() { 456 virtual ~XEmitter() {}
458 }
459 457
460 void WriteModRM(int mod, int rm, int reg); 458 void WriteModRM(int mod, int rm, int reg);
461 void WriteSIB(int scale, int index, int base); 459 void WriteSIB(int scale, int index, int base);