| Index: runtime/vm/intrinsifier_arm.cc
|
| diff --git a/runtime/vm/intrinsifier_arm.cc b/runtime/vm/intrinsifier_arm.cc
|
| index 8a4268d8db7153f096b74ca78567b8ab157b9ff7..1e30baedbc4ede8d5e57105ac620d51663162d9f 100644
|
| --- a/runtime/vm/intrinsifier_arm.cc
|
| +++ b/runtime/vm/intrinsifier_arm.cc
|
| @@ -9,9 +9,11 @@
|
|
|
| #include "vm/assembler.h"
|
| #include "vm/cpu.h"
|
| +#include "vm/dart_entry.h"
|
| #include "vm/flow_graph_compiler.h"
|
| #include "vm/object.h"
|
| #include "vm/object_store.h"
|
| +#include "vm/regexp_assembler.h"
|
| #include "vm/symbols.h"
|
|
|
| namespace dart {
|
| @@ -1846,6 +1848,45 @@ void Intrinsifier::TwoByteString_equality(Assembler* assembler) {
|
| }
|
|
|
|
|
| +#ifndef USE_JSCRE
|
| +void Intrinsifier::JSRegExp_ExecuteMatch(Assembler* assembler) {
|
| + static const intptr_t kRegExpParamOffset = + 2 * kWordSize;
|
| + static const intptr_t kStringParamOffset = + 1 * kWordSize;
|
| + // const Smi& start_index is located at (+ 0 * kWordSize).
|
| +
|
| + // Register assignments are as follows:
|
| + // R0: The appropriate specialized matcher function.
|
| + // R2: The regexp object.
|
| + // R5: Temp.
|
| + // R1: Temp, Pointer to the function's code which we then tail-call.
|
| +
|
| + __ ldr(R2, Address(SP, kRegExpParamOffset));
|
| + __ ldr(R1, Address(SP, kStringParamOffset));
|
| +
|
| + // Load the specialized function pointer into R0. Leverage the fact the
|
| + // string CIDs as well as stored function pointers are in sequence.
|
| +
|
| + __ LoadClassId(R1, R1);
|
| + __ AddImmediate(R1, R1, -kOneByteStringCid);
|
| + __ add(R1, R2, Operand(R1, LSL, kWordSizeLog2));
|
| + __ ldr(R0, FieldAddress(R1, JSRegExp::function_offset(kOneByteStringCid)));
|
| +
|
| + // Registers have been set up for the lazy compile stub at this point.
|
| + // It expects the function in R0, the argument descriptor in R4, and
|
| + // IC-Data in R5. Explicitly null out IC-Data to ensure its validity.
|
| +
|
| + static const intptr_t arg_count = RegExpMacroAssembler::kParamCount;
|
| + __ LoadObject(R4, Array::Handle(ArgumentsDescriptor::New(arg_count)));
|
| + __ eor(R5, R5, Operand(R5));
|
| +
|
| + // Tail-call the function.
|
| + __ ldr(R1, FieldAddress(R0, Function::instructions_offset()));
|
| + __ AddImmediate(R1, Instructions::HeaderSize() - kHeapObjectTag);
|
| + __ bx(R1);
|
| +}
|
| +#endif
|
| +
|
| +
|
| // On stack: user tag (+0).
|
| void Intrinsifier::UserTag_makeCurrent(Assembler* assembler) {
|
| // R1: Isolate.
|
|
|