Index: src/arm/code-stubs-arm.cc |
=================================================================== |
--- src/arm/code-stubs-arm.cc (revision 10404) |
+++ src/arm/code-stubs-arm.cc (working copy) |
@@ -156,13 +156,13 @@ |
// Load the function from the stack. |
__ ldr(r3, MemOperand(sp, 0)); |
- // Setup the object header. |
+ // Set up the object header. |
__ LoadRoot(r2, Heap::kFunctionContextMapRootIndex); |
__ str(r2, FieldMemOperand(r0, HeapObject::kMapOffset)); |
__ mov(r2, Operand(Smi::FromInt(length))); |
__ str(r2, FieldMemOperand(r0, FixedArray::kLengthOffset)); |
- // Setup the fixed slots. |
+ // Set up the fixed slots. |
__ mov(r1, Operand(Smi::FromInt(0))); |
__ str(r3, MemOperand(r0, Context::SlotOffset(Context::CLOSURE_INDEX))); |
__ str(cp, MemOperand(r0, Context::SlotOffset(Context::PREVIOUS_INDEX))); |
@@ -207,7 +207,7 @@ |
// Load the serialized scope info from the stack. |
__ ldr(r1, MemOperand(sp, 1 * kPointerSize)); |
- // Setup the object header. |
+ // Set up the object header. |
__ LoadRoot(r2, Heap::kBlockContextMapRootIndex); |
__ str(r2, FieldMemOperand(r0, HeapObject::kMapOffset)); |
__ mov(r2, Operand(Smi::FromInt(length))); |
@@ -229,7 +229,7 @@ |
__ ldr(r3, ContextOperand(r3, Context::CLOSURE_INDEX)); |
__ bind(&after_sentinel); |
- // Setup the fixed slots. |
+ // Set up the fixed slots. |
__ str(r3, ContextOperand(r0, Context::CLOSURE_INDEX)); |
__ str(cp, ContextOperand(r0, Context::PREVIOUS_INDEX)); |
__ str(r1, ContextOperand(r0, Context::EXTENSION_INDEX)); |
@@ -717,7 +717,7 @@ |
// Get the absolute value of the object (as an unsigned integer). |
__ rsb(int_scratch, int_scratch, Operand::Zero(), SetCC, mi); |
- // Get mantisssa[51:20]. |
+ // Get mantissa[51:20]. |
// Get the position of the first set bit. |
__ CountLeadingZeros(dst1, int_scratch, scratch2); |
@@ -951,7 +951,7 @@ |
// non zero bits left. So we need the (30 - exponent) last bits of the |
// 31 higher bits of the mantissa to be null. |
// Because bits [21:0] are null, we can check instead that the |
- // (32 - exponent) last bits of the 32 higher bits of the mantisssa are null. |
+ // (32 - exponent) last bits of the 32 higher bits of the mantissa are null. |
// Get the 32 higher bits of the mantissa in dst. |
__ Ubfx(dst, |
@@ -3842,7 +3842,7 @@ |
FrameScope scope(masm, StackFrame::MANUAL); |
__ EnterExitFrame(save_doubles_); |
- // Setup argc and the builtin function in callee-saved registers. |
+ // Set up argc and the builtin function in callee-saved registers. |
__ mov(r4, Operand(r0)); |
__ mov(r5, Operand(r1)); |
@@ -3919,7 +3919,7 @@ |
// r2: receiver |
// r3: argc |
- // Setup argv in r4. |
+ // Set up argv in r4. |
int offset_to_argv = (kNumCalleeSaved + 1) * kPointerSize; |
if (CpuFeatures::IsSupported(VFP3)) { |
offset_to_argv += kNumDoubleCalleeSaved * kDoubleSize; |
@@ -3942,7 +3942,7 @@ |
__ ldr(r5, MemOperand(r5)); |
__ Push(r8, r7, r6, r5); |
- // Setup frame pointer for the frame to be pushed. |
+ // Set up frame pointer for the frame to be pushed. |
__ add(fp, sp, Operand(-EntryFrameConstants::kCallerFPOffset)); |
// If this is the outermost JS call, set js_entry_sp value. |
@@ -4081,7 +4081,7 @@ |
const Register inline_site = r9; |
const Register scratch = r2; |
- const int32_t kDeltaToLoadBoolResult = 3 * kPointerSize; |
+ const int32_t kDeltaToLoadBoolResult = 4 * kPointerSize; |
Label slow, loop, is_instance, is_not_instance, not_js_object; |
@@ -4132,7 +4132,8 @@ |
__ sub(inline_site, lr, scratch); |
// Get the map location in scratch and patch it. |
__ GetRelocatedValueLocation(inline_site, scratch); |
- __ str(map, MemOperand(scratch)); |
+ __ ldr(scratch, MemOperand(scratch)); |
+ __ str(map, FieldMemOperand(scratch, JSGlobalPropertyCell::kValueOffset)); |
} |
// Register mapping: r3 is object map and r4 is function prototype. |
@@ -4401,7 +4402,7 @@ |
__ str(r3, FieldMemOperand(r0, i)); |
} |
- // Setup the callee in-object property. |
+ // Set up the callee in-object property. |
STATIC_ASSERT(Heap::kArgumentsCalleeIndex == 1); |
__ ldr(r3, MemOperand(sp, 2 * kPointerSize)); |
const int kCalleeOffset = JSObject::kHeaderSize + |
@@ -4414,7 +4415,7 @@ |
Heap::kArgumentsLengthIndex * kPointerSize; |
__ str(r2, FieldMemOperand(r0, kLengthOffset)); |
- // Setup the elements pointer in the allocated arguments object. |
+ // Set up the elements pointer in the allocated arguments object. |
// If we allocated a parameter map, r4 will point there, otherwise |
// it will point to the backing store. |
__ add(r4, r0, Operand(Heap::kArgumentsObjectSize)); |
@@ -4509,7 +4510,7 @@ |
__ Ret(); |
// Do the runtime call to allocate the arguments object. |
- // r2 = argument count (taggged) |
+ // r2 = argument count (tagged) |
__ bind(&runtime); |
__ str(r2, MemOperand(sp, 0 * kPointerSize)); // Patch argument count. |
__ TailCallRuntime(Runtime::kNewArgumentsFast, 3, 1); |
@@ -4582,7 +4583,7 @@ |
// Get the parameters pointer from the stack. |
__ ldr(r2, MemOperand(sp, 1 * kPointerSize)); |
- // Setup the elements pointer in the allocated arguments object and |
+ // Set up the elements pointer in the allocated arguments object and |
// initialize the header in the elements fixed array. |
__ add(r4, r0, Operand(Heap::kArgumentsObjectSizeStrict)); |
__ str(r4, FieldMemOperand(r0, JSObject::kElementsOffset)); |
@@ -4594,7 +4595,7 @@ |
// Copy the fixed array slots. |
Label loop; |
- // Setup r4 to point to the first array slot. |
+ // Set up r4 to point to the first array slot. |
__ add(r4, r4, Operand(FixedArray::kHeaderSize - kHeapObjectTag)); |
__ bind(&loop); |
// Pre-decrement r2 with kPointerSize on each iteration. |
@@ -5209,7 +5210,7 @@ |
// of the original receiver from the call site). |
__ bind(&non_function); |
__ str(r1, MemOperand(sp, argc_ * kPointerSize)); |
- __ mov(r0, Operand(argc_)); // Setup the number of arguments. |
+ __ mov(r0, Operand(argc_)); // Set up the number of arguments. |
__ mov(r2, Operand(0, RelocInfo::NONE)); |
__ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION); |
__ SetCallKind(r5, CALL_AS_METHOD); |
@@ -5730,7 +5731,7 @@ |
Register hash, |
Register character) { |
// hash = character + (character << 10); |
- __ LoadRoot(hash, Heap::kStringHashSeedRootIndex); |
+ __ LoadRoot(hash, Heap::kHashSeedRootIndex); |
// Untag smi seed and add the character. |
__ add(hash, character, Operand(hash, LSR, kSmiTagSize)); |
// hash += hash << 10; |
@@ -5759,13 +5760,12 @@ |
// hash ^= hash >> 11; |
__ eor(hash, hash, Operand(hash, LSR, 11)); |
// hash += hash << 15; |
- __ add(hash, hash, Operand(hash, LSL, 15), SetCC); |
+ __ add(hash, hash, Operand(hash, LSL, 15)); |
- uint32_t kHashShiftCutOffMask = (1 << (32 - String::kHashShift)) - 1; |
- __ and_(hash, hash, Operand(kHashShiftCutOffMask)); |
+ __ and_(hash, hash, Operand(String::kHashBitMask), SetCC); |
// if (hash == 0) hash = 27; |
- __ mov(hash, Operand(27), LeaveCC, eq); |
+ __ mov(hash, Operand(StringHasher::kZeroHash), LeaveCC, eq); |
} |