Index: src/x64/lithium-codegen-x64.cc |
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc |
index b865cecbd2424b6d74b6413ba7709ac36135b145..bbfa24c46c986d2d39808a15fc6fc5506379b307 100644 |
--- a/src/x64/lithium-codegen-x64.cc |
+++ b/src/x64/lithium-codegen-x64.cc |
@@ -164,7 +164,7 @@ bool LCodeGen::GeneratePrologue() { |
if (slots > 0) { |
if (FLAG_debug_code) { |
__ Set(rax, slots); |
- __ movq(kScratchRegister, kSlotsZapValue, RelocInfo::NONE); |
+ __ movq(kScratchRegister, kSlotsZapValue, RelocInfo::NONE64); |
Label loop; |
__ bind(&loop); |
__ push(kScratchRegister); |
@@ -1133,7 +1133,7 @@ void LCodeGen::DoMathFloorOfDiv(LMathFloorOfDiv* instr) { |
__ neg(reg1); |
DeoptimizeIf(zero, instr->environment()); |
} |
- __ movq(reg2, multiplier, RelocInfo::NONE); |
+ __ movq(reg2, multiplier, RelocInfo::NONE64); |
// Result just fit in r64, because it's int32 * uint32. |
__ imul(reg2, reg1); |
@@ -1579,10 +1579,10 @@ void LCodeGen::DoDateField(LDateField* instr) { |
__ PrepareCallCFunction(2); |
#ifdef _WIN64 |
__ movq(rcx, object); |
- __ movq(rdx, index, RelocInfo::NONE); |
+ __ movq(rdx, index, RelocInfo::NONE64); |
#else |
__ movq(rdi, object); |
- __ movq(rsi, index, RelocInfo::NONE); |
+ __ movq(rsi, index, RelocInfo::NONE64); |
#endif |
__ CallCFunction(ExternalReference::get_date_field_function(isolate()), 2); |
__ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); |
@@ -3438,7 +3438,7 @@ void LCodeGen::DoMathRound(LUnaryMathOperation* instr) { |
Label done; |
// xmm_scratch = 0.5 |
- __ movq(kScratchRegister, V8_INT64_C(0x3FE0000000000000), RelocInfo::NONE); |
+ __ movq(kScratchRegister, V8_INT64_C(0x3FE0000000000000), RelocInfo::NONE64); |
__ movq(xmm_scratch, kScratchRegister); |
Label below_half; |
__ ucomisd(xmm_scratch, input_reg); |
@@ -3467,7 +3467,7 @@ void LCodeGen::DoMathRound(LUnaryMathOperation* instr) { |
// Bailout if below -0.5, otherwise round to (positive) zero, even |
// if negative. |
// xmm_scrach = -0.5 |
- __ movq(kScratchRegister, V8_INT64_C(0xBFE0000000000000), RelocInfo::NONE); |
+ __ movq(kScratchRegister, V8_INT64_C(0xBFE0000000000000), RelocInfo::NONE64); |
ulan
2013/01/03 10:37:10
Long line.
|
__ movq(xmm_scratch, kScratchRegister); |
__ ucomisd(input_reg, xmm_scratch); |
DeoptimizeIf(below, instr->environment()); |
@@ -3496,7 +3496,7 @@ void LCodeGen::DoMathPowHalf(LUnaryMathOperation* instr) { |
Label done, sqrt; |
// Check base for -Infinity. According to IEEE-754, double-precision |
// -Infinity has the highest 12 bits set and the lowest 52 bits cleared. |
- __ movq(kScratchRegister, V8_INT64_C(0xFFF0000000000000), RelocInfo::NONE); |
+ __ movq(kScratchRegister, V8_INT64_C(0xFFF0000000000000), RelocInfo::NONE64); |
__ movq(xmm_scratch, kScratchRegister); |
__ ucomisd(xmm_scratch, input_reg); |
// Comparing -Infinity with NaN results in "unordered", which sets the |
@@ -4592,7 +4592,7 @@ void LCodeGen::DoDoubleToI(LDoubleToI* instr) { |
// Performs a truncating conversion of a floating point number as used by |
// the JS bitwise operations. |
__ cvttsd2siq(result_reg, input_reg); |
- __ movq(kScratchRegister, V8_INT64_C(0x8000000000000000), RelocInfo::NONE); |
+ __ movq(kScratchRegister, V8_INT64_C(0x8000000000000000), RelocInfo::NONE64); |
ulan
2013/01/03 10:37:10
Long line.
|
__ cmpq(result_reg, kScratchRegister); |
DeoptimizeIf(equal, instr->environment()); |
} else { |
@@ -4993,7 +4993,7 @@ void LCodeGen::EmitDeepCopy(Handle<JSObject> object, |
__ LoadHeapObject(rcx, Handle<HeapObject>::cast(value)); |
__ movq(FieldOperand(result, total_offset), rcx); |
} else { |
- __ movq(rcx, value, RelocInfo::NONE); |
+ __ movq(rcx, value, RelocInfo::NONE64); |
__ movq(FieldOperand(result, total_offset), rcx); |
} |
} |
@@ -5015,7 +5015,7 @@ void LCodeGen::EmitDeepCopy(Handle<JSObject> object, |
int64_t value = double_array->get_representation(i); |
int total_offset = |
elements_offset + FixedDoubleArray::OffsetOfElementAt(i); |
- __ movq(rcx, value, RelocInfo::NONE); |
+ __ movq(rcx, value, RelocInfo::NONE64); |
__ movq(FieldOperand(result, total_offset), rcx); |
} |
} else if (elements->IsFixedArray()) { |
@@ -5033,7 +5033,7 @@ void LCodeGen::EmitDeepCopy(Handle<JSObject> object, |
__ LoadHeapObject(rcx, Handle<HeapObject>::cast(value)); |
__ movq(FieldOperand(result, total_offset), rcx); |
} else { |
- __ movq(rcx, value, RelocInfo::NONE); |
+ __ movq(rcx, value, RelocInfo::NONE64); |
__ movq(FieldOperand(result, total_offset), rcx); |
} |
} |