Reviewers: Søren Gjesse, Description: X64 Crankshaft: Start using LCallFunction, remove errors in it.
Please review this at http://codereview.chromium.org/6529053/ SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/x64/lithium-codegen-x64.cc M src/x64/lithium-x64.h M src/x64/lithium-x64.cc Index: src/x64/lithium-codegen-x64.cc =================================================================== --- src/x64/lithium-codegen-x64.cc (revision 6825) +++ src/x64/lithium-codegen-x64.cc (working copy) @@ -2142,12 +2142,12 @@ void LCodeGen::DoCallFunction(LCallFunction* instr) { - ASSERT(ToRegister(instr->context()).is(rsi)); ASSERT(ToRegister(instr->result()).is(rax)); int arity = instr->arity(); CallFunctionStub stub(arity, NOT_IN_LOOP, RECEIVER_MIGHT_BE_VALUE); CallCode(stub.GetCode(), RelocInfo::CODE_TARGET, instr); + __ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); __ Drop(1); } Index: src/x64/lithium-x64.cc =================================================================== --- src/x64/lithium-x64.cc (revision 6825) +++ src/x64/lithium-x64.cc (working copy) @@ -1219,8 +1219,9 @@ LInstruction* LChunkBuilder::DoCallFunction(HCallFunction* instr) { - Abort("Unimplemented: %s", "DoCallFunction"); - return NULL; + argument_count_ -= instr->argument_count(); + LCallFunction* result = new LCallFunction(); + return MarkAsCall(DefineFixed(result, rax), instr); } Index: src/x64/lithium-x64.h =================================================================== --- src/x64/lithium-x64.h (revision 6825) +++ src/x64/lithium-x64.h (working copy) @@ -1313,16 +1313,13 @@ }; -class LCallFunction: public LTemplateInstruction<1, 1, 0> { +class LCallFunction: public LTemplateInstruction<1, 0, 0> { public: - explicit LCallFunction(LOperand* context) { - inputs_[0] = context; - } + LCallFunction() {} DECLARE_CONCRETE_INSTRUCTION(CallFunction, "call-function") DECLARE_HYDROGEN_ACCESSOR(CallFunction) - LOperand* context() { return inputs_[0]; } int arity() const { return hydrogen()->argument_count() - 2; } }; -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
