Revert commit 2701 per Erik Corry's request.

src/arm/builtins-arm.cc

 // Copyright 2006-2008 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 196 matching lines @@
   // r3: argc
   // r4: argv
   // r5-r7, cp may be clobbered
 
   // Clear the context before we push it when entering the JS frame.
   __ mov(cp, Operand(0));
 
   // Enter an internal frame.
   __ EnterInternalFrame();
 
-  // Set up the context from the function argument.
+  // Setup the context from the function argument.
   __ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
 
-  // Set up the roots register.
-  ExternalReference roots_address = ExternalReference::roots_address();
-  __ mov(r10, Operand(roots_address));
-
   // Push the function and the receiver onto the stack.
   __ push(r1);
   __ push(r2);
 
   // Copy arguments to the stack in a loop.
   // r1: function
   // r3: argc
   // r4: argv, i.e. points to first arg
   Label loop, entry;
   __ add(r2, r4, Operand(r3, LSL, kPointerSizeLog2));
   // r2 points past last arg.
   __ b(&entry);
   __ bind(&loop);
   __ ldr(r0, MemOperand(r4, kPointerSize, PostIndex));  // read next parameter
   __ ldr(r0, MemOperand(r0));  // dereference handle
   __ push(r0);  // push parameter
   __ bind(&entry);
   __ cmp(r4, Operand(r2));
   __ b(ne, &loop);
 
   // Initialize all JavaScript callee-saved registers, since they will be seen
   // by the garbage collector as part of handlers.
-  __ LoadRoot(r4, Heap::kUndefinedValueRootIndex);
+  __ mov(r4, Operand(Factory::undefined_value()));
   __ mov(r5, Operand(r4));
   __ mov(r6, Operand(r4));
   __ mov(r7, Operand(r4));
   if (kR9Available == 1) {
     __ mov(r9, Operand(r4));
   }
 
   // Invoke the code and pass argc as r0.
   __ mov(r0, Operand(r3));
   if (is_construct) {
@@ skipping 22 matching lines @@
   Generate_JSEntryTrampolineHelper(masm, true);
 }
 
 
 void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
   // 1. Make sure we have at least one argument.
   // r0: actual number of argument
   { Label done;
     __ tst(r0, Operand(r0));
     __ b(ne, &done);
-    __ LoadRoot(r2, Heap::kUndefinedValueRootIndex);
+    __ mov(r2, Operand(Factory::undefined_value()));
     __ push(r2);
     __ add(r0, r0, Operand(1));
     __ bind(&done);
   }
 
   // 2. Get the function to call from the stack.
   // r0: actual number of argument
   { Label done, non_function, function;
     __ ldr(r1, MemOperand(sp, r0, LSL, kPointerSizeLog2));
     __ tst(r1, Operand(kSmiTagMask));
@@ skipping 20 matching lines @@
   { Label call_to_object, use_global_receiver, patch_receiver, done;
     __ add(r2, sp, Operand(r0, LSL, kPointerSizeLog2));
     __ ldr(r2, MemOperand(r2, -kPointerSize));
 
     // r0: actual number of arguments
     // r1: function
     // r2: first argument
     __ tst(r2, Operand(kSmiTagMask));
     __ b(eq, &call_to_object);
 
-    __ LoadRoot(r3, Heap::kNullValueRootIndex);
+    __ mov(r3, Operand(Factory::null_value()));
     __ cmp(r2, r3);
     __ b(eq, &use_global_receiver);
-    __ LoadRoot(r3, Heap::kUndefinedValueRootIndex);
+    __ mov(r3, Operand(Factory::undefined_value()));
     __ cmp(r2, r3);
     __ b(eq, &use_global_receiver);
 
     __ CompareObjectType(r2, r3, r3, FIRST_JS_OBJECT_TYPE);
     __ b(lt, &call_to_object);
     __ cmp(r3, Operand(LAST_JS_OBJECT_TYPE));
     __ b(le, &done);
 
     __ bind(&call_to_object);
     __ EnterInternalFrame();
@@ skipping 145 matching lines @@
 
   // Change context eagerly to get the right global object if necessary.
   __ ldr(r0, MemOperand(fp, kFunctionOffset));
   __ ldr(cp, FieldMemOperand(r0, JSFunction::kContextOffset));
 
   // Compute the receiver.
   Label call_to_object, use_global_receiver, push_receiver;
   __ ldr(r0, MemOperand(fp, kRecvOffset));
   __ tst(r0, Operand(kSmiTagMask));
   __ b(eq, &call_to_object);
-  __ LoadRoot(r1, Heap::kNullValueRootIndex);
+  __ mov(r1, Operand(Factory::null_value()));
   __ cmp(r0, r1);
   __ b(eq, &use_global_receiver);
-  __ LoadRoot(r1, Heap::kUndefinedValueRootIndex);
+  __ mov(r1, Operand(Factory::undefined_value()));
   __ cmp(r0, r1);
   __ b(eq, &use_global_receiver);
 
   // Check if the receiver is already a JavaScript object.
   // r0: receiver
   __ CompareObjectType(r0, r1, r1, FIRST_JS_OBJECT_TYPE);
   __ b(lt, &call_to_object);
   __ cmp(r1, Operand(LAST_JS_OBJECT_TYPE));
   __ b(le, &push_receiver);
 
@@ skipping 149 matching lines @@
     __ ldr(ip, MemOperand(r0, 2 * kPointerSize));
     __ push(ip);
     __ cmp(r0, fp);  // Compare before moving to next argument.
     __ sub(r0, r0, Operand(kPointerSize));
     __ b(ne, &copy);
 
     // Fill the remaining expected arguments with undefined.
     // r1: function
     // r2: expected number of arguments
     // r3: code entry to call
-    __ LoadRoot(ip, Heap::kUndefinedValueRootIndex);
+    __ mov(ip, Operand(Factory::undefined_value()));
     __ sub(r2, fp, Operand(r2, LSL, kPointerSizeLog2));
     __ sub(r2, r2, Operand(4 * kPointerSize));  // Adjust for frame.
 
     Label fill;
     __ bind(&fill);
     __ push(ip);
     __ cmp(sp, r2);
     __ b(ne, &fill);
   }
 
@@ skipping 10 matching lines @@
   // Dont adapt arguments.
   // -------------------------------------------
   __ bind(&dont_adapt_arguments);
   __ Jump(r3);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal