| Index: src/ia32/macro-assembler-ia32.h
|
| diff --git a/src/ia32/macro-assembler-ia32.h b/src/ia32/macro-assembler-ia32.h
|
| index 8528c555adc8ad70e2df538d56773c9a630629e3..68a14bb3aaed2ea51bc2502fb2b92486487d1044 100644
|
| --- a/src/ia32/macro-assembler-ia32.h
|
| +++ b/src/ia32/macro-assembler-ia32.h
|
| @@ -278,7 +278,7 @@ class MacroAssembler: public Assembler {
|
| const CallWrapper& call_wrapper,
|
| CallKind call_kind);
|
|
|
| - void InvokeFunction(JSFunction* function,
|
| + void InvokeFunction(Handle<JSFunction> function,
|
| const ParameterCount& actual,
|
| InvokeFlag flag,
|
| const CallWrapper& call_wrapper,
|
| @@ -632,19 +632,9 @@ class MacroAssembler: public Assembler {
|
| // Call a code stub. Generate the code if necessary.
|
| void CallStub(CodeStub* stub, unsigned ast_id = kNoASTId);
|
|
|
| - // Call a code stub and return the code object called. Try to generate
|
| - // the code if necessary. Do not perform a GC but instead return a retry
|
| - // after GC failure.
|
| - MUST_USE_RESULT MaybeObject* TryCallStub(CodeStub* stub);
|
| -
|
| // Tail call a code stub (jump). Generate the code if necessary.
|
| void TailCallStub(CodeStub* stub);
|
|
|
| - // Tail call a code stub (jump) and return the code object called. Try to
|
| - // generate the code if necessary. Do not perform a GC but instead return
|
| - // a retry after GC failure.
|
| - MUST_USE_RESULT MaybeObject* TryTailCallStub(CodeStub* stub);
|
| -
|
| // Return from a code stub after popping its arguments.
|
| void StubReturn(int argc);
|
|
|
| @@ -652,19 +642,9 @@ class MacroAssembler: public Assembler {
|
| void CallRuntime(const Runtime::Function* f, int num_arguments);
|
| void CallRuntimeSaveDoubles(Runtime::FunctionId id);
|
|
|
| - // Call a runtime function, returning the CodeStub object called.
|
| - // Try to generate the stub code if necessary. Do not perform a GC
|
| - // but instead return a retry after GC failure.
|
| - MUST_USE_RESULT MaybeObject* TryCallRuntime(const Runtime::Function* f,
|
| - int num_arguments);
|
| -
|
| // Convenience function: Same as above, but takes the fid instead.
|
| void CallRuntime(Runtime::FunctionId id, int num_arguments);
|
|
|
| - // Convenience function: Same as above, but takes the fid instead.
|
| - MUST_USE_RESULT MaybeObject* TryCallRuntime(Runtime::FunctionId id,
|
| - int num_arguments);
|
| -
|
| // Convenience function: call an external reference.
|
| void CallExternalReference(ExternalReference ref, int num_arguments);
|
|
|
| @@ -675,23 +655,11 @@ class MacroAssembler: public Assembler {
|
| int num_arguments,
|
| int result_size);
|
|
|
| - // Tail call of a runtime routine (jump). Try to generate the code if
|
| - // necessary. Do not perform a GC but instead return a retry after GC failure.
|
| - MUST_USE_RESULT MaybeObject* TryTailCallExternalReference(
|
| - const ExternalReference& ext, int num_arguments, int result_size);
|
| -
|
| // Convenience function: tail call a runtime routine (jump).
|
| void TailCallRuntime(Runtime::FunctionId fid,
|
| int num_arguments,
|
| int result_size);
|
|
|
| - // Convenience function: tail call a runtime routine (jump). Try to generate
|
| - // the code if necessary. Do not perform a GC but instead return a retry after
|
| - // GC failure.
|
| - MUST_USE_RESULT MaybeObject* TryTailCallRuntime(Runtime::FunctionId fid,
|
| - int num_arguments,
|
| - int result_size);
|
| -
|
| // Before calling a C-function from generated code, align arguments on stack.
|
| // After aligning the frame, arguments must be stored in esp[0], esp[4],
|
| // etc., not pushed. The argument count assumes all arguments are word sized.
|
| @@ -716,19 +684,15 @@ class MacroAssembler: public Assembler {
|
| // stores the pointer to the reserved slot into esi.
|
| void PrepareCallApiFunction(int argc);
|
|
|
| - // Calls an API function. Allocates HandleScope, extracts
|
| - // returned value from handle and propagates exceptions.
|
| - // Clobbers ebx, edi and caller-save registers. Restores context.
|
| - // On return removes stack_space * kPointerSize (GCed).
|
| - MaybeObject* TryCallApiFunctionAndReturn(ApiFunction* function,
|
| - int stack_space);
|
| + // Calls an API function. Allocates HandleScope, extracts returned value
|
| + // from handle and propagates exceptions. Clobbers ebx, edi and
|
| + // caller-save registers. Restores context. On return removes
|
| + // stack_space * kPointerSize (GCed).
|
| + void CallApiFunctionAndReturn(Address function_address, int stack_space);
|
|
|
| // Jump to a runtime routine.
|
| void JumpToExternalReference(const ExternalReference& ext);
|
|
|
| - MaybeObject* TryJumpToExternalReference(const ExternalReference& ext);
|
| -
|
| -
|
| // ---------------------------------------------------------------------------
|
| // Utilities
|
|
|
|
|