Title: [195215] releases/WebKitGTK/webkit-2.10/Source/_javascript_Core
- Revision
- 195215
- Author
- [email protected]
- Date
- 2016-01-18 05:08:58 -0800 (Mon, 18 Jan 2016)
Log Message
Merge r194699 - [mips] Add two missing abortWithReason implementations
https://bugs.webkit.org/show_bug.cgi?id=136753
Patch by Julien Brianceau <[email protected]> on 2016-01-07
Reviewed by Benjamin Poulain.
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::memoryFence):
(JSC::MacroAssemblerMIPS::abortWithReason):
(JSC::MacroAssemblerMIPS::readCallTarget):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog (195214 => 195215)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2016-01-18 13:08:13 UTC (rev 195214)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2016-01-18 13:08:58 UTC (rev 195215)
@@ -1,3 +1,15 @@
+2016-01-07 Julien Brianceau <[email protected]>
+
+ [mips] Add two missing abortWithReason implementations
+ https://bugs.webkit.org/show_bug.cgi?id=136753
+
+ Reviewed by Benjamin Poulain.
+
+ * assembler/MacroAssemblerMIPS.h:
+ (JSC::MacroAssemblerMIPS::memoryFence):
+ (JSC::MacroAssemblerMIPS::abortWithReason):
+ (JSC::MacroAssemblerMIPS::readCallTarget):
+
2016-01-06 Julien Brianceau <[email protected]>
[mips] Fix branchTruncateDoubleToUint32 implementation in macro assembler
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (195214 => 195215)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2016-01-18 13:08:13 UTC (rev 195214)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2016-01-18 13:08:58 UTC (rev 195215)
@@ -2758,6 +2758,18 @@
m_assembler.sync();
}
+ void abortWithReason(AbortReason reason)
+ {
+ move(TrustedImm32(reason), dataTempRegister);
+ breakpoint();
+ }
+
+ void abortWithReason(AbortReason reason, intptr_t misc)
+ {
+ move(TrustedImm32(misc), immTempRegister);
+ abortWithReason(reason);
+ }
+
static FunctionPtr readCallTarget(CodeLocationCall call)
{
return FunctionPtr(reinterpret_cast<void(*)()>(MIPSAssembler::readCallTarget(call.dataLocation())));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
