AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Refactored DirectCEntryStub::GenerateCall a bit to make it clearer what's going on and added an ASSERT.

Browse Source 
Review URL: http://codereview.chromium.org/7640016

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8938 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
svenpanne@chromium.org 2011-08-16 09:58:34 +00:00
parent 06b8e73b99
commit af112fda75
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/arm/code-stubs-arm.cc
View File

@ -6315,14 +6315,8 @@ void DirectCEntryStub::Generate(MacroAssembler* masm) {
void DirectCEntryStub::GenerateCall(MacroAssembler* masm,
ExternalReference function) {
__ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()),
RelocInfo::CODE_TARGET));
__ mov(r2, Operand(function));
// Push return address (accessible to GC through exit frame pc).
// Note that using pc with str is deprecated.
__ add(ip, pc, Operand(4));
__ str(ip, MemOperand(sp, 0));
__ Jump(r2); // Call the api function.
GenerateCall(masm, r2);
}
@ -6332,9 +6326,13 @@ void DirectCEntryStub::GenerateCall(MacroAssembler* masm,
RelocInfo::CODE_TARGET));
// Push return address (accessible to GC through exit frame pc).
// Note that using pc with str is deprecated.
__ add(ip, pc, Operand(4));
Label start;
__ bind(&start);
__ add(ip, pc, Operand(Assembler::kInstrSize));
__ str(ip, MemOperand(sp, 0));
__ Jump(target); // Call the C++ function.
ASSERT_EQ(Assembler::kInstrSize + Assembler::kPcLoadDelta,
masm->SizeOfCodeGeneratedSince(&start));
}