| Index: src/arm/full-codegen-arm.cc
|
| ===================================================================
|
| --- src/arm/full-codegen-arm.cc (revision 5806)
|
| +++ src/arm/full-codegen-arm.cc (working copy)
|
| @@ -1019,7 +1019,7 @@
|
| __ bind(&fast);
|
| }
|
|
|
| - __ ldr(r0, CodeGenerator::GlobalObject());
|
| + __ ldr(r0, GlobalObjectOperand());
|
| __ mov(r2, Operand(slot->var()->name()));
|
| RelocInfo::Mode mode = (typeof_state == INSIDE_TYPEOF)
|
| ? RelocInfo::CODE_TARGET
|
| @@ -1040,7 +1040,7 @@
|
| Comment cmnt(masm_, "Global variable");
|
| // Use inline caching. Variable name is passed in r2 and the global
|
| // object (receiver) in r0.
|
| - __ ldr(r0, CodeGenerator::GlobalObject());
|
| + __ ldr(r0, GlobalObjectOperand());
|
| __ mov(r2, Operand(var->name()));
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET_CONTEXT);
|
| @@ -1514,7 +1514,7 @@
|
| // assignment. Right-hand-side value is passed in r0, variable name in
|
| // r2, and the global object in r1.
|
| __ mov(r2, Operand(var->name()));
|
| - __ ldr(r1, CodeGenerator::GlobalObject());
|
| + __ ldr(r1, GlobalObjectOperand());
|
| Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
|
|
| @@ -1809,7 +1809,7 @@
|
| context()->DropAndPlug(1, r0);
|
| } else if (var != NULL && !var->is_this() && var->is_global()) {
|
| // Push global object as receiver for the call IC.
|
| - __ ldr(r0, CodeGenerator::GlobalObject());
|
| + __ ldr(r0, GlobalObjectOperand());
|
| __ push(r0);
|
| EmitCallWithIC(expr, var->name(), RelocInfo::CODE_TARGET_CONTEXT);
|
| } else if (var != NULL && var->AsSlot() != NULL &&
|
| @@ -1845,7 +1845,7 @@
|
| // Push function.
|
| __ push(r0);
|
| // Push global receiver.
|
| - __ ldr(r1, CodeGenerator::GlobalObject());
|
| + __ ldr(r1, GlobalObjectOperand());
|
| __ ldr(r1, FieldMemOperand(r1, GlobalObject::kGlobalReceiverOffset));
|
| __ push(r1);
|
| __ bind(&call);
|
| @@ -1879,7 +1879,7 @@
|
|
|
| Handle<Code> ic(Builtins::builtin(Builtins::KeyedLoadIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
| - __ ldr(r1, CodeGenerator::GlobalObject());
|
| + __ ldr(r1, GlobalObjectOperand());
|
| __ ldr(r1, FieldMemOperand(r1, GlobalObject::kGlobalReceiverOffset));
|
| __ Push(r0, r1); // Function, receiver.
|
| EmitCallWithStub(expr);
|
| @@ -1902,7 +1902,7 @@
|
| VisitForStackValue(fun);
|
| }
|
| // Load global receiver object.
|
| - __ ldr(r1, CodeGenerator::GlobalObject());
|
| + __ ldr(r1, GlobalObjectOperand());
|
| __ ldr(r1, FieldMemOperand(r1, GlobalObject::kGlobalReceiverOffset));
|
| __ push(r1);
|
| // Emit function call.
|
| @@ -2780,7 +2780,7 @@
|
|
|
| if (expr->is_jsruntime()) {
|
| // Prepare for calling JS runtime function.
|
| - __ ldr(r0, CodeGenerator::GlobalObject());
|
| + __ ldr(r0, GlobalObjectOperand());
|
| __ ldr(r0, FieldMemOperand(r0, GlobalObject::kBuiltinsOffset));
|
| __ push(r0);
|
| }
|
| @@ -2832,7 +2832,7 @@
|
| VisitForStackValue(prop->obj());
|
| VisitForStackValue(prop->key());
|
| } else if (var->is_global()) {
|
| - __ ldr(r1, CodeGenerator::GlobalObject());
|
| + __ ldr(r1, GlobalObjectOperand());
|
| __ mov(r0, Operand(var->name()));
|
| __ Push(r1, r0);
|
| } else {
|
| @@ -3098,7 +3098,7 @@
|
| VariableProxy* proxy = expr->AsVariableProxy();
|
| if (proxy != NULL && !proxy->var()->is_this() && proxy->var()->is_global()) {
|
| Comment cmnt(masm_, "Global variable");
|
| - __ ldr(r0, CodeGenerator::GlobalObject());
|
| + __ ldr(r0, GlobalObjectOperand());
|
| __ mov(r2, Operand(proxy->name()));
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| // Use a regular load, not a contextual load, to avoid a reference
|
|
|