| Index: src/ia32/full-codegen-ia32.cc
|
| ===================================================================
|
| --- src/ia32/full-codegen-ia32.cc (revision 5806)
|
| +++ src/ia32/full-codegen-ia32.cc (working copy)
|
| @@ -954,7 +954,7 @@
|
|
|
| // All extension objects were empty and it is safe to use a global
|
| // load IC call.
|
| - __ mov(eax, CodeGenerator::GlobalObject());
|
| + __ mov(eax, GlobalObjectOperand());
|
| __ mov(ecx, slot->var()->name());
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| RelocInfo::Mode mode = (typeof_state == INSIDE_TYPEOF)
|
| @@ -1057,7 +1057,7 @@
|
| Comment cmnt(masm_, "Global variable");
|
| // Use inline caching. Variable name is passed in ecx and the global
|
| // object on the stack.
|
| - __ mov(eax, CodeGenerator::GlobalObject());
|
| + __ mov(eax, GlobalObjectOperand());
|
| __ mov(ecx, var->name());
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET_CONTEXT);
|
| @@ -1834,7 +1834,7 @@
|
| // assignment. Right-hand-side value is passed in eax, variable name in
|
| // ecx, and the global object on the stack.
|
| __ mov(ecx, var->name());
|
| - __ mov(edx, CodeGenerator::GlobalObject());
|
| + __ mov(edx, GlobalObjectOperand());
|
| Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
|
|
| @@ -2109,7 +2109,7 @@
|
| context()->DropAndPlug(1, eax);
|
| } else if (var != NULL && !var->is_this() && var->is_global()) {
|
| // Push global object as receiver for the call IC.
|
| - __ push(CodeGenerator::GlobalObject());
|
| + __ push(GlobalObjectOperand());
|
| EmitCallWithIC(expr, var->name(), RelocInfo::CODE_TARGET_CONTEXT);
|
| } else if (var != NULL && var->AsSlot() != NULL &&
|
| var->AsSlot()->type() == Slot::LOOKUP) {
|
| @@ -2144,7 +2144,7 @@
|
| // Push function.
|
| __ push(eax);
|
| // Push global receiver.
|
| - __ mov(ebx, CodeGenerator::GlobalObject());
|
| + __ mov(ebx, GlobalObjectOperand());
|
| __ push(FieldOperand(ebx, GlobalObject::kGlobalReceiverOffset));
|
| __ bind(&call);
|
| }
|
| @@ -2178,7 +2178,7 @@
|
| // Push result (function).
|
| __ push(eax);
|
| // Push Global receiver.
|
| - __ mov(ecx, CodeGenerator::GlobalObject());
|
| + __ mov(ecx, GlobalObjectOperand());
|
| __ push(FieldOperand(ecx, GlobalObject::kGlobalReceiverOffset));
|
| EmitCallWithStub(expr);
|
| } else {
|
| @@ -2199,7 +2199,7 @@
|
| VisitForStackValue(fun);
|
| }
|
| // Load global receiver object.
|
| - __ mov(ebx, CodeGenerator::GlobalObject());
|
| + __ mov(ebx, GlobalObjectOperand());
|
| __ push(FieldOperand(ebx, GlobalObject::kGlobalReceiverOffset));
|
| // Emit function call.
|
| EmitCallWithStub(expr);
|
| @@ -3089,7 +3089,7 @@
|
|
|
| if (expr->is_jsruntime()) {
|
| // Prepare for calling JS runtime function.
|
| - __ mov(eax, CodeGenerator::GlobalObject());
|
| + __ mov(eax, GlobalObjectOperand());
|
| __ push(FieldOperand(eax, GlobalObject::kBuiltinsOffset));
|
| }
|
|
|
| @@ -3140,7 +3140,7 @@
|
| VisitForStackValue(prop->obj());
|
| VisitForStackValue(prop->key());
|
| } else if (var->is_global()) {
|
| - __ push(CodeGenerator::GlobalObject());
|
| + __ push(GlobalObjectOperand());
|
| __ push(Immediate(var->name()));
|
| } else {
|
| // Non-global variable. Call the runtime to look up the context
|
| @@ -3418,7 +3418,7 @@
|
|
|
| if (proxy != NULL && !proxy->var()->is_this() && proxy->var()->is_global()) {
|
| Comment cmnt(masm_, "Global variable");
|
| - __ mov(eax, CodeGenerator::GlobalObject());
|
| + __ mov(eax, GlobalObjectOperand());
|
| __ mov(ecx, Immediate(proxy->name()));
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| // Use a regular load, not a contextual load, to avoid a reference
|
|
|