Title: [195222] releases/WebKitGTK/webkit-2.10/Source/_javascript_Core
- Revision
- 195222
- Author
- [email protected]
- Date
- 2016-01-18 05:33:56 -0800 (Mon, 18 Jan 2016)
Log Message
Merge r194713 - [mips] Make repatchCall public to fix compilation.
https://bugs.webkit.org/show_bug.cgi?id=152843
Patch by Konstantin Tokarev <[email protected]> on 2016-01-07
Reviewed by Michael Saboff.
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::repatchCall):
(JSC::MacroAssemblerMIPS::linkCall): Deleted.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog (195221 => 195222)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2016-01-18 13:33:07 UTC (rev 195221)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2016-01-18 13:33:56 UTC (rev 195222)
@@ -1,5 +1,16 @@
2016-01-07 Konstantin Tokarev <[email protected]>
+ [mips] Make repatchCall public to fix compilation.
+ https://bugs.webkit.org/show_bug.cgi?id=152843
+
+ Reviewed by Michael Saboff.
+
+ * assembler/MacroAssemblerMIPS.h:
+ (JSC::MacroAssemblerMIPS::repatchCall):
+ (JSC::MacroAssemblerMIPS::linkCall): Deleted.
+
+2016-01-07 Konstantin Tokarev <[email protected]>
+
[mips] Replaced subi with addi in getHostCallReturnValue
https://bugs.webkit.org/show_bug.cgi?id=152841
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (195221 => 195222)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2016-01-18 13:33:07 UTC (rev 195221)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h 2016-01-18 13:33:56 UTC (rev 195222)
@@ -2809,7 +2809,16 @@
UNREACHABLE_FOR_PLATFORM();
}
+ static void repatchCall(CodeLocationCall call, CodeLocationLabel destination)
+ {
+ MIPSAssembler::relinkCall(call.dataLocation(), destination.executableAddress());
+ }
+ static void repatchCall(CodeLocationCall call, FunctionPtr destination)
+ {
+ MIPSAssembler::relinkCall(call.dataLocation(), destination.executableAddress());
+ }
+
private:
// If m_fixedWidth is true, we will generate a fixed number of instructions.
// Otherwise, we can emit any number of instructions.
@@ -2823,16 +2832,6 @@
MIPSAssembler::linkCall(code, call.m_label, function.value());
}
- static void repatchCall(CodeLocationCall call, CodeLocationLabel destination)
- {
- MIPSAssembler::relinkCall(call.dataLocation(), destination.executableAddress());
- }
-
- static void repatchCall(CodeLocationCall call, FunctionPtr destination)
- {
- MIPSAssembler::relinkCall(call.dataLocation(), destination.executableAddress());
- }
-
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
