Index: src/s390/simulator-s390.h |
diff --git a/src/s390/simulator-s390.h b/src/s390/simulator-s390.h |
index 3d3fc44d7e38b3ebfcb068f9ac73b00f5b4bb014..95a7d057722f8f7dd42a857ff6bced62221172ae 100644 |
--- a/src/s390/simulator-s390.h |
+++ b/src/s390/simulator-s390.h |
@@ -25,14 +25,16 @@ |
(entry(p0, p1, p2, p3, p4)) |
typedef int (*s390_regexp_matcher)(String*, int, const byte*, const byte*, int*, |
- int, Address, int, Isolate*); |
+ int, Address, int, void*, Isolate*); |
// Call the generated regexp code directly. The code at the entry address |
// should act as a function matching the type ppc_regexp_matcher. |
+// The ninth argument is a dummy that reserves the space used for |
+// the return address added by the ExitFrame in native calls. |
#define CALL_GENERATED_REGEXP_CODE(isolate, entry, p0, p1, p2, p3, p4, p5, p6, \ |
p7, p8) \ |
(FUNCTION_CAST<s390_regexp_matcher>(entry)(p0, p1, p2, p3, p4, p5, p6, p7, \ |
- p8)) |
+ NULL, p8)) |
// The stack limit beyond which we will throw stack overflow errors in |
// generated code. Because generated code on s390 uses the C stack, we |
@@ -1257,9 +1259,10 @@ |
#define CALL_GENERATED_REGEXP_CODE(isolate, entry, p0, p1, p2, p3, p4, p5, p6, \ |
p7, p8) \ |
- Simulator::current(isolate)->Call( \ |
- entry, 9, (intptr_t)p0, (intptr_t)p1, (intptr_t)p2, (intptr_t)p3, \ |
- (intptr_t)p4, (intptr_t)p5, (intptr_t)p6, (intptr_t)p7, (intptr_t)p8) |
+ Simulator::current(isolate)->Call(entry, 10, (intptr_t)p0, (intptr_t)p1, \ |
+ (intptr_t)p2, (intptr_t)p3, (intptr_t)p4, \ |
+ (intptr_t)p5, (intptr_t)p6, (intptr_t)p7, \ |
+ (intptr_t)NULL, (intptr_t)p8) |
// The simulator has its own stack. Thus it has a different stack limit from |
// the C-based native code. The JS-based limit normally points near the end of |