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

Timestamp:

Nov 20, 2008, 9:38:50 AM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

A little more WREC refactoring.

Removed the "Register" suffix from register names in WREC, and renamed:

currentPosition => index
currentValue => character
quantifierCount => repeatCount

Added a top-level parsePattern function to the WREC parser, which
allowed me to remove the error() and atEndOfPattern() accessors.

Factored out an MSVC customization into a constant.

Renamed nextLabel => beginPattern.

• wrec/WREC.cpp: (JSC::WREC::compileRegExp):
• wrec/WRECGenerator.cpp: (JSC::WREC::Generator::generateBacktrack1): (JSC::WREC::Generator::generateBacktrackBackreference): (JSC::WREC::Generator::generateBackreferenceQuantifier): (JSC::WREC::Generator::generateNonGreedyQuantifier): (JSC::WREC::Generator::generateGreedyQuantifier): (JSC::WREC::Generator::generatePatternCharacter): (JSC::WREC::Generator::generateCharacterClassInvertedRange): (JSC::WREC::Generator::generateCharacterClassInverted): (JSC::WREC::Generator::generateCharacterClass): (JSC::WREC::Generator::generateParentheses): (JSC::WREC::Generator::generateParenthesesResetTrampoline): (JSC::WREC::Generator::generateAssertionBOL): (JSC::WREC::Generator::generateAssertionEOL): (JSC::WREC::Generator::generateAssertionWordBoundary): (JSC::WREC::Generator::generateBackreference): (JSC::WREC::Generator::generateDisjunction): (JSC::WREC::Generator::terminateDisjunction):
• wrec/WRECGenerator.h:
• wrec/WRECParser.h: (JSC::WREC::Parser::parsePattern):

File:

• trunk/JavaScriptCore/wrec/WREC.cpp (modified) (3 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)
 {
@@ -54 +61 @@
     Parser parser(pattern, ignoreCase, multiline, assembler);
     
+    // (0) Setup:
+    //     Preserve callee save regs and initialize output register.
     __ convertToFastCall();
-    // (0) Setup:
-    //     Preserve regs & initialize outputRegister.
-    __ pushl_r(Generator::outputRegister);
-    __ pushl_r(Generator::currentValueRegister);
-    // push pos onto the stack, both to preserve and as a parameter available to parseDisjunction
-    __ pushl_r(Generator::currentPositionRegister);
-    // load output pointer
-    __ movl_mr(16
-#if COMPILER(MSVC)
-                    + 3 * sizeof(void*)
-#endif
-                    , X86::esp, Generator::outputRegister);
+    __ 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);
 
 #ifndef NDEBUG
     // ASSERT that the output register is not null.
-    __ testl_rr(Generator::outputRegister, Generator::outputRegister);
-    X86Assembler::JmpSrc outputRegisterNotNull = __ jne();
+    __ testl_rr(Generator::output, Generator::output);
+    X86Assembler::JmpSrc outputNotNull = __ jne();
     __ int3();
-    __ link(outputRegisterNotNull, __ label());
+    __ link(outputNotNull, __ label());
 #endif
     
-    // restart point on match fail.
-    Generator::JmpDst nextLabel = __ label();
+    // Restart point for top-level disjunction.
+    Generator::JmpDst beginPattern = __ label();
 
-    // (1) Parse Disjunction:
-    
+    // (1) Parse Pattern:
+
     JmpSrcVector failures;
-    parser.parseDisjunction(failures);
-
-    // Parsing the disjunction should fully consume the pattern.
-    if (!parser.atEndOfPattern() || parser.error()) {
+    if (!parser.parsePattern(failures)) {
         *error_ptr = "Regular expression malformed.";
         return 0;
@@ -93 +91 @@
     //     Set return value & pop registers from the stack.
 
-    __ movl_rm(Generator::currentPositionRegister, 4, Generator::outputRegister);
     __ popl_r(X86::eax);
-    __ movl_rm(X86::eax, Generator::outputRegister);
-    __ popl_r(Generator::currentValueRegister);
-    __ popl_r(Generator::outputRegister);
+    __ 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 fails link to here.
-    Generator::JmpDst here = __ label();
+    //     All top-level failures link to here.
+    Generator::JmpDst failure = __ label();
     for (unsigned i = 0; i < failures.size(); ++i)
-        __ link(failures[i], here);
+        __ link(failures[i], failure);
     failures.clear();
 
     // Move to the next input character and try again.
-    __ movl_mr(X86::esp, Generator::currentPositionRegister);
-    __ addl_i8r(1, Generator::currentPositionRegister);
-    __ movl_rm(Generator::currentPositionRegister, X86::esp);
-    __ cmpl_rr(Generator::lengthRegister, Generator::currentPositionRegister);
-    __ link(__ jle(), nextLabel);
+    __ 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::currentValueRegister);
-    __ popl_r(Generator::outputRegister);
+    __ popl_r(Generator::character);
+    __ popl_r(Generator::output);
     __ ret();