diff options
Diffstat (limited to 'deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc')
| -rw-r--r-- | deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc b/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc index 579423ff32..6ce35fff09 100644 --- a/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc +++ b/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc @@ -41,14 +41,13 @@ namespace internal { * Each call to a public method should retain this convention. * * The stack will have the following structure: - * - fp[56] Isolate* isolate (address of the current isolate) - * - fp[52] direct_call (if 1, direct call from JavaScript code, + * - fp[52] Isolate* isolate (address of the current isolate) + * - fp[48] direct_call (if 1, direct call from JavaScript code, * if 0, call through the runtime system). - * - fp[48] stack_area_base (high end of the memory area to use as + * - fp[44] stack_area_base (high end of the memory area to use as * backtracking stack). - * - fp[44] capture array size (may fit multiple sets of matches) - * - fp[40] int* capture_array (int[num_saved_registers_], for output). - * - fp[36] secondary link/return address used by native call. + * - fp[40] capture array size (may fit multiple sets of matches) + * - fp[36] int* capture_array (int[num_saved_registers_], for output). * --- sp when called --- * - fp[32] return address (lr). * - fp[28] old frame pointer (r11). @@ -81,17 +80,14 @@ namespace internal { * int start_index, * Address start, * Address end, - * Address secondary_return_address, // Only used by native call. * int* capture_output_array, + * int num_capture_registers, * byte* stack_area_base, - * bool direct_call = false) + * bool direct_call = false, + * Isolate* isolate); * The call is performed by NativeRegExpMacroAssembler::Execute() * (in regexp-macro-assembler.cc) via the CALL_GENERATED_REGEXP_CODE macro * in arm/simulator-arm.h. - * When calling as a non-direct call (i.e., from C++ code), the return address - * area is overwritten with the LR register by the RegExp code. When doing a - * direct call from generated code, the return address is placed there by - * the calling code, as in a normal exit frame. */ #define __ ACCESS_MASM(masm_) @@ -318,11 +314,11 @@ void RegExpMacroAssemblerARM::CheckNotBackReferenceIgnoreCase( __ sub(r1, r1, r4); } // Isolate. -#ifdef V8_I18N_SUPPORT +#ifdef V8_INTL_SUPPORT if (unicode) { __ mov(r3, Operand(0)); } else // NOLINT -#endif // V8_I18N_SUPPORT +#endif // V8_INTL_SUPPORT { __ mov(r3, Operand(ExternalReference::isolate_address(isolate()))); } |