Index: src/x64/macro-assembler-x64.h |
diff --git a/src/x64/macro-assembler-x64.h b/src/x64/macro-assembler-x64.h |
index fe709c97f46382f22de7a4e6e5360c68388e3f2e..6c9c19f58e5f3d678fa40ba9765577ec0282ebc6 100644 |
--- a/src/x64/macro-assembler-x64.h |
+++ b/src/x64/macro-assembler-x64.h |
@@ -336,7 +336,7 @@ class MacroAssembler: public Assembler { |
ExternalReference roots_array_start = |
ExternalReference::roots_array_start(isolate()); |
Move(kRootRegister, roots_array_start); |
- addq(kRootRegister, Immediate(kRootRegisterBias)); |
+ addp(kRootRegister, Immediate(kRootRegisterBias)); |
} |
// --------------------------------------------------------------------------- |
@@ -846,7 +846,7 @@ class MacroAssembler: public Assembler { |
void PushReturnAddressFrom(Register src) { pushq(src); } |
void PopReturnAddressTo(Register dst) { popq(dst); } |
void Move(Register dst, ExternalReference ext) { |
- movp(dst, reinterpret_cast<Address>(ext.address()), |
+ movp(dst, reinterpret_cast<void*>(ext.address()), |
RelocInfo::EXTERNAL_REFERENCE); |
} |
@@ -863,7 +863,7 @@ class MacroAssembler: public Assembler { |
ASSERT(!RelocInfo::IsNone(rmode)); |
ASSERT(value->IsHeapObject()); |
ASSERT(!isolate()->heap()->InNewSpace(*value)); |
- movp(dst, value.location(), rmode); |
+ movp(dst, reinterpret_cast<void*>(value.location()), rmode); |
} |
// Control Flow |