Title: [236328] releases/WebKitGTK/webkit-2.22/Source/_javascript_Core
- Revision
- 236328
- Author
- [email protected]
- Date
- 2018-09-21 10:04:28 -0700 (Fri, 21 Sep 2018)
Log Message
Merge r236315 - [ARM] Build broken on armv7hl after r235517
https://bugs.webkit.org/show_bug.cgi?id=189831
Reviewed by Yusuke Suzuki.
Add missing implementation of patchebleBranch8() for traditional ARM.
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::patchableBranch8):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog (236327 => 236328)
--- releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog 2018-09-21 17:04:23 UTC (rev 236327)
+++ releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog 2018-09-21 17:04:28 UTC (rev 236328)
@@ -1,3 +1,15 @@
+2018-09-21 Tomas Popela <[email protected]>
+
+ [ARM] Build broken on armv7hl after r235517
+ https://bugs.webkit.org/show_bug.cgi?id=189831
+
+ Reviewed by Yusuke Suzuki.
+
+ Add missing implementation of patchebleBranch8() for traditional ARM.
+
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::patchableBranch8):
+
2018-09-19 Saam barati <[email protected]>
CheckStructureOrEmpty should pass in a tempGPR to emitStructureCheck since it may jump over that code
Modified: releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/assembler/MacroAssemblerARM.h (236327 => 236328)
--- releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2018-09-21 17:04:23 UTC (rev 236327)
+++ releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2018-09-21 17:04:28 UTC (rev 236328)
@@ -981,6 +981,13 @@
return PatchableJump(m_assembler.jmp(ARMAssembler::AL, 1));
}
+ PatchableJump patchableBranch8(RelationalCondition cond, Address address, TrustedImm32 imm)
+ {
+ TrustedImm32 imm8 = MacroAssemblerHelpers::mask8OnCondition(*this, cond, imm);
+ MacroAssemblerHelpers::load8OnCondition(*this, cond, address, dataTempRegister);
+ return patchableBranch32(cond, dataTempRegister, imm8);
+ }
+
PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm)
{
internalCompare32(reg, imm);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
