| Index: src/x64/full-codegen-x64.cc
|
| ===================================================================
|
| --- src/x64/full-codegen-x64.cc (revision 5806)
|
| +++ src/x64/full-codegen-x64.cc (working copy)
|
| @@ -912,7 +912,7 @@
|
|
|
| // All extension objects were empty and it is safe to use a global
|
| // load IC call.
|
| - __ movq(rax, CodeGenerator::GlobalObject());
|
| + __ movq(rax, GlobalObjectOperand());
|
| __ Move(rcx, slot->var()->name());
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| RelocInfo::Mode mode = (typeof_state == INSIDE_TYPEOF)
|
| @@ -1016,7 +1016,7 @@
|
| // Use inline caching. Variable name is passed in rcx and the global
|
| // object on the stack.
|
| __ Move(rcx, var->name());
|
| - __ movq(rax, CodeGenerator::GlobalObject());
|
| + __ movq(rax, GlobalObjectOperand());
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET_CONTEXT);
|
| context()->Plug(rax);
|
| @@ -1555,7 +1555,7 @@
|
| // assignment. Right-hand-side value is passed in rax, variable name in
|
| // rcx, and the global object on the stack.
|
| __ Move(rcx, var->name());
|
| - __ movq(rdx, CodeGenerator::GlobalObject());
|
| + __ movq(rdx, GlobalObjectOperand());
|
| Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize));
|
| EmitCallIC(ic, RelocInfo::CODE_TARGET);
|
|
|
| @@ -1834,7 +1834,7 @@
|
| } else if (var != NULL && !var->is_this() && var->is_global()) {
|
| // Call to a global variable.
|
| // Push global object as receiver for the call IC lookup.
|
| - __ 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) {
|
| @@ -1868,7 +1868,7 @@
|
| // Push function.
|
| __ push(rax);
|
| // Push global receiver.
|
| - __ movq(rbx, CodeGenerator::GlobalObject());
|
| + __ movq(rbx, GlobalObjectOperand());
|
| __ push(FieldOperand(rbx, GlobalObject::kGlobalReceiverOffset));
|
| __ bind(&call);
|
| }
|
| @@ -1907,7 +1907,7 @@
|
| // Push result (function).
|
| __ push(rax);
|
| // Push receiver object on stack.
|
| - __ movq(rcx, CodeGenerator::GlobalObject());
|
| + __ movq(rcx, GlobalObjectOperand());
|
| __ push(FieldOperand(rcx, GlobalObject::kGlobalReceiverOffset));
|
| EmitCallWithStub(expr);
|
| } else {
|
| @@ -1928,7 +1928,7 @@
|
| VisitForStackValue(fun);
|
| }
|
| // Load global receiver object.
|
| - __ movq(rbx, CodeGenerator::GlobalObject());
|
| + __ movq(rbx, GlobalObjectOperand());
|
| __ push(FieldOperand(rbx, GlobalObject::kGlobalReceiverOffset));
|
| // Emit function call.
|
| EmitCallWithStub(expr);
|
| @@ -2801,7 +2801,7 @@
|
|
|
| if (expr->is_jsruntime()) {
|
| // Prepare for calling JS runtime function.
|
| - __ movq(rax, CodeGenerator::GlobalObject());
|
| + __ movq(rax, GlobalObjectOperand());
|
| __ push(FieldOperand(rax, GlobalObject::kBuiltinsOffset));
|
| }
|
|
|
| @@ -2851,7 +2851,7 @@
|
| VisitForStackValue(prop->obj());
|
| VisitForStackValue(prop->key());
|
| } else if (var->is_global()) {
|
| - __ push(CodeGenerator::GlobalObject());
|
| + __ push(GlobalObjectOperand());
|
| __ Push(var->name());
|
| } else {
|
| // Non-global variable. Call the runtime to look up the context
|
| @@ -3122,7 +3122,7 @@
|
| if (proxy != NULL && !proxy->var()->is_this() && proxy->var()->is_global()) {
|
| Comment cmnt(masm_, "Global variable");
|
| __ Move(rcx, proxy->name());
|
| - __ movq(rax, CodeGenerator::GlobalObject());
|
| + __ movq(rax, GlobalObjectOperand());
|
| Handle<Code> ic(Builtins::builtin(Builtins::LoadIC_Initialize));
|
| // Use a regular load, not a contextual load, to avoid a reference
|
| // error.
|
|
|