Title: [205593] tags/Safari-603.1.5/Source/_javascript_Core
- Revision
- 205593
- Author
- [email protected]
- Date
- 2016-09-08 00:24:44 -0700 (Thu, 08 Sep 2016)
Log Message
Merged r205566. rdar://problem/28184766
Modified Paths
Diff
Modified: tags/Safari-603.1.5/Source/_javascript_Core/ChangeLog (205592 => 205593)
--- tags/Safari-603.1.5/Source/_javascript_Core/ChangeLog 2016-09-08 07:18:48 UTC (rev 205592)
+++ tags/Safari-603.1.5/Source/_javascript_Core/ChangeLog 2016-09-08 07:24:44 UTC (rev 205593)
@@ -1,3 +1,20 @@
+2016-09-08 Babak Shafiei <[email protected]>
+
+ Merge r205566.
+
+ 2016-09-07 Filip Pizlo <[email protected]>
+
+ Make emitAllocateWithNonNullAllocator's sub32() disallow-scratch-friendly
+ https://bugs.webkit.org/show_bug.cgi?id=161706
+
+ Reviewed by Geoffrey Garen.
+
+ You can't sub32(Addr, Reg) on not-x86 without using a scratch register. So, on those CPUs, we
+ have to do something different.
+
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::emitAllocateWithNonNullAllocator):
+
2016-09-06 Benjamin Poulain <[email protected]>
[JSC] Make ArithClz32 work with Cell arguments
Modified: tags/Safari-603.1.5/Source/_javascript_Core/jit/AssemblyHelpers.h (205592 => 205593)
--- tags/Safari-603.1.5/Source/_javascript_Core/jit/AssemblyHelpers.h 2016-09-08 07:18:48 UTC (rev 205592)
+++ tags/Safari-603.1.5/Source/_javascript_Core/jit/AssemblyHelpers.h 2016-09-08 07:24:44 UTC (rev 205593)
@@ -1427,8 +1427,15 @@
if (allocator)
add32(TrustedImm32(-allocator->cellSize()), resultGPR, scratchGPR);
else {
- move(resultGPR, scratchGPR);
- sub32(Address(allocatorGPR, MarkedAllocator::offsetOfCellSize()), scratchGPR);
+ if (isX86()) {
+ move(resultGPR, scratchGPR);
+ sub32(Address(allocatorGPR, MarkedAllocator::offsetOfCellSize()), scratchGPR);
+ } else {
+ // FIXME: We need a 3-operand sub, and ARM totally has it!
+ load32(Address(allocatorGPR, MarkedAllocator::offsetOfCellSize()), scratchGPR);
+ neg32(scratchGPR);
+ add32(resultGPR, scratchGPR);
+ }
}
negPtr(resultGPR);
store32(scratchGPR, Address(allocatorGPR, MarkedAllocator::offsetOfFreeList() + OBJECT_OFFSETOF(FreeList, remaining)));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
