8325258: Additional WebKit 617.1 fixes from WebKitGTK 2.42.5

Backport-of: a7f6de8

Author: Johan Vos

modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/ARMv7Assembler.h

@@ -571,6 +571,7 @@ class ARMv7Assembler {
         OP_BKPT             = 0xBE00,
         OP_IT               = 0xBF00,
         OP_NOP_T1           = 0xBF00,
+        OP_UDF              = 0xDE00
     } OpcodeID;
 
     typedef enum {
@@ -1008,6 +1009,11 @@ class ARMv7Assembler {
         m_formatter.oneWordOp8Imm8(OP_BKPT, imm);
     }
 
+    void udf(uint8_t imm = 0)
+    {
+        m_formatter.oneWordOp8Imm8(OP_UDF, imm);
+    }
+
     static bool isBkpt(void* address)
     {
         unsigned short expected = OP_BKPT;

modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -2651,7 +2651,7 @@ class MacroAssemblerARMv7 : public AbstractMacroAssembler<Assembler> {
 
     void breakpoint(uint8_t imm = 0)
     {
-        m_assembler.bkpt(imm);
+        m_assembler.udf(imm);
     }
 
     static bool isBreakpoint(void* address) { return ARMv7Assembler::isBkpt(address); }