Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 531fbffa7912c99a1f9351cd0963402b49f07e3d..9160f3f3b422e29d800839668a38088c700d1858 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -433,9 +433,7 @@ void LCodeGen::WriteTranslation(LEnvironment* environment, |
translation->BeginConstructStubFrame(closure_id, translation_size); |
break; |
case JS_SETTER: |
- ASSERT(translation_size == 2); |
- ASSERT(height == 0); |
- translation->BeginSetterStubFrame(closure_id); |
+ // TODO(svenpanne) Implement me! |
break; |
case ARGUMENTS_ADAPTOR: |
translation->BeginArgumentsAdaptorFrame(closure_id, translation_size); |
@@ -2962,7 +2960,7 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) { |
// if it's better to use it than to explicitly fetch it from the context |
// here. |
__ mov(receiver, Operand(ebp, StandardFrameConstants::kContextOffset)); |
- __ mov(receiver, ContextOperand(receiver, Context::GLOBAL_OBJECT_INDEX)); |
+ __ mov(receiver, ContextOperand(receiver, Context::GLOBAL_INDEX)); |
__ mov(receiver, |
FieldOperand(receiver, JSGlobalObject::kGlobalReceiverOffset)); |
__ bind(&receiver_ok); |
@@ -3054,8 +3052,7 @@ void LCodeGen::DoDeclareGlobals(LDeclareGlobals* instr) { |
void LCodeGen::DoGlobalObject(LGlobalObject* instr) { |
Register context = ToRegister(instr->context()); |
Register result = ToRegister(instr->result()); |
- __ mov(result, |
- Operand(context, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX))); |
+ __ mov(result, Operand(context, Context::SlotOffset(Context::GLOBAL_INDEX))); |
} |
@@ -3423,11 +3420,11 @@ void LCodeGen::DoRandom(LRandom* instr) { |
static const int kSeedSize = sizeof(uint32_t); |
STATIC_ASSERT(kPointerSize == kSeedSize); |
- __ mov(eax, FieldOperand(eax, GlobalObject::kNativeContextOffset)); |
+ __ mov(eax, FieldOperand(eax, GlobalObject::kGlobalContextOffset)); |
static const int kRandomSeedOffset = |
FixedArray::kHeaderSize + Context::RANDOM_SEED_INDEX * kPointerSize; |
__ mov(ebx, FieldOperand(eax, kRandomSeedOffset)); |
- // ebx: FixedArray of the native context's random seeds |
+ // ebx: FixedArray of the global context's random seeds |
// Load state[0]. |
__ mov(ecx, FieldOperand(ebx, ByteArray::kHeaderSize)); |