[Isolates] Merge 6500:6700 from bleeding_edge to isolates.

src/arm/codegen-arm.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1091 matching lines @@
 
   Register heap_number_map = r7;
   __ LoadRoot(heap_number_map, Heap::kHeapNumberMapRootIndex);
   __ ldr(r3, FieldMemOperand(tos_register_, HeapNumber::kMapOffset));
   __ cmp(r3, heap_number_map);
   // Not a number, fall back to the GenericBinaryOpStub.
   __ b(ne, entry_label());
 
   Register int32 = r2;
   // Not a 32bits signed int, fall back to the GenericBinaryOpStub.
-  __ ConvertToInt32(tos_register_, int32, r4, r5, entry_label());
+  __ ConvertToInt32(tos_register_, int32, r4, r5, d0, entry_label());
 
   // tos_register_ (r0 or r1): Original heap number.
   // int32: signed 32bits int.
 
   Label result_not_a_smi;
   int shift_value = value_ & 0x1f;
   switch (op_) {
     case Token::BIT_OR:  __ orr(int32, int32, Operand(value_)); break;
     case Token::BIT_XOR: __ eor(int32, int32, Operand(value_)); break;
     case Token::BIT_AND: __ and_(int32, int32, Operand(value_)); break;
@@ skipping 1062 matching lines @@
     frame_->Exit();
 
     // Here we use masm_-> instead of the __ macro to avoid the code coverage
     // tool from instrumenting as we rely on the code size here.
     int32_t sp_delta = (scope()->num_parameters() + 1) * kPointerSize;
     masm_->add(sp, sp, Operand(sp_delta));
     masm_->Jump(lr);
     DeleteFrame();
 
 #ifdef DEBUG
-    // Check that the size of the code used for returning matches what is
-    // expected by the debugger. If the sp_delts above cannot be encoded in
-    // the add instruction the add will generate two instructions.
-    int return_sequence_length =
-        masm_->InstructionsGeneratedSince(&check_exit_codesize);
-    CHECK(return_sequence_length ==
-          Assembler::kJSReturnSequenceInstructions ||
-          return_sequence_length ==
-          Assembler::kJSReturnSequenceInstructions + 1);
+    // Check that the size of the code used for returning is large enough
+    // for the debugger's requirements.
+    ASSERT(Assembler::kJSReturnSequenceInstructions <=
+           masm_->InstructionsGeneratedSince(&check_exit_codesize));
 #endif
   }
 }
 
 
 void CodeGenerator::VisitWithEnterStatement(WithEnterStatement* node) {
 #ifdef DEBUG
   int original_height = frame_->height();
 #endif
   Comment cmnt(masm_, "[ WithEnterStatement");
@@ skipping 1957 matching lines @@
       frame_->EmitPush(r0);
       if (arg_count > 0) {
         __ ldr(r1, MemOperand(sp, arg_count * kPointerSize));
         frame_->EmitPush(r1);
       } else {
         frame_->EmitPush(r2);
       }
       __ ldr(r1, frame_->Receiver());
       frame_->EmitPush(r1);
 
-      frame_->CallRuntime(Runtime::kResolvePossiblyDirectEvalNoLookup, 3);
+      // Push the strict mode flag.
+      frame_->EmitPush(Operand(Smi::FromInt(strict_mode_flag())));
+
+      frame_->CallRuntime(Runtime::kResolvePossiblyDirectEvalNoLookup, 4);
 
       done.Jump();
       slow.Bind();
     }
 
     // Prepare the stack for the call to ResolvePossiblyDirectEval by
     // pushing the loaded function, the first argument to the eval
     // call and the receiver.
     __ ldr(r1, MemOperand(sp, arg_count * kPointerSize + kPointerSize));
     frame_->EmitPush(r1);
     if (arg_count > 0) {
       __ ldr(r1, MemOperand(sp, arg_count * kPointerSize));
       frame_->EmitPush(r1);
     } else {
       frame_->EmitPush(r2);
     }
     __ ldr(r1, frame_->Receiver());
     frame_->EmitPush(r1);
 
+    // Push the strict mode flag.
+    frame_->EmitPush(Operand(Smi::FromInt(strict_mode_flag())));
+
     // Resolve the call.
-    frame_->CallRuntime(Runtime::kResolvePossiblyDirectEval, 3);
+    frame_->CallRuntime(Runtime::kResolvePossiblyDirectEval, 4);
 
     // If we generated fast-case code bind the jump-target where fast
     // and slow case merge.
     if (done.is_linked()) done.Bind();
 
     // Touch up stack with the right values for the function and the receiver.
     __ str(r0, MemOperand(sp, (arg_count + 1) * kPointerSize));
     __ str(r1, MemOperand(sp, arg_count * kPointerSize));
 
     // Call the function.
@@ skipping 482 matching lines @@
     // Compare exponent with -0.5.
     __ cmp(scratch1, Operand(0xbfe00000));
     __ b(ne, &not_minus_half);
 
     // Get the double value from the base into vfp register d0.
     __ ObjectToDoubleVFPRegister(base, d0,
                                  scratch1, scratch2, heap_number_map, s0,
                                  runtime.entry_label(),
                                  AVOID_NANS_AND_INFINITIES);
 
+    // Convert -0 into +0 by adding +0.
+    __ vmov(d2, 0.0);
+    __ vadd(d0, d2, d0);
     // Load 1.0 into d2.
     __ vmov(d2, 1.0);
 
-    // Calculate the reciprocal of the square root. 1/sqrt(x) = sqrt(1/x).
+    // Calculate the reciprocal of the square root.
+    __ vsqrt(d0, d0);
     __ vdiv(d0, d2, d0);
-    __ vsqrt(d0, d0);
 
     __ b(&allocate_return);
 
     __ bind(&not_minus_half);
     // Compare exponent with 0.5.
     __ cmp(scratch1, Operand(0x3fe00000));
     runtime.Branch(ne);
 
       // Get the double value from the base into vfp register d0.
     __ ObjectToDoubleVFPRegister(base, d0,
                                  scratch1, scratch2, heap_number_map, s0,
                                  runtime.entry_label(),
                                  AVOID_NANS_AND_INFINITIES);
+    // Convert -0 into +0 by adding +0.
+    __ vmov(d2, 0.0);
+    __ vadd(d0, d2, d0);
     __ vsqrt(d0, d0);
 
     __ bind(&allocate_return);
     Register scratch3 = r5;
     __ AllocateHeapNumberWithValue(scratch3, d0, scratch1, scratch2,
                                    heap_number_map, runtime.entry_label());
     __ mov(base, scratch3);
     done.Jump();
 
     runtime.Bind();
@@ skipping 2639 matching lines @@
                specialized_on_rhs_ ? "_ConstantRhs" : "",
                BinaryOpIC::GetName(runtime_operands_type_));
   return name_;
 }
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM