Changeset 38669 in webkit for trunk/JavaScriptCore/wrec/WREC.cpp

Timestamp:

Nov 21, 2008, 11:31:34 AM (17 years ago)

Author:

[email protected]

Message:

2008-11-21 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

A little more RegExp refactoring.

Moved all assembly from WREC.cpp into WRECGenerator helper functions.
This should help with portability and readability.

Removed ASSERTs after calls to executableCopy(), and changed
executableCopy() to ASSERT instead.

• assembler/X86Assembler.h: (JSC::X86Assembler::executableCopy):
• jit/JIT.cpp: (JSC::JIT::privateCompile): (JSC::JIT::privateCompileGetByIdSelf): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdChain): (JSC::JIT::privateCompilePutByIdReplace): (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::privateCompileCTIMachineTrampolines): (JSC::JIT::privateCompilePatchGetArrayLength):
• wrec/WREC.cpp: (JSC::WREC::compileRegExp):
• wrec/WRECGenerator.cpp: (JSC::WREC::Generator::generateEnter): (JSC::WREC::Generator::generateReturnSuccess): (JSC::WREC::Generator::generateSaveIndex): (JSC::WREC::Generator::generateIncrementIndex): (JSC::WREC::Generator::generateLoopIfNotEndOfInput): (JSC::WREC::Generator::generateReturnFailure):
• wrec/WRECGenerator.h:
• wrec/WRECParser.h: (JSC::WREC::Parser::ignoreCase): (JSC::WREC::Parser::generator):

File:

• trunk/JavaScriptCore/wrec/WREC.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wrec/WREC.cpp

@@ -44 +44 @@
 static const int MaxPatternSize = (1 << 16);
 
-#if COMPILER(MSVC)
-// MSVC has 3 extra arguments on the stack because it doesn't use the register calling convention.
-static const int outputParameter = 16 + sizeof(const UChar*) + sizeof(unsigned) + sizeof(unsigned);
-#else
-static const int outputParameter = 16;
-#endif
-
 CompiledRegExp compileRegExp(Interpreter* interpreter, const UString& pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase, bool multiline)
 {
@@ -60 +53 @@
     X86Assembler assembler(interpreter->assemblerBuffer());
     Parser parser(pattern, ignoreCase, multiline, assembler);
-    
-    // (0) Setup:
-    //     Preserve callee save regs and initialize output register.
-    __ convertToFastCall();
-    __ pushl_r(Generator::output);
-    __ pushl_r(Generator::character);
-    __ pushl_r(Generator::index); // load index into TOS as an argument to the top-level disjunction.
-    __ movl_mr(outputParameter, X86::esp, Generator::output);
+    Generator& generator = parser.generator();
+    JmpSrcVector failures;
 
-#ifndef NDEBUG
-    // ASSERT that the output register is not null.
-    __ testl_rr(Generator::output, Generator::output);
-    X86Assembler::JmpSrc outputNotNull = __ jne();
-    __ int3();
-    __ link(outputNotNull, __ label());
-#endif
-    
-    // Restart point for top-level disjunction.
+    generator.generateEnter();
+    generator.generateSaveIndex();
+
     Generator::JmpDst beginPattern = __ label();
-
-    // (1) Parse Pattern:
-
-    JmpSrcVector failures;
     if (!parser.parsePattern(failures)) {
         *error_ptr = "Regular expression malformed.";
         return 0;
     }
+    generator.generateReturnSuccess();
 
-    // (2) Success:
-    //     Set return value & pop registers from the stack.
-
-    __ popl_r(X86::eax);
-    __ movl_rm(X86::eax, Generator::output); // match begin
-    __ movl_rm(Generator::index, 4, Generator::output); // match end
-    __ popl_r(Generator::character);
-    __ popl_r(Generator::output);
-    __ ret();
-    
-    // (3) Failure:
-    //     All failures in the top-level disjunction link to here.
     __ link(failures, __ label());
-
-    // Move to the next input character and try again.
-    __ movl_mr(X86::esp, Generator::index);
-    __ addl_i8r(1, Generator::index);
-    __ movl_rm(Generator::index, X86::esp);
-    __ cmpl_rr(Generator::length, Generator::index);
-    __ link(__ jle(), beginPattern);
-
-    // No more input characters: return failure.
-    __ addl_i8r(4, X86::esp);
-    __ movl_i32r(-1, X86::eax);
-    __ popl_r(Generator::character);
-    __ popl_r(Generator::output);
-    __ ret();
+    generator.generateIncrementIndex();
+    generator.generateLoopIfNotEndOfInput(beginPattern);
+    generator.generateReturnFailure();
 
     *numSubpatterns_ptr = parser.numSubpatterns();
-
-    void* code = __ executableCopy();
-    ASSERT(code);
-    return reinterpret_cast<CompiledRegExp>(code);
+    return reinterpret_cast<CompiledRegExp>(__ executableCopy());
 }