Revision: 16630
Author: [email protected]
Date: Wed Sep 11 06:56:47 2013 UTC
Log: thread isolate for EntryHookTrampoline
[email protected]
BUG=
Review URL: https://codereview.chromium.org/23587019
http://code.google.com/p/v8/source/detail?r=16630
Modified:
/branches/bleeding_edge/src/arm/code-stubs-arm.cc
/branches/bleeding_edge/src/code-stubs.cc
/branches/bleeding_edge/src/code-stubs.h
=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Tue Sep 10 13:50:26
2013 UTC
+++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Wed Sep 11 06:56:47
2013 UTC
@@ -6836,6 +6836,9 @@
#else
// Under the simulator we need to indirect the entry hook through a
// trampoline function at a known address.
+ // It additionally takes an isolate as a third parameter
+ __ mov(r2, Operand(ExternalReference::isolate_address(masm->isolate())));
+
ApiFunction dispatcher(FUNCTION_ADDR(EntryHookTrampoline));
__ mov(ip, Operand(ExternalReference(&dispatcher,
ExternalReference::BUILTIN_CALL,
=======================================
--- /branches/bleeding_edge/src/code-stubs.cc Tue Sep 3 06:57:16 2013 UTC
+++ /branches/bleeding_edge/src/code-stubs.cc Wed Sep 11 06:56:47 2013 UTC
@@ -731,8 +731,9 @@
void ProfileEntryHookStub::EntryHookTrampoline(intptr_t function,
- intptr_t stack_pointer) {
- FunctionEntryHook entry_hook = Isolate::Current()->function_entry_hook();
+ intptr_t stack_pointer,
+ Isolate* isolate) {
+ FunctionEntryHook entry_hook = isolate->function_entry_hook();
ASSERT(entry_hook != NULL);
entry_hook(function, stack_pointer);
}
=======================================
--- /branches/bleeding_edge/src/code-stubs.h Tue Sep 10 13:50:26 2013 UTC
+++ /branches/bleeding_edge/src/code-stubs.h Wed Sep 11 06:56:47 2013 UTC
@@ -2295,7 +2295,8 @@
private:
static void EntryHookTrampoline(intptr_t function,
- intptr_t stack_pointer);
+ intptr_t stack_pointer,
+ Isolate* isolate);
Major MajorKey() { return ProfileEntryHook; }
int MinorKey() { return 0; }
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
