| Index: src/x64/codegen-x64.cc
|
| ===================================================================
|
| --- src/x64/codegen-x64.cc (revision 5806)
|
| +++ src/x64/codegen-x64.cc (working copy)
|
| @@ -568,10 +568,10 @@
|
|
|
| void CodeGenerator::LoadGlobal() {
|
| if (in_spilled_code()) {
|
| - frame_->EmitPush(GlobalObject());
|
| + frame_->EmitPush(GlobalObjectOperand());
|
| } else {
|
| Result temp = allocator_->Allocate();
|
| - __ movq(temp.reg(), GlobalObject());
|
| + __ movq(temp.reg(), GlobalObjectOperand());
|
| frame_->Push(&temp);
|
| }
|
| }
|
| @@ -580,7 +580,7 @@
|
| void CodeGenerator::LoadGlobalReceiver() {
|
| Result temp = allocator_->Allocate();
|
| Register reg = temp.reg();
|
| - __ movq(reg, GlobalObject());
|
| + __ movq(reg, GlobalObjectOperand());
|
| __ movq(reg, FieldOperand(reg, GlobalObject::kGlobalReceiverOffset));
|
| frame_->Push(&temp);
|
| }
|
| @@ -6062,7 +6062,7 @@
|
| __ movq(scratch2_,
|
| FieldOperand(scratch2_, GlobalObject::kGlobalContextOffset));
|
| __ cmpq(scratch1_,
|
| - CodeGenerator::ContextOperand(
|
| + ContextOperand(
|
| scratch2_, Context::STRING_FUNCTION_PROTOTYPE_MAP_INDEX));
|
| __ j(not_equal, &false_result);
|
| // Set the bit in the map to indicate that it has been checked safe for
|
| @@ -7219,7 +7219,7 @@
|
| // Push the builtins object found in the current global object.
|
| Result temp = allocator()->Allocate();
|
| ASSERT(temp.is_valid());
|
| - __ movq(temp.reg(), GlobalObject());
|
| + __ movq(temp.reg(), GlobalObjectOperand());
|
| __ movq(temp.reg(),
|
| FieldOperand(temp.reg(), GlobalObject::kBuiltinsOffset));
|
| frame_->Push(&temp);
|
|
|