diff options
Diffstat (limited to 'src/3rdparty/v8/src/mips/regexp-macro-assembler-mips.h')
-rw-r--r-- | src/3rdparty/v8/src/mips/regexp-macro-assembler-mips.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/3rdparty/v8/src/mips/regexp-macro-assembler-mips.h b/src/3rdparty/v8/src/mips/regexp-macro-assembler-mips.h index d167f62..8dd52a4 100644 --- a/src/3rdparty/v8/src/mips/regexp-macro-assembler-mips.h +++ b/src/3rdparty/v8/src/mips/regexp-macro-assembler-mips.h @@ -38,16 +38,10 @@ namespace v8 { namespace internal { -#ifdef V8_INTERPRETED_REGEXP -class RegExpMacroAssemblerMIPS: public RegExpMacroAssembler { - public: - RegExpMacroAssemblerMIPS(); - virtual ~RegExpMacroAssemblerMIPS(); -}; -#else // V8_INTERPRETED_REGEXP +#ifndef V8_INTERPRETED_REGEXP class RegExpMacroAssemblerMIPS: public NativeRegExpMacroAssembler { public: - RegExpMacroAssemblerMIPS(Mode mode, int registers_to_save); + RegExpMacroAssemblerMIPS(Mode mode, int registers_to_save, Zone* zone); virtual ~RegExpMacroAssemblerMIPS(); virtual int stack_limit_slack(); virtual void AdvanceCurrentPosition(int by); @@ -72,7 +66,6 @@ class RegExpMacroAssemblerMIPS: public NativeRegExpMacroAssembler { virtual void CheckNotBackReference(int start_reg, Label* on_no_match); virtual void CheckNotBackReferenceIgnoreCase(int start_reg, Label* on_no_match); - virtual void CheckNotRegistersEqual(int reg1, int reg2, Label* on_not_equal); virtual void CheckNotCharacter(uint32_t c, Label* on_not_equal); virtual void CheckNotCharacterAfterAnd(uint32_t c, uint32_t mask, @@ -115,10 +108,11 @@ class RegExpMacroAssemblerMIPS: public NativeRegExpMacroAssembler { virtual void ReadStackPointerFromRegister(int reg); virtual void SetCurrentPositionFromEnd(int by); virtual void SetRegister(int register_index, int to); - virtual void Succeed(); + virtual bool Succeed(); virtual void WriteCurrentPositionToRegister(int reg, int cp_offset); virtual void ClearRegisters(int reg_from, int reg_to); virtual void WriteStackPointerToRegister(int reg); + virtual bool CanReadUnaligned(); // Called from RegExp if the stack-guard is triggered. // If the code object is relocated, the return address is fixed before @@ -141,7 +135,8 @@ class RegExpMacroAssemblerMIPS: public NativeRegExpMacroAssembler { static const int kStackFrameHeader = kReturnAddress + kPointerSize; // Stack parameters placed by caller. static const int kRegisterOutput = kStackFrameHeader + 20; - static const int kStackHighEnd = kRegisterOutput + kPointerSize; + static const int kNumOutputRegisters = kRegisterOutput + kPointerSize; + static const int kStackHighEnd = kNumOutputRegisters + kPointerSize; static const int kDirectCall = kStackHighEnd + kPointerSize; static const int kIsolate = kDirectCall + kPointerSize; @@ -153,10 +148,10 @@ class RegExpMacroAssemblerMIPS: public NativeRegExpMacroAssembler { static const int kInputString = kStartIndex - kPointerSize; // When adding local variables remember to push space for them in // the frame in GetCode. - static const int kInputStartMinusOne = kInputString - kPointerSize; - static const int kAtStart = kInputStartMinusOne - kPointerSize; + static const int kSuccessfulCaptures = kInputString - kPointerSize; + static const int kInputStartMinusOne = kSuccessfulCaptures - kPointerSize; // First register address. Following registers are below it on the stack. - static const int kRegisterZero = kAtStart - kPointerSize; + static const int kRegisterZero = kInputStartMinusOne - kPointerSize; // Initial size of code buffer. static const size_t kRegExpCodeSize = 1024; |