that was easy

3 files changed, 29 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index b9dd980..aaaa73e 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ endef
 $(eval $(call define_test,tdarm-simple,td-simple,$(CC) -std=c11 -DPDIS=P_dis_arm -DHDR='"dis-arm.inc.h"'))
 $(eval $(call define_test,tdthumb-simple,td-simple,$(CC) -std=c11 -DPDIS=P_dis_thumb -DHDR='"dis-thumb.inc.h"'))
 $(eval $(call define_test,tdthumb2-simple,td-simple,$(CC) -std=c11 -DPDIS=P_dis_thumb2 -DHDR='"dis-thumb2.inc.h"'))
+$(eval $(call define_test,tdarm64-simple,td-simple,$(CC) -std=c11 -DPDIS=P_dis_arm64 -DHDR='"dis-arm64.inc.h"'))
 $(eval $(call define_test,dis,dis,$(CC) -std=c11))
 $(eval $(call define_test,find-syms,find-syms,$(CC) -std=c89))
 $(eval $(call define_test,find-syms-cpp,find-syms,$(CXX) -x c++ -std=c++98))
diff --git a/lib/dis-arm64.inc.h b/lib/dis-arm64.inc.h
new file mode 100644
index 0000000..d99cae7
--- /dev/null
+++ b/lib/dis-arm64.inc.h
@@ -0,0 +1,27 @@
+static INLINE tdis_ret P(adrlabel_label_unk_Xd_1_ADR)(tdis_ctx ctx, struct bitslice Xd, struct bitslice label) {
+    return P(pcrel)(ctx, ctx->pc + sext(bs_get(label, ctx->op), 22), bs_get(Xd, ctx->op), false);
+}
+static INLINE tdis_ret P(adrplabel_label_unk_Xd_1_ADRP)(tdis_ctx ctx, struct bitslice Xd, struct bitslice label) {
+    return P(pcrel)(ctx, ctx->pc + (sext(bs_get(label, ctx->op), 22) << 12), bs_get(Xd, ctx->op), false);
+}
+static INLINE tdis_ret P(am_b_target_addr_B_1_B)(tdis_ctx ctx, struct bitslice addr) {
+    return P(branch)(ctx, ctx->pc + sext(bs_get(addr, ctx->op), 26) * 4);
+}
+static INLINE tdis_ret P(am_bl_target_addr_1_BL)(tdis_ctx ctx, struct bitslice addr) {
+    return P(branch)(ctx, ctx->pc + sext(bs_get(addr, ctx->op), 26) * 4);
+}
+static INLINE tdis_ret P(am_brcond_target_B_5_Bcc)(tdis_ctx ctx, struct bitslice target) {
+    return P(branch)(ctx, ctx->pc + sext(bs_get(target, ctx->op), 19) * 4);
+}
+static INLINE tdis_ret P(am_ldrlit_label_unk_Rt_6_LDRDl)(tdis_ctx ctx, struct bitslice Rt, struct bitslice label) {
+    return P(pcrel)(ctx, ctx->pc + sext(bs_get(label, ctx->op), 19) * 4, bs_get(Rt, ctx->op), true);
+}
+static INLINE tdis_ret P(am_tbrcond_target_B_4_TBNZW)(tdis_ctx ctx, struct bitslice target) {
+    return P(branch)(ctx, ctx->pc + sext(bs_get(target, ctx->op), 14) * 4);
+}
+
+static tdis_ret P(dis_arm64)(tdis_ctx ctx) {
+    unsigned op = ctx->op;
+    #include "../generated/transform-dis-arm64.inc.h"
+    __builtin_abort();
+}
diff --git a/test/test-td-simple.c b/test/test-td-simple.c
index 9844fbd..755102b 100644
--- a/test/test-td-simple.c
+++ b/test/test-td-simple.c
@@ -63,6 +63,7 @@ int main(UNUSED int argc, char **argv) {
     struct tc ctx;
     ctx.pc = 0xdead0000;
     ctx.op = (uint32_t) strtoll(argv[1] ? argv[1] : "deadbeef", NULL, 16);
+    ctx.newop = 0;
     PDIS(&ctx);
     printf("==> %x\n", ctx.newop);