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

MIPS: remove old style callbacks

Browse Source 
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
This commit is contained in:
palfia@homejinni.com 2013-08-27 22:51:37 +00:00
parent dc670f4412
commit a7be047223
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mips/stub-cache-mips.cc
View File

@ -885,8 +885,8 @@ static void GenerateFastApiDirectCall(MacroAssembler* masm,
// CallApiFunctionAndReturn will set up a0. // CallApiFunctionAndReturn will set up a0.
Address function_address = v8::ToCData<Address>(api_call_info->callback()); Address function_address = v8::ToCData<Address>(api_call_info->callback());
bool returns_handle = // TODO(dcarney): fix signatures using returns_handle
!CallbackTable::ReturnsVoid(masm->isolate(), function_address); const bool returns_handle = false;
Register first_arg = returns_handle ? a1 : a0; Register first_arg = returns_handle ? a1 : a0;
Register second_arg = returns_handle ? a2 : a1; Register second_arg = returns_handle ? a2 : a1;
@ -917,9 +917,7 @@ static void GenerateFastApiDirectCall(MacroAssembler* masm,
type, type,
masm->isolate()); masm->isolate());
Address thunk_address = returns_handle Address thunk_address = FUNCTION_ADDR(&InvokeFunctionCallback);
? FUNCTION_ADDR(&InvokeInvocationCallback)
: FUNCTION_ADDR(&InvokeFunctionCallback);
ExternalReference::Type thunk_type = ExternalReference::Type thunk_type =
returns_handle ? returns_handle ?
ExternalReference::PROFILING_API_CALL : ExternalReference::PROFILING_API_CALL :
@ -1420,8 +1418,8 @@ void BaseLoadStubCompiler::GenerateLoadCallback(
__ sw(name(), MemOperand(sp, 0 * kPointerSize)); __ sw(name(), MemOperand(sp, 0 * kPointerSize));
Address getter_address = v8::ToCData<Address>(callback->getter()); Address getter_address = v8::ToCData<Address>(callback->getter());
bool returns_handle = // TODO(dcarney): fix signatures using returns_handle
!CallbackTable::ReturnsVoid(isolate(), getter_address); const bool returns_handle = false;
Register first_arg = returns_handle ? a1 : a0; Register first_arg = returns_handle ? a1 : a0;
Register second_arg = returns_handle ? a2 : a1; Register second_arg = returns_handle ? a2 : a1;
@ -1454,12 +1452,8 @@ void BaseLoadStubCompiler::GenerateLoadCallback(
ExternalReference::DIRECT_GETTER_CALL_NEW; ExternalReference::DIRECT_GETTER_CALL_NEW;
ExternalReference ref = ExternalReference(&fun, type, isolate()); ExternalReference ref = ExternalReference(&fun, type, isolate());
Address thunk_address = returns_handle Address thunk_address = FUNCTION_ADDR(&InvokeAccessorGetterCallback);
? FUNCTION_ADDR(&InvokeAccessorGetter)
: FUNCTION_ADDR(&InvokeAccessorGetterCallback);
ExternalReference::Type thunk_type = 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); ApiFunction thunk_fun(thunk_address);
ExternalReference thunk_ref = ExternalReference(&thunk_fun, thunk_type, ExternalReference thunk_ref = ExternalReference(&thunk_fun, thunk_type,