| Index: runtime/vm/assembler_x64.h
|
| diff --git a/runtime/vm/assembler_x64.h b/runtime/vm/assembler_x64.h
|
| index ad19e6dc6991a97b5120426a658c058419396e27..01ce51aa152a8e1474313bd41bbe407ab961e487 100644
|
| --- a/runtime/vm/assembler_x64.h
|
| +++ b/runtime/vm/assembler_x64.h
|
| @@ -42,7 +42,6 @@ class Immediate : public ValueObject {
|
| // And remove the unnecessary copy constructor.
|
| };
|
|
|
| -
|
| class Operand : public ValueObject {
|
| public:
|
| uint8_t rex() const { return rex_; }
|
| @@ -158,7 +157,6 @@ class Operand : public ValueObject {
|
| friend class Assembler;
|
| };
|
|
|
| -
|
| class Address : public Operand {
|
| public:
|
| Address(Register base, int32_t disp) {
|
| @@ -252,7 +250,6 @@ class Address : public Operand {
|
| }
|
| };
|
|
|
| -
|
| class FieldAddress : public Address {
|
| public:
|
| FieldAddress(Register base, int32_t disp)
|
| @@ -275,7 +272,6 @@ class FieldAddress : public Address {
|
| }
|
| };
|
|
|
| -
|
| class Label : public ValueObject {
|
| public:
|
| Label() : position_(0), unresolved_(0) {
|
| @@ -344,7 +340,6 @@ class Label : public ValueObject {
|
| DISALLOW_COPY_AND_ASSIGN(Label);
|
| };
|
|
|
| -
|
| class Assembler : public ValueObject {
|
| public:
|
| explicit Assembler(bool use_far_branches = false);
|
| @@ -1078,29 +1073,24 @@ class Assembler : public ValueObject {
|
| DISALLOW_COPY_AND_ASSIGN(Assembler);
|
| };
|
|
|
| -
|
| inline void Assembler::EmitUint8(uint8_t value) {
|
| buffer_.Emit<uint8_t>(value);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitInt32(int32_t value) {
|
| buffer_.Emit<int32_t>(value);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitInt64(int64_t value) {
|
| buffer_.Emit<int64_t>(value);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitRegisterREX(Register reg, uint8_t rex) {
|
| ASSERT(reg != kNoRegister);
|
| rex |= (reg > 7 ? REX_B : REX_NONE);
|
| if (rex != REX_NONE) EmitUint8(REX_PREFIX | rex);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitOperandREX(int rm,
|
| const Operand& operand,
|
| uint8_t rex) {
|
| @@ -1108,7 +1098,6 @@ inline void Assembler::EmitOperandREX(int rm,
|
| if (rex != REX_NONE) EmitUint8(REX_PREFIX | rex);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitREX_RB(XmmRegister reg,
|
| XmmRegister base,
|
| uint8_t rex) {
|
| @@ -1117,7 +1106,6 @@ inline void Assembler::EmitREX_RB(XmmRegister reg,
|
| if (rex != REX_NONE) EmitUint8(REX_PREFIX | rex);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitREX_RB(XmmRegister reg,
|
| const Operand& operand,
|
| uint8_t rex) {
|
| @@ -1126,26 +1114,22 @@ inline void Assembler::EmitREX_RB(XmmRegister reg,
|
| if (rex != REX_NONE) EmitUint8(REX_PREFIX | rex);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitREX_RB(XmmRegister reg, Register base, uint8_t rex) {
|
| if (reg > 7) rex |= REX_R;
|
| if (base > 7) rex |= REX_B;
|
| if (rex != REX_NONE) EmitUint8(REX_PREFIX | rex);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitREX_RB(Register reg, XmmRegister base, uint8_t rex) {
|
| if (reg > 7) rex |= REX_R;
|
| if (base > 7) rex |= REX_B;
|
| if (rex != REX_NONE) EmitUint8(REX_PREFIX | rex);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitFixup(AssemblerFixup* fixup) {
|
| buffer_.EmitFixup(fixup);
|
| }
|
|
|
| -
|
| inline void Assembler::EmitOperandSizeOverride() {
|
| EmitUint8(0x66);
|
| }
|
|
|