MIPS: Minor fixes to simulator and builtins-mips.

src/mips/builtins-mips.cc

 // Copyright 2011 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 1184 matching lines @@
     // Change context eagerly in case we need the global receiver.
     __ lw(cp, FieldMemOperand(a1, JSFunction::kContextOffset));
 
     // Do not transform the receiver for strict mode functions.
     __ lw(a2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
     __ lw(a3, FieldMemOperand(a2, SharedFunctionInfo::kCompilerHintsOffset));
     __ And(t0, a3, Operand(1 << (SharedFunctionInfo::kStrictModeFunction +
                                  kSmiTagSize)));
     __ Branch(&shift_arguments, ne, t0, Operand(zero_reg));
 
-    // Do not transform the receiver for native (shared already in r2).
-    __ lw(a2, FieldMemOperand(a2, SharedFunctionInfo::kScriptOffset));
-    __ LoadRoot(a3, Heap::kUndefinedValueRootIndex);
-    __ Branch(&shift_arguments, eq, a2, Operand(a3));
-    __ lw(a2, FieldMemOperand(a2, Script::kTypeOffset));
-    __ sra(a2, a2, kSmiTagSize);
-    __ Branch(&shift_arguments, eq, a2, Operand(Script::TYPE_NATIVE));
+    // Do not transform the receiver for native (Compilerhints already in a3).
+    __ And(t0, a3, Operand(1 << (SharedFunctionInfo::kES5Native +
+                                 kSmiTagSize)));
+    __ Branch(&shift_arguments, ne, t0, Operand(zero_reg));
 
     // Compute the receiver in non-strict mode.
     // Load first argument in a2. a2 = -kPointerSize(sp + n_args << 2).
     __ sll(at, a0, kPointerSizeLog2);
     __ addu(a2, sp, at);
     __ lw(a2, MemOperand(a2, -kPointerSize));
     // a0: actual number of arguments
     // a1: function
     // a2: first argument
     __ JumpIfSmi(a2, &convert_to_object, t2);
 
-    // Heap::kUndefinedValueRootIndex is already in a3.
+    __ LoadRoot(a3, Heap::kUndefinedValueRootIndex);
     __ Branch(&use_global_receiver, eq, a2, Operand(a3));
     __ LoadRoot(a3, Heap::kNullValueRootIndex);
     __ Branch(&use_global_receiver, eq, a2, Operand(a3));
 
     __ GetObjectType(a2, a3, a3);
     __ Branch(&convert_to_object, lt, a3, Operand(FIRST_JS_OBJECT_TYPE));
     __ Branch(&shift_arguments, le, a3, Operand(LAST_JS_OBJECT_TYPE));
 
     __ bind(&convert_to_object);
     __ EnterInternalFrame();  // In order to preserve argument count.
@@ skipping 148 matching lines @@
   // Compute the receiver.
   Label call_to_object, use_global_receiver, push_receiver;
   __ lw(a0, MemOperand(fp, kRecvOffset));
 
   // Do not transform the receiver for strict mode functions.
   __ lw(a2, FieldMemOperand(a1, SharedFunctionInfo::kCompilerHintsOffset));
   __ And(t0, a2, Operand(1 << (SharedFunctionInfo::kStrictModeFunction +
                                kSmiTagSize)));
   __ Branch(&push_receiver, ne, t0, Operand(zero_reg));
 
-  // Do not transform the receiver for native (shared already in a1).
-  __ lw(a1, FieldMemOperand(a1, SharedFunctionInfo::kScriptOffset));
-  __ LoadRoot(a2, Heap::kUndefinedValueRootIndex);
-  __ Branch(&push_receiver, eq, a1, Operand(a2));
-  __ lw(a1, FieldMemOperand(a1, Script::kTypeOffset));
-  __ sra(a1, a1, kSmiTagSize);
-  __ Branch(&push_receiver, eq, a1, Operand(Script::TYPE_NATIVE));
+  // Do not transform the receiver for native (Compilerhints already in a2).
+  __ And(t0, a2, Operand(1 << (SharedFunctionInfo::kES5Native +
+                               kSmiTagSize)));
+  __ Branch(&push_receiver, ne, t0, Operand(zero_reg));
 
   // Compute the receiver in non-strict mode.
   __ And(t0, a0, Operand(kSmiTagMask));
   __ Branch(&call_to_object, eq, t0, Operand(zero_reg));
   __ LoadRoot(a1, Heap::kNullValueRootIndex);
   __ Branch(&use_global_receiver, eq, a0, Operand(a1));
-  // Heap::kUndefinedValueRootIndex is already in a2.
+  __ LoadRoot(a2, Heap::kUndefinedValueRootIndex);
   __ Branch(&use_global_receiver, eq, a0, Operand(a2));
 
   // Check if the receiver is already a JavaScript object.
   // a0: receiver
   __ GetObjectType(a0, a1, a1);
   __ Branch(&call_to_object, lt, a1, Operand(FIRST_JS_OBJECT_TYPE));
   __ Branch(&push_receiver, le, a1, Operand(LAST_JS_OBJECT_TYPE));
 
   // Convert the receiver to a regular object.
   // a0: receiver
@@ skipping 193 matching lines @@
   __ bind(&dont_adapt_arguments);
   __ Jump(a3);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_MIPS