Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

2 files changed, 12 insertions, 14 deletions

diff --git a/JavaScriptCore/yarr/RegexCompiler.cpp b/JavaScriptCore/yarr/RegexCompiler.cpp
index bcfc188..fa87186 100644
--- a/JavaScriptCore/yarr/RegexCompiler.cpp
+++ b/JavaScriptCore/yarr/RegexCompiler.cpp
@@ -623,7 +623,7 @@ const char* compileRegex(const UString& patternString, RegexPattern& pattern)
 
     constructor.setupOffsets();
 
-    return false;
+    return 0;
 };
 
 
diff --git a/JavaScriptCore/yarr/RegexJIT.cpp b/JavaScriptCore/yarr/RegexJIT.cpp
index 768a53d..68d3803 100644
--- a/JavaScriptCore/yarr/RegexJIT.cpp
+++ b/JavaScriptCore/yarr/RegexJIT.cpp
@@ -1241,16 +1241,18 @@ class RegexGenerator : private MacroAssembler {
             // If we get here, the alternative matched.
             if (m_pattern.m_body->m_callFrameSize)
                 addPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
-            
+
             ASSERT(index != returnRegister);
             if (m_pattern.m_body->m_hasFixedSize) {
                 move(index, returnRegister);
                 if (alternative->m_minimumSize)
                     sub32(Imm32(alternative->m_minimumSize), returnRegister);
+
+                store32(returnRegister, output);
             } else
-                pop(returnRegister);
+                load32(Address(output), returnRegister);
+
             store32(index, Address(output, 4));
-            store32(returnRegister, output);
 
             generateReturn();
 
@@ -1334,7 +1336,7 @@ class RegexGenerator : private MacroAssembler {
             if (!m_pattern.m_body->m_hasFixedSize) {
                 move(index, regT0);
                 sub32(Imm32(countCheckedForCurrentAlternative - 1), regT0);
-                poke(regT0, m_pattern.m_body->m_callFrameSize);
+                store32(regT0, Address(output));
             }
 
             // Update index if necessary, and loop (without checking).
@@ -1349,9 +1351,9 @@ class RegexGenerator : private MacroAssembler {
             if (countCheckedForCurrentAlternative - 1) {
                 move(index, regT0);
                 sub32(Imm32(countCheckedForCurrentAlternative - 1), regT0);
-                poke(regT0, m_pattern.m_body->m_callFrameSize);
+                store32(regT0, Address(output));
             } else
-                poke(index, m_pattern.m_body->m_callFrameSize);
+                store32(index, Address(output));
         }
         // Check if there is sufficent input to run the first alternative again.
         jumpIfAvailableInput(incrementForNextIter).linkTo(firstAlternativeInputChecked, this);
@@ -1377,11 +1379,8 @@ class RegexGenerator : private MacroAssembler {
         // it has either been incremented by 1 or by (countToCheckForFirstAlternative + 1) ... 
         // but since we're about to return a failure this doesn't really matter!)
 
-        unsigned frameSize = m_pattern.m_body->m_callFrameSize;
-        if (!m_pattern.m_body->m_hasFixedSize)
-            ++frameSize;
-        if (frameSize)
-            addPtr(Imm32(frameSize * sizeof(void*)), stackPointerRegister);
+        if (m_pattern.m_body->m_callFrameSize)
+            addPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
 
         move(Imm32(-1), returnRegister);
 
@@ -1451,9 +1450,8 @@ public:
     {
         generateEnter();
 
-        // TODO: do I really want this on the stack?
         if (!m_pattern.m_body->m_hasFixedSize)
-            push(index);
+            store32(index, Address(output));
 
         if (m_pattern.m_body->m_callFrameSize)
             subPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);