From a7be047223cd3f61ba0881fed7157935d54d30eb Mon Sep 17 00:00:00 2001 From: "palfia@homejinni.com" Date: Tue, 27 Aug 2013 22:51:37 +0000 Subject: [PATCH] MIPS: remove old style callbacks Port r16354 (559bc02d) BUG= Review URL: https://codereview.chromium.org/23479007 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16370 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/stub-cache-mips.cc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc index b84aca7..9458c5e 100644 --- a/src/mips/stub-cache-mips.cc +++ b/src/mips/stub-cache-mips.cc @@ -885,8 +885,8 @@ static void GenerateFastApiDirectCall(MacroAssembler* masm, // CallApiFunctionAndReturn will set up a0. Address function_address = v8::ToCData
(api_call_info->callback()); - bool returns_handle = - !CallbackTable::ReturnsVoid(masm->isolate(), function_address); + // TODO(dcarney): fix signatures using returns_handle + const bool returns_handle = false; Register first_arg = returns_handle ? a1 : a0; Register second_arg = returns_handle ? a2 : a1; @@ -917,9 +917,7 @@ static void GenerateFastApiDirectCall(MacroAssembler* masm, type, masm->isolate()); - Address thunk_address = returns_handle - ? FUNCTION_ADDR(&InvokeInvocationCallback) - : FUNCTION_ADDR(&InvokeFunctionCallback); + Address thunk_address = FUNCTION_ADDR(&InvokeFunctionCallback); ExternalReference::Type thunk_type = returns_handle ? ExternalReference::PROFILING_API_CALL : @@ -1420,8 +1418,8 @@ void BaseLoadStubCompiler::GenerateLoadCallback( __ sw(name(), MemOperand(sp, 0 * kPointerSize)); Address getter_address = v8::ToCData
(callback->getter()); - bool returns_handle = - !CallbackTable::ReturnsVoid(isolate(), getter_address); + // TODO(dcarney): fix signatures using returns_handle + const bool returns_handle = false; Register first_arg = returns_handle ? a1 : a0; Register second_arg = returns_handle ? a2 : a1; @@ -1454,13 +1452,9 @@ void BaseLoadStubCompiler::GenerateLoadCallback( ExternalReference::DIRECT_GETTER_CALL_NEW; ExternalReference ref = ExternalReference(&fun, type, isolate()); - Address thunk_address = returns_handle - ? FUNCTION_ADDR(&InvokeAccessorGetter) - : FUNCTION_ADDR(&InvokeAccessorGetterCallback); + Address thunk_address = FUNCTION_ADDR(&InvokeAccessorGetterCallback); ExternalReference::Type thunk_type = - returns_handle ? - ExternalReference::PROFILING_GETTER_CALL : - ExternalReference::PROFILING_GETTER_CALL_NEW; + ExternalReference::PROFILING_GETTER_CALL_NEW; ApiFunction thunk_fun(thunk_address); ExternalReference thunk_ref = ExternalReference(&thunk_fun, thunk_type, isolate()); -- 2.7.4