diff options
Diffstat (limited to 'compiler/utils/x86')
-rw-r--r-- | compiler/utils/x86/assembler_x86.cc | 8 | ||||
-rw-r--r-- | compiler/utils/x86/assembler_x86.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/compiler/utils/x86/assembler_x86.cc b/compiler/utils/x86/assembler_x86.cc index 3ff24b7..4ddf979 100644 --- a/compiler/utils/x86/assembler_x86.cc +++ b/compiler/utils/x86/assembler_x86.cc @@ -1291,7 +1291,7 @@ void X86Assembler::LoadDoubleConstant(XmmRegister dst, double value) { pushl(Immediate(High32Bits(constant))); pushl(Immediate(Low32Bits(constant))); movsd(dst, Address(ESP, 0)); - addl(ESP, Immediate(2 * kWordSize)); + addl(ESP, Immediate(2 * sizeof(intptr_t))); } @@ -1303,7 +1303,7 @@ void X86Assembler::FloatNegate(XmmRegister f) { uint32_t d; } float_negate_constant __attribute__((aligned(16))) = { 0x80000000, 0x00000000, 0x80000000, 0x00000000 }; - xorps(f, Address::Absolute(reinterpret_cast<uword>(&float_negate_constant))); + xorps(f, Address::Absolute(reinterpret_cast<uintptr_t>(&float_negate_constant))); } @@ -1313,7 +1313,7 @@ void X86Assembler::DoubleNegate(XmmRegister d) { uint64_t b; } double_negate_constant __attribute__((aligned(16))) = {0x8000000000000000LL, 0x8000000000000000LL}; - xorpd(d, Address::Absolute(reinterpret_cast<uword>(&double_negate_constant))); + xorpd(d, Address::Absolute(reinterpret_cast<uintptr_t>(&double_negate_constant))); } @@ -1323,7 +1323,7 @@ void X86Assembler::DoubleAbs(XmmRegister reg) { uint64_t b; } double_abs_constant __attribute__((aligned(16))) = {0x7FFFFFFFFFFFFFFFLL, 0x7FFFFFFFFFFFFFFFLL}; - andpd(reg, Address::Absolute(reinterpret_cast<uword>(&double_abs_constant))); + andpd(reg, Address::Absolute(reinterpret_cast<uintptr_t>(&double_abs_constant))); } diff --git a/compiler/utils/x86/assembler_x86.h b/compiler/utils/x86/assembler_x86.h index 1f6f7e6..c7eada3 100644 --- a/compiler/utils/x86/assembler_x86.h +++ b/compiler/utils/x86/assembler_x86.h @@ -116,8 +116,8 @@ class Operand { } private: - byte length_; - byte encoding_[6]; + uint8_t length_; + uint8_t encoding_[6]; explicit Operand(Register reg) { SetModRM(3, reg); } @@ -192,7 +192,7 @@ class Address : public Operand { } } - static Address Absolute(uword addr) { + static Address Absolute(uintptr_t addr) { Address result; result.SetModRM(0, EBP); result.SetDisp32(addr); |