Chromium Code Reviews| Index: src/arm/code-stubs-arm.cc |
| =================================================================== |
| --- src/arm/code-stubs-arm.cc (revision 6551) |
| +++ src/arm/code-stubs-arm.cc (working copy) |
| @@ -3313,9 +3313,17 @@ |
| // this by performing a garbage collection and retrying the |
| // builtin once. |
| + // Compute the argv pointer in a callee-saved register. |
| + __ add(r6, sp, Operand(r0, LSL, kPointerSizeLog2)); |
| + __ sub(r6, r6, Operand(kPointerSize)); |
| + |
| // Enter the exit frame that transitions from JavaScript to C++. |
| __ EnterExitFrame(save_doubles_); |
| + // Setup argc and the builtin function in callee-saved registers. |
| + __ mov(r4, Operand(r0)); |
| + __ mov(r5, Operand(r1)); |
| + |
| // r4: number of arguments (C callee-saved) |
| // r5: pointer to builtin function (C callee-saved) |
| // r6: pointer to first argument (C callee-saved) |
| @@ -5717,7 +5725,23 @@ |
| __ Jump(r2); |
| } |
| +void DirectCEntryStub::Generate(MacroAssembler* masm) { |
| + __ ldr(pc, MemOperand(sp, 0)); |
| +} |
| +void DirectCEntryStub::GenerateCall(MacroAssembler* masm, |
| + ApiFunction *function) { |
| + __ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()), |
| + RelocInfo::CODE_TARGET)); |
|
antonm
2011/02/03 11:16:25
indentation is slightly off.
|
| + // Push return address (accessible to GC through exit frame pc). |
| + ExternalReference ref = |
| + ExternalReference(function, ExternalReference::DIRECT_CALL); |
| + __ mov(r2, Operand(reinterpret_cast<intptr_t>(ref.address()))); |
| + __ add(ip, pc, Operand(4)); |
| + __ str(ip, MemOperand(sp, 0)); |
| + __ Jump(r2); // Call the api function. |
| +} |
| + |
| #undef __ |
| } } // namespace v8::internal |