Unreviewed, really fix non-x86 LLInt build without also breaking everything else.
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Sep 2015 22:40:29 +0000 (22:40 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Sep 2015 22:40:29 +0000 (22:40 +0000)
* llint/LowLevelInterpreter64.asm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189754 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

index 3e46e47..6fe4be1 100644 (file)
@@ -1,5 +1,11 @@
 2015-09-14  Filip Pizlo  <fpizlo@apple.com>
 
+        Unreviewed, really fix non-x86 LLInt build without also breaking everything else.
+
+        * llint/LowLevelInterpreter64.asm:
+
+2015-09-14  Filip Pizlo  <fpizlo@apple.com>
+
         Unreviewed, fix non-x86 LLInt build.
 
         * llint/LowLevelInterpreter64.asm:
index cbf11e0..966a7e4 100644 (file)
@@ -468,16 +468,16 @@ macro valueProfile(value, operand, scratch)
     storeq value, ValueProfile::m_buckets[scratch]
 end
 
-macro structureIDToStructureWithScratch(structureID, structure, scratch)
+macro structureIDToStructureWithScratch(structureIDThenStructure, scratch)
     loadp CodeBlock[cfr], scratch
     loadp CodeBlock::m_vm[scratch], scratch
     loadp VM::heap + Heap::m_structureIDTable + StructureIDTable::m_table[scratch], scratch
-    loadi structureID, structure
-    loadp [scratch, structure, 8], structure
+    loadp [scratch, structureIDThenStructure, 8], structureIDThenStructure
 end
 
 macro loadStructureWithScratch(cell, structure, scratch)
-    structureIDToStructureWithScratch(JSCell::m_structureID[cell], structure, scratch)
+    loadi JSCell::m_structureID[cell], structure
+    structureIDToStructureWithScratch(structure, scratch)
 end
 
 macro loadStructureAndClobberFirstArg(cell, structure)
@@ -1273,7 +1273,7 @@ _llint_op_put_by_id:
     loadp StructureChain::m_vector[t3], t3
     assert(macro (ok) btpnz t3, ok end)
 
-    structureIDToStructureWithScratch([t2], t2, t1)
+    structureIDToStructureWithScratch(t2, t1)
     loadq Structure::m_prototype[t2], t2
     bqeq t2, ValueNull, .opPutByIdTransitionChainDone
 .opPutByIdTransitionChainLoop: