Index: src/ia32/codegen-ia32.cc |
=================================================================== |
--- src/ia32/codegen-ia32.cc (revision 5806) |
+++ src/ia32/codegen-ia32.cc (working copy) |
@@ -686,10 +686,10 @@ |
void CodeGenerator::LoadGlobal() { |
if (in_spilled_code()) { |
- frame_->EmitPush(GlobalObject()); |
+ frame_->EmitPush(GlobalObjectOperand()); |
} else { |
Result temp = allocator_->Allocate(); |
- __ mov(temp.reg(), GlobalObject()); |
+ __ mov(temp.reg(), GlobalObjectOperand()); |
frame_->Push(&temp); |
} |
} |
@@ -698,7 +698,7 @@ |
void CodeGenerator::LoadGlobalReceiver() { |
Result temp = allocator_->Allocate(); |
Register reg = temp.reg(); |
- __ mov(reg, GlobalObject()); |
+ __ mov(reg, GlobalObjectOperand()); |
__ mov(reg, FieldOperand(reg, GlobalObject::kGlobalReceiverOffset)); |
frame_->Push(&temp); |
} |
@@ -6778,8 +6778,8 @@ |
__ mov(scratch2_, |
FieldOperand(scratch2_, GlobalObject::kGlobalContextOffset)); |
__ cmp(scratch1_, |
- CodeGenerator::ContextOperand( |
- scratch2_, Context::STRING_FUNCTION_PROTOTYPE_MAP_INDEX)); |
+ 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 |
// default valueOf and set true result. |
@@ -7934,7 +7934,7 @@ |
// Push the builtins object found in the current global object. |
Result temp = allocator()->Allocate(); |
ASSERT(temp.is_valid()); |
- __ mov(temp.reg(), GlobalObject()); |
+ __ mov(temp.reg(), GlobalObjectOperand()); |
__ mov(temp.reg(), FieldOperand(temp.reg(), GlobalObject::kBuiltinsOffset)); |
frame_->Push(&temp); |
} |