| Index: src/arm/simulator-arm.h
|
| diff --git a/src/arm/simulator-arm.h b/src/arm/simulator-arm.h
|
| index 585f1e01767cb3f2ef66f6a2295e2293bc57dc3d..d1cad15bd04213036d8013ac140cfbb500d4bf85 100644
|
| --- a/src/arm/simulator-arm.h
|
| +++ b/src/arm/simulator-arm.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2011 the V8 project authors. All rights reserved.
|
| +// Copyright 2012 the V8 project authors. All rights reserved.
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| // met:
|
| @@ -49,16 +49,16 @@ namespace internal {
|
| (entry(p0, p1, p2, p3, p4))
|
|
|
| typedef int (*arm_regexp_matcher)(String*, int, const byte*, const byte*,
|
| - void*, int*, Address, int, Isolate*);
|
| + void*, int*, int, Address, int, Isolate*);
|
|
|
|
|
| // Call the generated regexp code directly. The code at the entry address
|
| // should act as a function matching the type arm_regexp_matcher.
|
| // The fifth 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(entry, p0, p1, p2, p3, p4, p5, p6, p7) \
|
| +#define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6, p7, p8) \
|
| (FUNCTION_CAST<arm_regexp_matcher>(entry)( \
|
| - p0, p1, p2, p3, NULL, p4, p5, p6, p7))
|
| + p0, p1, p2, p3, NULL, p4, p5, p6, p7, p8))
|
|
|
| #define TRY_CATCH_FROM_ADDRESS(try_catch_address) \
|
| reinterpret_cast<TryCatch*>(try_catch_address)
|
| @@ -401,9 +401,9 @@ class Simulator {
|
| reinterpret_cast<Object*>(Simulator::current(Isolate::Current())->Call( \
|
| FUNCTION_ADDR(entry), 5, p0, p1, p2, p3, p4))
|
|
|
| -#define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6, p7) \
|
| +#define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6, p7, p8) \
|
| Simulator::current(Isolate::Current())->Call( \
|
| - entry, 9, p0, p1, p2, p3, NULL, p4, p5, p6, p7)
|
| + entry, 10, p0, p1, p2, p3, NULL, p4, p5, p6, p7, p8)
|
|
|
| #define TRY_CATCH_FROM_ADDRESS(try_catch_address) \
|
| try_catch_address == NULL ? \
|
|
|