Changeset 36300 in webkit for trunk/JavaScriptCore/VM/CTI.cpp

Timestamp:

Sep 9, 2008, 1:44:00 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-09 Cameron Zwarich <​[email protected]>

Reviewed by Maciej Stachowiak.

Clean up the WREC code some more.

• VM/CTI.cpp: (JSC::CTI::compileRegExp):
• wrec/WREC.cpp: (JSC::getCharacterClassNewline): (JSC::getCharacterClassDigits): (JSC::getCharacterClassSpaces): (JSC::getCharacterClassWordchar): (JSC::getCharacterClassNondigits): (JSC::getCharacterClassNonspaces): (JSC::getCharacterClassNonwordchar): (JSC::WRECGenerator::generateBacktrack1): (JSC::WRECGenerator::generateBacktrackBackreference): (JSC::WRECGenerator::generateBackreferenceQuantifier): (JSC::WRECGenerator::generateNonGreedyQuantifier): (JSC::WRECGenerator::generateGreedyQuantifier): (JSC::WRECGenerator::generatePatternCharacter): (JSC::WRECGenerator::generateCharacterClassInvertedRange): (JSC::WRECGenerator::generateCharacterClassInverted): (JSC::WRECGenerator::generateCharacterClass): (JSC::WRECGenerator::generateParentheses): (JSC::WRECGenerator::gererateParenthesesResetTrampoline): (JSC::WRECGenerator::generateAssertionBOL): (JSC::WRECGenerator::generateAssertionEOL): (JSC::WRECGenerator::generateAssertionWordBoundary): (JSC::WRECGenerator::generateBackreference): (JSC::WRECGenerator::gernerateDisjunction): (JSC::WRECParser::parseCharacterClass): (JSC::WRECParser::parseEscape): (JSC::WRECParser::parseTerm):
• wrec/WREC.h:

File:

• trunk/JavaScriptCore/VM/CTI.cpp (modified) (6 diffs)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -1846 +1846 @@
     jit.emitConvertToFastCall();
     // (0) Setup:
-    //     Preserve regs & initialize OUTPUT_REG.
-    jit.emitPushl_r(WRECGenerator::OUTPUT_REG);
-    jit.emitPushl_r(WRECGenerator::CURR_VAL_REG);
+    //     Preserve regs & initialize outputRegister.
+    jit.emitPushl_r(WRECGenerator::outputRegister);
+    jit.emitPushl_r(WRECGenerator::currentValueRegister);
     // push pos onto the stack, both to preserve and as a parameter available to parseDisjunction
-    jit.emitPushl_r(WRECGenerator::CURR_POS_REG);
+    jit.emitPushl_r(WRECGenerator::currentPositionRegister);
     // load output pointer
     jit.emitMovl_mr(16
@@ -1856 +1856 @@
                     + 3 * sizeof(void*)
 #endif
-                    , MacroAssembler::esp, WRECGenerator::OUTPUT_REG);
+                    , MacroAssembler::esp, WRECGenerator::outputRegister);
     
     // restart point on match fail.
@@ -1878 +1878 @@
     //     Set return value & pop registers from the stack.
 
-    jit.emitTestl_rr(WRECGenerator::OUTPUT_REG, WRECGenerator::OUTPUT_REG);
+    jit.emitTestl_rr(WRECGenerator::outputRegister, WRECGenerator::outputRegister);
     WRECGenerator::JmpSrc noOutput = jit.emitUnlinkedJe();
 
-    jit.emitMovl_rm(WRECGenerator::CURR_POS_REG, 4, WRECGenerator::OUTPUT_REG);
+    jit.emitMovl_rm(WRECGenerator::currentPositionRegister, 4, WRECGenerator::outputRegister);
     jit.emitPopl_r(MacroAssembler::eax);
-    jit.emitMovl_rm(MacroAssembler::eax, WRECGenerator::OUTPUT_REG);
-    jit.emitPopl_r(WRECGenerator::CURR_VAL_REG);
-    jit.emitPopl_r(WRECGenerator::OUTPUT_REG);
+    jit.emitMovl_rm(MacroAssembler::eax, WRECGenerator::outputRegister);
+    jit.emitPopl_r(WRECGenerator::currentValueRegister);
+    jit.emitPopl_r(WRECGenerator::outputRegister);
     jit.emitRet();
     
@@ -1891 +1891 @@
     
     jit.emitPopl_r(MacroAssembler::eax);
-    jit.emitMovl_rm(MacroAssembler::eax, WRECGenerator::OUTPUT_REG);
-    jit.emitPopl_r(WRECGenerator::CURR_VAL_REG);
-    jit.emitPopl_r(WRECGenerator::OUTPUT_REG);
+    jit.emitMovl_rm(MacroAssembler::eax, WRECGenerator::outputRegister);
+    jit.emitPopl_r(WRECGenerator::currentValueRegister);
+    jit.emitPopl_r(WRECGenerator::outputRegister);
     jit.emitRet();
 
@@ -1904 +1904 @@
     failures.clear();
 
-    jit.emitMovl_mr(MacroAssembler::esp, WRECGenerator::CURR_POS_REG);
-    jit.emitAddl_i8r(1, WRECGenerator::CURR_POS_REG);
-    jit.emitMovl_rm(WRECGenerator::CURR_POS_REG, MacroAssembler::esp);
-    jit.emitCmpl_rr(WRECGenerator::LENGTH_REG, WRECGenerator::CURR_POS_REG);
+    jit.emitMovl_mr(MacroAssembler::esp, WRECGenerator::currentPositionRegister);
+    jit.emitAddl_i8r(1, WRECGenerator::currentPositionRegister);
+    jit.emitMovl_rm(WRECGenerator::currentPositionRegister, MacroAssembler::esp);
+    jit.emitCmpl_rr(WRECGenerator::lengthRegister, WRECGenerator::currentPositionRegister);
     jit.link(jit.emitUnlinkedJle(), nextLabel);
 
@@ -1913 +1913 @@
 
     jit.emitMovl_i32r(-1, MacroAssembler::eax);
-    jit.emitPopl_r(WRECGenerator::CURR_VAL_REG);
-    jit.emitPopl_r(WRECGenerator::OUTPUT_REG);
+    jit.emitPopl_r(WRECGenerator::currentValueRegister);
+    jit.emitPopl_r(WRECGenerator::outputRegister);
     jit.emitRet();