ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x64Emitter: Clean up constructors for OpArg 

Default initializes members and moves initial assignments into the
initializer list.
This commit is contained in:
Lioncash 2018-03-25 15:52:01 -04:00
parent 2861e8f868
commit 7f583b66cb
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Common/x64Emitter.h
View File

@ -110,15 +110,12 @@ struct OpArg
// This also allows us to keep the op writing functions private. // This also allows us to keep the op writing functions private.
friend class XEmitter; friend class XEmitter;
OpArg() {} // dummy op arg, used for storage // dummy op arg, used for storage
OpArg(u64 _offset, int _scale, X64Reg rmReg = RAX, X64Reg scaledReg = RAX) constexpr OpArg() = default;
constexpr OpArg(u64 offset_, int scale_, X64Reg rm_reg = RAX, X64Reg scaled_reg = RAX)
: scale{static_cast<u8>(scale_)}, offsetOrBaseReg{static_cast<u16>(rm_reg)},
indexReg{static_cast<u16>(scaled_reg)}, offset{offset_}
{ {
operandReg = 0;
scale = (u8)_scale;
offsetOrBaseReg = (u16)rmReg;
indexReg = (u16)scaledReg;
// if scale == 0 never mind offsetting
offset = _offset;
} }
bool operator==(const OpArg& b) const bool operator==(const OpArg& b) const
{ {
@ -237,11 +234,11 @@ private:
void WriteSingleByteOp(XEmitter* emit, u8 op, X64Reg operandReg, int bits); void WriteSingleByteOp(XEmitter* emit, u8 op, X64Reg operandReg, int bits);
void WriteNormalOp(XEmitter* emit, bool toRM, NormalOp op, const OpArg& operand, int bits) const; void WriteNormalOp(XEmitter* emit, bool toRM, NormalOp op, const OpArg& operand, int bits) const;
u8 scale; u8 scale = 0;
u16 offsetOrBaseReg; u16 offsetOrBaseReg = 0;
u16 indexReg; u16 indexReg = 0;
u64 offset; // Also used to store immediates. u64 offset = 0; // Also used to store immediates.
u16 operandReg; u16 operandReg = 0;
}; };
template <typename T> template <typename T>