     return w;
  }
  
-@@ -12598,7 +12616,7 @@ DisResult disInstr_ARM_WRK (
+@@ -12598,7 +12616,7 @@
     /* At least this is simple on ARM: insns are all 4 bytes long, and
        4-aligned.  So just fish the whole thing out of memory right now
        and have done. */

                                                /* orr r12,r12,r12 */) {
             /*  branch-and-link-to-noredir R4 */
             DIP("branch-and-link-to-noredir r4\n");
@@ -14867,7 +14885,7 @@ DisResult disInstr_THUMB_WRK (
          }
          /* We don't know what it is.  Set insn0 so decode_failure
             can print the insn following the Special-insn preamble. */

                                                /* orr r11,r11,r11 */) {
             /* R3 = guest_NRADDR */
             DIP("r3 = guest_NRADDR\n");
@@ -12646,7 +12664,7 @@
             goto decode_success;
          }
          else
