summaryrefslogtreecommitdiff
path: root/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
blob: 042a61799c11cbf5b067a034f150ffc87506dc94 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
$OpenBSD: patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm,v 1.3 2014/03/25 06:25:45 landry Exp $
https://bugs.webkit.org/show_bug.cgi?id=103128
https://bug-103128-attachments.webkit.org/attachment.cgi?id=202076
last chunk: https://bug-103128-attachments.webkit.org/attachment.cgi?id=202651
--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig	Tue Feb  4 17:38:03 2014
+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	Fri Feb 14 20:41:39 2014
@@ -1574,7 +1574,7 @@ _llint_op_get_by_pname:
     loadp JSCell::m_structure[t2], t0
     bpneq t0, JSPropertyNameIterator::m_cachedStructure[t3], .opGetByPnameSlow
     loadi 24[PC], t0
-    loadi [cfr, t0, 8], t0
+    loadi PayloadOffset[cfr, t0, 8], t0
     subi 1, t0
     biaeq t0, JSPropertyNameIterator::m_numCacheableSlots[t3], .opGetByPnameSlow
     bilt t0, JSPropertyNameIterator::m_cachedStructureInlineCapacity[t3], .opGetByPnameInlineProperty
@@ -2002,7 +2002,7 @@ _llint_op_next_pname:
     loadi 20[PC], t2
     loadi PayloadOffset[cfr, t2, 8], t2
     loadp JSPropertyNameIterator::m_jsStrings[t2], t3
-    loadi [t3, t0, 8], t3
+    loadi PayloadOffset[t3, t0, 8], t3
     addi 1, t0
     storei t0, PayloadOffset[cfr, t1, 8]
     loadi 4[PC], t1
@@ -2067,7 +2067,11 @@ macro getDeBruijnScope(deBruijinIndexOperand, scopeChe
 
     loadp CodeBlock[cfr], t1
     bineq CodeBlock::m_codeType[t1], FunctionCode, .loop
-    btbz CodeBlock::m_needsActivation[t1], .loop
+    if FOUR_BYTE_BOOL
+        btiz CodeBlock::m_needsActivation[t1], .loop
+    else
+        btbz CodeBlock::m_needsActivation[t1], .loop
+    end
 
     loadi CodeBlock::m_activationRegister[t1], t1