Changeset 173886 in webkit

Timestamp:

Sep 23, 2014 1:21:51 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[CLoop] - Fix CLoop on the 32-bit Big-Endians
​https://bugs.webkit.org/show_bug.cgi?id=137020

Patch by Tomas Popela <​tpopela@redhat.com> on 2014-09-23
Reviewed by Mark Lam.

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.asm (modified) (2 diffs)
• llint/LowLevelInterpreter32_64.asm (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-09-23  Tomas Popela  <tpopela@redhat.com>
+
+        [CLoop] - Fix CLoop on the 32-bit Big-Endians
+        https://bugs.webkit.org/show_bug.cgi?id=137020
+
+        Reviewed by Mark Lam.
+
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter32_64.asm:
+
 2014-09-23  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -534 +534 @@
 
 macro functionForCallCodeBlockGetter(targetRegister)
-    loadp Callee[cfr], targetRegister
+    if JSVALUE64
+        loadp Callee[cfr], targetRegister
+    else
+        loadp Callee + PayloadOffset[cfr], targetRegister
+    end
     loadp JSFunction::m_executable[targetRegister], targetRegister
     loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
@@ -540 +544 @@
 
 macro functionForConstructCodeBlockGetter(targetRegister)
-    loadp Callee[cfr], targetRegister
+    if JSVALUE64
+        loadp Callee[cfr], targetRegister
+    else
+        loadp Callee + PayloadOffset[cfr], targetRegister
+    end
     loadp JSFunction::m_executable[targetRegister], targetRegister
     loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -393 +393 @@
     loadp VM::callFrameForThrow[t3], cfr
 
-    loadp CallerFrame + PayloadOffset[cfr], cfr
+    loadp CallerFrame[cfr], cfr
 
     if ARMv7
@@ -690 +690 @@
 
 macro branchIfException(label)
-    loadp Callee[cfr], t3
+    loadp Callee + PayloadOffset[cfr], t3
     andp MarkedBlockMask, t3
     loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
@@ -2137 +2137 @@
         checkStackPointerAlignment(t3, 0xdead0001)
         call executableOffsetToFunction[t1]
-        loadp Callee[cfr], t3
+        loadp Callee + PayloadOffset[cfr], t3
         andp MarkedBlockMask, t3
         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
@@ -2160 +2160 @@
             call executableOffsetToFunction[t1]
         end
-        loadp Callee[cfr], t3
+        loadp Callee + PayloadOffset[cfr], t3
         andp MarkedBlockMask, t3
         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
@@ -2198 +2198 @@
     loadisFromInstruction(4, t2)
 
-    loadp ScopeChain[cfr], t0
+    loadp ScopeChain + PayloadOffset[cfr], t0
     btiz t2, .resolveScopeLoopEnd
 
@@ -2257 +2257 @@
 macro loadWithStructureCheck(operand, slowPath)
     loadisFromInstruction(operand, t0)
-    loadp [cfr, t0, 8], t0
+    loadp PayloadOffset[cfr, t0, 8], t0
     loadpFromInstruction(5, t1)
     bpneq JSCell::m_structureID[t0], t1, slowPath