Commit 195753ff authored by ager@chromium.org's avatar ager@chromium.org

Commit of eval changes left out because they were stuck in another changelist.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1307 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 1c0ebb7e
...@@ -418,10 +418,10 @@ MemOperand CodeGenerator::ContextSlotOperandCheckExtensions(Slot* slot, ...@@ -418,10 +418,10 @@ MemOperand CodeGenerator::ContextSlotOperandCheckExtensions(Slot* slot,
} }
} }
// Check that last extension is NULL. // Check that last extension is NULL.
__ ldr(tmp2, ContextOperand(tmp, Context::EXTENSION_INDEX)); __ ldr(tmp2, ContextOperand(context, Context::EXTENSION_INDEX));
__ tst(tmp2, tmp2); __ tst(tmp2, tmp2);
__ b(ne, slow); __ b(ne, slow);
__ ldr(tmp, ContextOperand(tmp, Context::FCONTEXT_INDEX)); __ ldr(tmp, ContextOperand(context, Context::FCONTEXT_INDEX));
return ContextOperand(tmp, index); return ContextOperand(tmp, index);
} }
......
...@@ -469,9 +469,9 @@ Operand CodeGenerator::ContextSlotOperandCheckExtensions(Slot* slot, ...@@ -469,9 +469,9 @@ Operand CodeGenerator::ContextSlotOperandCheckExtensions(Slot* slot,
} }
} }
// Check that last extension is NULL. // Check that last extension is NULL.
__ cmp(ContextOperand(tmp, Context::EXTENSION_INDEX), Immediate(0)); __ cmp(ContextOperand(context, Context::EXTENSION_INDEX), Immediate(0));
__ j(not_equal, slow, not_taken); __ j(not_equal, slow, not_taken);
__ mov(tmp, ContextOperand(tmp, Context::FCONTEXT_INDEX)); __ mov(tmp, ContextOperand(context, Context::FCONTEXT_INDEX));
return ContextOperand(tmp, index); return ContextOperand(tmp, index);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment