Reviewers: Yang,
Description:
Merged r16656 into trunk branch.
MIPS: thread isolate for EntryHookTrampoline.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/23981007/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files (+4, -1 lines):
M src/mips/code-stubs-mips.cc
M src/version.cc
Index: src/mips/code-stubs-mips.cc
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
index
752a24c3bc894a7ad0a4872b09a61e4b14d400e9..1a1d9c8b26c87d43ad5d34e85cff79d9f868f1ac
100644
--- a/src/mips/code-stubs-mips.cc
+++ b/src/mips/code-stubs-mips.cc
@@ -6963,6 +6963,9 @@ void ProfileEntryHookStub::Generate(MacroAssembler*
masm) {
#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.
+ __ li(a2, Operand(ExternalReference::isolate_address(masm->isolate())));
+
ApiFunction dispatcher(FUNCTION_ADDR(EntryHookTrampoline));
__ li(at, Operand(ExternalReference(&dispatcher,
ExternalReference::BUILTIN_CALL,
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
076c7ef5cc7a18aba311d79f40a13a60c4e35e14..5bc63cb600408a058220f49462ff07076556acee
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 21
#define BUILD_NUMBER 13
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 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.
