Index: src/ia32/regexp-macro-assembler-ia32.h |
diff --git a/src/ia32/regexp-macro-assembler-ia32.h b/src/ia32/regexp-macro-assembler-ia32.h |
index d11439299cbf322934a9ab5625e239293640da61..5ffd46275310b3993d9ae2bad4eaabbc8bf8c7c3 100644 |
--- a/src/ia32/regexp-macro-assembler-ia32.h |
+++ b/src/ia32/regexp-macro-assembler-ia32.h |
@@ -107,6 +107,13 @@ class RegExpMacroAssemblerIA32: public NativeRegExpMacroAssembler { |
virtual void ClearRegisters(int reg_from, int reg_to); |
virtual void WriteStackPointerToRegister(int reg); |
+ // Called from RegExp if the stack-guard is triggered. |
+ // If the code object is relocated, the return address is fixed before |
+ // returning. |
+ static int CheckStackGuardState(Address* return_address, |
+ Code* re_code, |
+ Address re_frame); |
+ |
private: |
// Offsets from ebp of function parameters and stored registers. |
static const int kFramePointer = 0; |
@@ -144,23 +151,9 @@ class RegExpMacroAssemblerIA32: public NativeRegExpMacroAssembler { |
// Check whether we are exceeding the stack limit on the backtrack stack. |
void CheckStackLimit(); |
- // Called from RegExp if the stack-guard is triggered. |
- // If the code object is relocated, the return address is fixed before |
- // returning. |
- static int CheckStackGuardState(Address* return_address, |
- Code* re_code, |
- Address re_frame); |
- |
// Generate a call to CheckStackGuardState. |
void CallCheckStackGuardState(Register scratch); |
- // Called from RegExp if the backtrack stack limit is hit. |
- // Tries to expand the stack. Returns the new stack-pointer if |
- // successful, and updates the stack_top address, or returns 0 if unable |
- // to grow the stack. |
- // This function must not trigger a garbage collection. |
- static Address GrowStack(Address stack_pointer, Address* stack_top); |
- |
// The ebp-relative location of a regexp register. |
Operand register_location(int register_index); |
@@ -209,7 +202,7 @@ class RegExpMacroAssemblerIA32: public NativeRegExpMacroAssembler { |
// by FrameAlign. The called function is not allowed to trigger a garbage |
// collection, since that might move the code and invalidate the return |
// address (unless this is somehow accounted for). |
- inline void CallCFunction(Address function_address, int num_arguments); |
+ inline void CallCFunction(ExternalReference function, int num_arguments); |
MacroAssembler* masm_; |