Index: src/x64/deoptimizer-x64.cc |
diff --git a/src/x64/deoptimizer-x64.cc b/src/x64/deoptimizer-x64.cc |
index ff9beba586ccaa79cf42b962d7f6a4eede878e97..1094dabf8e83ed07d0c27e45d824d0a07e7b920b 100644 |
--- a/src/x64/deoptimizer-x64.cc |
+++ b/src/x64/deoptimizer-x64.cc |
@@ -165,11 +165,11 @@ void Deoptimizer::EntryGenerator::Generate() { |
Register arg5 = r11; |
// Get the bailout id from the stack. |
- __ movq(arg_reg_3, Operand(rsp, kSavedRegistersAreaSize)); |
+ __ movp(arg_reg_3, Operand(rsp, kSavedRegistersAreaSize)); |
// Get the address of the location in the code object |
// and compute the fp-to-sp delta in register arg5. |
- __ movq(arg_reg_4, Operand(rsp, kSavedRegistersAreaSize + 1 * kRegisterSize)); |
+ __ movp(arg_reg_4, Operand(rsp, kSavedRegistersAreaSize + 1 * kRegisterSize)); |
__ lea(arg5, Operand(rsp, kSavedRegistersAreaSize + 1 * kRegisterSize + |
kPCOnStackSize)); |
@@ -178,19 +178,19 @@ void Deoptimizer::EntryGenerator::Generate() { |
// Allocate a new deoptimizer object. |
__ PrepareCallCFunction(6); |
- __ movq(rax, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
- __ movq(arg_reg_1, rax); |
+ __ movp(rax, Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); |
+ __ movp(arg_reg_1, rax); |
__ Set(arg_reg_2, type()); |
// Args 3 and 4 are already in the right registers. |
// On windows put the arguments on the stack (PrepareCallCFunction |
// has created space for this). On linux pass the arguments in r8 and r9. |
#ifdef _WIN64 |
- __ movq(Operand(rsp, 4 * kPointerSize), arg5); |
+ __ movp(Operand(rsp, 4 * kPointerSize), arg5); |
__ LoadAddress(arg5, ExternalReference::isolate_address(isolate())); |
- __ movq(Operand(rsp, 5 * kPointerSize), arg5); |
+ __ movp(Operand(rsp, 5 * kPointerSize), arg5); |
#else |
- __ movq(r8, arg5); |
+ __ movp(r8, arg5); |
__ LoadAddress(r9, ExternalReference::isolate_address(isolate())); |
#endif |
@@ -199,7 +199,7 @@ void Deoptimizer::EntryGenerator::Generate() { |
} |
// Preserve deoptimizer object in register rax and get the input |
// frame descriptor pointer. |
- __ movq(rbx, Operand(rax, Deoptimizer::input_offset())); |
+ __ movp(rbx, Operand(rax, Deoptimizer::input_offset())); |
// Fill in the input registers. |
for (int i = kNumberOfRegisters -1; i >= 0; i--) { |
@@ -219,7 +219,7 @@ void Deoptimizer::EntryGenerator::Generate() { |
// Compute a pointer to the unwinding limit in register rcx; that is |
// the first stack slot not part of the input frame. |
- __ movq(rcx, Operand(rbx, FrameDescription::frame_size_offset())); |
+ __ movp(rcx, Operand(rbx, FrameDescription::frame_size_offset())); |
__ addq(rcx, rsp); |
// Unwind the stack down to - but not including - the unwinding |
@@ -239,7 +239,7 @@ void Deoptimizer::EntryGenerator::Generate() { |
// Compute the output frame in the deoptimizer. |
__ push(rax); |
__ PrepareCallCFunction(2); |
- __ movq(arg_reg_1, rax); |
+ __ movp(arg_reg_1, rax); |
__ LoadAddress(arg_reg_2, ExternalReference::isolate_address(isolate())); |
{ |
AllowExternalCallThatCantCauseGC scope(masm()); |
@@ -254,13 +254,13 @@ void Deoptimizer::EntryGenerator::Generate() { |
// Outer loop state: rax = current FrameDescription**, rdx = one past the |
// last FrameDescription**. |
__ movl(rdx, Operand(rax, Deoptimizer::output_count_offset())); |
- __ movq(rax, Operand(rax, Deoptimizer::output_offset())); |
+ __ movp(rax, Operand(rax, Deoptimizer::output_offset())); |
__ lea(rdx, Operand(rax, rdx, times_pointer_size, 0)); |
__ jmp(&outer_loop_header); |
__ bind(&outer_push_loop); |
// Inner loop state: rbx = current FrameDescription*, rcx = loop index. |
- __ movq(rbx, Operand(rax, 0)); |
- __ movq(rcx, Operand(rbx, FrameDescription::frame_size_offset())); |
+ __ movp(rbx, Operand(rax, 0)); |
+ __ movp(rcx, Operand(rbx, FrameDescription::frame_size_offset())); |
__ jmp(&inner_loop_header); |
__ bind(&inner_push_loop); |
__ subq(rcx, Immediate(sizeof(intptr_t))); |