Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 29cf434285fa61dbfa742adef9f2e6c264e9901e..2a677be525855425b814bb88c8add2440b2ba363 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -789,7 +789,6 @@ void MacroAssembler::VFPCompareAndLoadFlags(const DwVfpRegister src1, |
void MacroAssembler::Vmov(const DwVfpRegister dst, |
const double imm, |
- const Register scratch, |
const Condition cond) { |
ASSERT(CpuFeatures::IsEnabled(VFP2)); |
static const DoubleRepresentation minus_zero(-0.0); |
@@ -801,7 +800,7 @@ void MacroAssembler::Vmov(const DwVfpRegister dst, |
} else if (value.bits == minus_zero.bits) { |
vneg(dst, kDoubleRegZero, cond); |
} else { |
- vmov(dst, imm, scratch, cond); |
+ vmov(dst, imm, cond); |
} |
} |
@@ -1988,7 +1987,7 @@ void MacroAssembler::StoreNumberToDoubleElements(Register value_reg, |
destination = FloatingPointHelper::kCoreRegisters; |
} |
- Register untagged_value = elements_reg; |
+ Register untagged_value = receiver_reg; |
SmiUntag(untagged_value, value_reg); |
FloatingPointHelper::ConvertIntToDouble(this, |
untagged_value, |
@@ -3677,7 +3676,7 @@ void MacroAssembler::ClampDoubleToUint8(Register result_reg, |
// Double value is >= 255, return 255. |
bind(&above_zero); |
- Vmov(temp_double_reg, 255.0, result_reg); |
+ Vmov(temp_double_reg, 255.0); |
VFPCompareAndSetFlags(input_reg, temp_double_reg); |
b(le, &in_bounds); |
mov(result_reg, Operand(255)); |
@@ -3704,37 +3703,20 @@ void MacroAssembler::LoadInstanceDescriptors(Register map, |
Register temp = descriptors; |
ldr(temp, FieldMemOperand(map, Map::kTransitionsOrBackPointerOffset)); |
- Label ok, fail, load_from_back_pointer; |
+ Label ok, fail; |
CheckMap(temp, |
scratch, |
isolate()->factory()->fixed_array_map(), |
&fail, |
DONT_DO_SMI_CHECK); |
- ldr(temp, FieldMemOperand(temp, TransitionArray::kDescriptorsPointerOffset)); |
- ldr(descriptors, FieldMemOperand(temp, JSGlobalPropertyCell::kValueOffset)); |
+ ldr(descriptors, FieldMemOperand(temp, TransitionArray::kDescriptorsOffset)); |
jmp(&ok); |
- |
bind(&fail); |
- CompareRoot(temp, Heap::kUndefinedValueRootIndex); |
- b(ne, &load_from_back_pointer); |
mov(descriptors, Operand(FACTORY->empty_descriptor_array())); |
- jmp(&ok); |
- |
- bind(&load_from_back_pointer); |
- ldr(temp, FieldMemOperand(temp, Map::kTransitionsOrBackPointerOffset)); |
- ldr(temp, FieldMemOperand(temp, TransitionArray::kDescriptorsPointerOffset)); |
- ldr(descriptors, FieldMemOperand(temp, JSGlobalPropertyCell::kValueOffset)); |
- |
bind(&ok); |
} |
-void MacroAssembler::NumberOfOwnDescriptors(Register dst, Register map) { |
- ldr(dst, FieldMemOperand(map, Map::kBitField3Offset)); |
- DecodeField<Map::NumberOfOwnDescriptorsBits>(dst); |
-} |
- |
- |
void MacroAssembler::EnumLength(Register dst, Register map) { |
STATIC_ASSERT(Map::EnumLengthBits::kShift == 0); |
ldr(dst, FieldMemOperand(map, Map::kBitField3Offset)); |