fix ARM64 too, theoretically

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/arm64/assemble.h b/lib/arm64/assemble.h
index 8a98b7b..1dca7eb 100644
--- a/lib/arm64/assemble.h
+++ b/lib/arm64/assemble.h
@@ -1,9 +1,15 @@
 #pragma once
 #include "dis.h"
+
+static inline int size_of_MOVi64(uint64_t val) {
+    int num_nybbles = val == 0 ? 1 : ((64 - __builtin_clzll(val) + 15) / 16);
+    return 4 * num_nybbles;
+}
+
 static inline void MOVi64(void **codep, int Rd, uint64_t val) {
     int shift_nybbles = 0;
     do {
-        int k = shift_nybbles != 0 ? 1 : 0;
+        int k = shift_nybbles != 0;
         op32(codep, 0xd2800000 | k << 29 | Rd | (val & 0xffff) << 5 |
                     shift_nybbles << 21);
         shift_nybbles++;
@@ -54,3 +60,7 @@ static inline void BR(void **codep, int reg) {
     op32(codep, 0xd61f0000 | reg << 5);
 }
 
+static inline void Bccrel(void **codep, int cc, int offset) {
+    op32(codep, 0x54000000 | (offset / 4) << 5 | cc);
+}
+