3 files changed, 14 insertions, 4 deletions
diff --git a/lib/arm64/assemble.h b/lib/arm64/assemble.h
index 00797e9..c20c219 100644
--- a/lib/arm64/assemble.h
+++ b/lib/arm64/assemble.h
@@ -47,7 +47,9 @@ static inline void ADRP_ADD(void **codep, int reg, uint64_t pc, uint64_t dpc) {
         /* ADD reg, reg, #lo */
         op32(codep, 0x91000000 | reg | reg << 5 | lo << 10);
     }
-    /* BR reg */
+}
+
+static inline void BR(void **codep, int reg) {
     op32(codep, 0xd61f0000 | reg << 5);
 }
 
diff --git a/lib/arm64/jump-patch.h b/lib/arm64/jump-patch.h
index f0f149f..c42c730 100644
--- a/lib/arm64/jump-patch.h
+++ b/lib/arm64/jump-patch.h
@@ -3,10 +3,11 @@
 #define MAX_JUMP_PATCH_SIZE 12
 #define MAX_REWRITTEN_SIZE (7 * 2 * 4) /* also conservative */
 static inline int jump_patch_size(uintptr_t pc, uintptr_t dpc,
-                                  struct arch_dis_ctx arch) {
+                                  struct arch_dis_ctx arch,
+                                  bool force) {
     intptr_t diff = (dpc & ~0xfff) - (pc & ~0xfff);
     if (!(diff >= -0x100000000 && diff < 0x100000000))
-        return -1;
+        return force ? 16 : -1;
     else if (pc & 0xfff)
         return 8;
     else
@@ -15,5 +16,11 @@ static inline int jump_patch_size(uintptr_t pc, uintptr_t dpc,
 
 static inline void make_jump_patch(void **codep, uintptr_t pc, uintptr_t dpc,
                                    struct arch_dis_ctx arch) {
-    ADRP_ADD(codep, 12 /* XXX */, pc, dpc);
+    int reg = 12; /* XXX */
+    intptr_t diff = (dpc & ~0xfff) - (pc & ~0xfff);
+    if (!(diff >= -0x100000000 && diff < 0x100000000))
+        MOVi64(codep, reg, dpc);
+    else
+        ADRP_ADD(codep, reg, pc, dpc);
+    BR(codep, reg);
 }
diff --git a/lib/arm64/transform-dis-arm64.inc.h b/lib/arm64/transform-dis-arm64.inc.h
index 3710b73..682613a 100644
--- a/lib/arm64/transform-dis-arm64.inc.h
+++ b/lib/arm64/transform-dis-arm64.inc.h
@@ -1,3 +1,4 @@
+#include "arm64/assemble.h"
 
 static NOINLINE UNUSED void transform_dis_pcrel(struct transform_dis_ctx *ctx,
         uintptr_t dpc, unsigned reg, enum pcrel_load_mode load_mode) {