A64: Backend framework

29 files changed, 130 insertions, 71 deletions

diff --git a/tests/arm/fuzz_arm.cpp b/tests/A32/fuzz_arm.cpp
index 6dd9201d..d1fd1eba 100644
--- a/tests/arm/fuzz_arm.cpp
+++ b/tests/A32/fuzz_arm.cpp
@@ -28,8 +28,8 @@
 #include "frontend/ir/location_descriptor.h"
 #include "ir_opt/passes.h"
 #include "rand_int.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
 
 #ifdef __unix__
 #include <signal.h>
diff --git a/tests/arm/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp
index a2478fc4..46c7eb70 100644
--- a/tests/arm/fuzz_thumb.cpp
+++ b/tests/A32/fuzz_thumb.cpp
@@ -26,8 +26,8 @@
 #include "frontend/ir/basic_block.h"
 #include "ir_opt/passes.h"
 #include "rand_int.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
 
 struct WriteRecord {
     size_t size;
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_dec.cpp b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_dec.cpp
index f69c9d43..f563e1fe 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_dec.cpp
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_dec.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "skyeye_interpreter/dyncom/arm_dyncom_dec.h"
-#include "skyeye_interpreter/skyeye_common/armsupp.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_dec.h"
+#include "A32/skyeye_interpreter/skyeye_common/armsupp.h"
 
 const InstructionSetEncodingItem arm_instruction[] = {
     { "vmla", 5, ARMVFP2,      { 23, 27, 0x1C, 20, 21, 0x0, 9, 11, 0x5, 6, 6, 0, 4, 4, 0 }},
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_dec.h b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_dec.h
index d7170e0f..d7170e0f 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_dec.h
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_dec.h
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp
index 7b2b0662..69757ed4 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp
@@ -18,15 +18,15 @@
 
 //#include "core/memory.h"
 //#include "core/hle/svc.h"
-//#include "skyeye_interpreter/disassembler/arm_disasm.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_dec.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_thumb.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_trans.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_run.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
-#include "skyeye_interpreter/skyeye_common/armsupp.h"
-#include "skyeye_interpreter/skyeye_common/vfp/vfp.h"
+//#include "A32/skyeye_interpreter/disassembler/arm_disasm.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_dec.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_trans.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_run.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/skyeye_common/armsupp.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
 
 //#include "core/gdbstub/gdbstub.h"
 
@@ -4233,7 +4233,7 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
     }
 
     #define VFP_INTERPRETER_IMPL
-    #include "skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp"
+    #include "A32/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp"
     #undef VFP_INTERPRETER_IMPL
 
     END:
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h
index 5d5b2d52..5d5b2d52 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_run.h b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_run.h
index 9c8b11bd..165f6265 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_run.h
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_run.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
 
 /**
  * Checks if the PC is being read, and if so, word-aligns it.
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_thumb.cpp b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.cpp
index 001390bf..695276b6 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_thumb.cpp
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.cpp
@@ -7,8 +7,8 @@
 // We can provide simple Thumb simulation by decoding the Thumb instruction into its corresponding
 // ARM instruction, and using the existing ARM simulator.
 
-#include "skyeye_interpreter/dyncom/arm_dyncom_thumb.h"
-#include "skyeye_interpreter/skyeye_common/armsupp.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.h"
+#include "A32/skyeye_interpreter/skyeye_common/armsupp.h"
 
 // Decode a 16bit Thumb instruction.  The instruction is in the low 16-bits of the tinstr field,
 // with the following Thumb instruction held in the high 16-bits.  Passing in two Thumb instructions
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_thumb.h b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.h
index c1be3c73..c1be3c73 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_thumb.h
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.h
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_trans.cpp b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_trans.cpp
index feaf8b3b..e6e346f7 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_trans.cpp
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_trans.cpp
@@ -3,11 +3,11 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 
-#include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_trans.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
-#include "skyeye_interpreter/skyeye_common/armsupp.h"
-#include "skyeye_interpreter/skyeye_common/vfp/vfp.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_trans.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/skyeye_common/armsupp.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
 
 #define LOG_INFO(...) do{}while(0)
 #define LOG_TRACE(...) do{}while(0)
@@ -1971,7 +1971,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(yield)(unsigned int inst, int index)
 
 // Floating point VFPv3 instructions
 #define VFP_INTERPRETER_TRANS
-#include "skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp"
 #undef VFP_INTERPRETER_TRANS
 
 const transop_fp_t arm_instruction_trans[] = {
diff --git a/tests/skyeye_interpreter/dyncom/arm_dyncom_trans.h b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_trans.h
index a9f17b91..ce95d90b 100644
--- a/tests/skyeye_interpreter/dyncom/arm_dyncom_trans.h
+++ b/tests/A32/skyeye_interpreter/dyncom/arm_dyncom_trans.h
@@ -478,7 +478,7 @@ struct pkh_inst {
 
 // Floating point VFPv3 structures
 #define VFP_INTERPRETER_STRUCT
-#include "skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp"
 #undef VFP_INTERPRETER_STRUCT
 
 typedef void (*get_addr_fp_t)(ARMul_State *cpu, unsigned int inst, unsigned int &virt_addr);
diff --git a/tests/skyeye_interpreter/skyeye_common/arm_regformat.h b/tests/A32/skyeye_interpreter/skyeye_common/arm_regformat.h
index 38fa97ab..38fa97ab 100644
--- a/tests/skyeye_interpreter/skyeye_common/arm_regformat.h
+++ b/tests/A32/skyeye_interpreter/skyeye_common/arm_regformat.h
diff --git a/tests/skyeye_interpreter/skyeye_common/armstate.cpp b/tests/A32/skyeye_interpreter/skyeye_common/armstate.cpp
index d57d1b9e..0365ff81 100644
--- a/tests/skyeye_interpreter/skyeye_common/armstate.cpp
+++ b/tests/A32/skyeye_interpreter/skyeye_common/armstate.cpp
@@ -8,8 +8,8 @@
 
 #include <algorithm>
 #include "common/assert.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
-#include "skyeye_interpreter/skyeye_common/vfp/vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
 
 namespace Common {
 inline u16 swap16(u16 data) {return (data >> 8) | (data << 8);}
diff --git a/tests/skyeye_interpreter/skyeye_common/armstate.h b/tests/A32/skyeye_interpreter/skyeye_common/armstate.h
index 46d56754..ef5d0c5e 100644
--- a/tests/skyeye_interpreter/skyeye_common/armstate.h
+++ b/tests/A32/skyeye_interpreter/skyeye_common/armstate.h
@@ -23,7 +23,7 @@
 #include <dynarmic/A32/callbacks.h>
 
 #include "common/common_types.h"
-#include "skyeye_interpreter/skyeye_common/arm_regformat.h"
+#include "A32/skyeye_interpreter/skyeye_common/arm_regformat.h"
 
 // Signal levels
 enum {
diff --git a/tests/skyeye_interpreter/skyeye_common/armsupp.cpp b/tests/A32/skyeye_interpreter/skyeye_common/armsupp.cpp
index 2ceaf53b..d268a89a 100644
--- a/tests/skyeye_interpreter/skyeye_common/armsupp.cpp
+++ b/tests/A32/skyeye_interpreter/skyeye_common/armsupp.cpp
@@ -17,9 +17,9 @@
 
 //#include "common/logging/log.h"
 
-#include "skyeye_interpreter/skyeye_common/arm_regformat.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
-#include "skyeye_interpreter/skyeye_common/armsupp.h"
+#include "A32/skyeye_interpreter/skyeye_common/arm_regformat.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/skyeye_common/armsupp.h"
 
 // Unsigned sum of absolute difference
 u8 ARMul_UnsignedAbsoluteDifference(u8 left, u8 right)
diff --git a/tests/skyeye_interpreter/skyeye_common/armsupp.h b/tests/A32/skyeye_interpreter/skyeye_common/armsupp.h
index 391309fa..391309fa 100644
--- a/tests/skyeye_interpreter/skyeye_common/armsupp.h
+++ b/tests/A32/skyeye_interpreter/skyeye_common/armsupp.h
diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h b/tests/A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h
index 1187924f..1187924f 100644
--- a/tests/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h
+++ b/tests/A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h
diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfp.cpp b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfp.cpp
index a6b68d1b..ff594afb 100644
--- a/tests/skyeye_interpreter/skyeye_common/vfp/vfp.cpp
+++ b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfp.cpp
@@ -35,9 +35,9 @@
 #include "common/common_types.h"
 //#include "common/logging/log.h"
 
-#include "skyeye_interpreter/skyeye_common/armstate.h"
-#include "skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
-#include "skyeye_interpreter/skyeye_common/vfp/vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
 
 #define LOG_INFO(...) do{}while(0)
 #define LOG_TRACE(...) do{}while(0)
diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfp.h b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfp.h
index 6be286c9..550dc6ff 100644
--- a/tests/skyeye_interpreter/skyeye_common/vfp/vfp.h
+++ b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfp.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "skyeye_interpreter/skyeye_common/vfp/vfp_helper.h" /* for references to cdp SoftFloat functions */
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h" /* for references to cdp SoftFloat functions */
 
 #define LOG_INFO(...) do{}while(0)
 #define LOG_TRACE(...) do{}while(0)
diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h
index 2b295c58..df7e9d59 100644
--- a/tests/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h
+++ b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h
@@ -34,8 +34,8 @@
 
 #include <cstdio>
 #include "common/common_types.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
-#include "skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
 
 #define LOG_INFO(...) do{}while(0)
 #define LOG_TRACE(...) do{}while(0)
diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp
index 6c0fd68b..aeffac80 100644
--- a/tests/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp
+++ b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp
@@ -63,9 +63,9 @@
 
 #include <algorithm>
 //#include "common/logging/log.h"
-#include "skyeye_interpreter/skyeye_common/vfp/vfp.h"
-#include "skyeye_interpreter/skyeye_common/vfp/vfp_helper.h"
-#include "skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
 
 #define LOG_INFO(...) do{}while(0)
 #define LOG_TRACE(...) do{}while(0)
diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp
index 1a98d011..1a98d011 100644
--- a/tests/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp
+++ b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp
diff --git a/tests/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp
index 52de1e04..40124219 100644
--- a/tests/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp
+++ b/tests/A32/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp
@@ -69,9 +69,9 @@
 #include "common/common_types.h"
 //#include "common/logging/log.h"
 
-#include "skyeye_interpreter/skyeye_common/vfp/vfp_helper.h"
-#include "skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
-#include "skyeye_interpreter/skyeye_common/vfp/vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
+#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
 
 #define LOG_INFO(...) do{}while(0)
 #define LOG_TRACE(...) do{}while(0)
diff --git a/tests/arm/test_arm_disassembler.cpp b/tests/A32/test_arm_disassembler.cpp
index daab197b..daab197b 100644
--- a/tests/arm/test_arm_disassembler.cpp
+++ b/tests/A32/test_arm_disassembler.cpp
diff --git a/tests/arm/test_thumb_instructions.cpp b/tests/A32/test_thumb_instructions.cpp
index ee5674f6..df3bbfb7 100644
--- a/tests/arm/test_thumb_instructions.cpp
+++ b/tests/A32/test_thumb_instructions.cpp
@@ -9,8 +9,8 @@
 #include <dynarmic/A32/a32.h>
 
 #include "common/common_types.h"
-#include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
-#include "skyeye_interpreter/skyeye_common/armstate.h"
+#include "A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
+#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
 
 static u64 jit_num_ticks = 0;
 static std::array<u16, 1024> code_mem{};
diff --git a/tests/arm/vfp_vadd_f32.inc b/tests/A32/vfp_vadd_f32.inc
index d0032c2e..d0032c2e 100644
--- a/tests/arm/vfp_vadd_f32.inc
+++ b/tests/A32/vfp_vadd_f32.inc
diff --git a/tests/arm/vfp_vsub_f32.inc b/tests/A32/vfp_vsub_f32.inc
index 792dd49e..792dd49e 100644
--- a/tests/arm/vfp_vsub_f32.inc
+++ b/tests/A32/vfp_vsub_f32.inc
diff --git a/tests/A64/a64.cpp b/tests/A64/a64.cpp
new file mode 100644
index 00000000..2f5dfd23
--- /dev/null
+++ b/tests/A64/a64.cpp
@@ -0,0 +1,58 @@
+/* This file is part of the dynarmic project.
+ * Copyright (c) 2016 MerryMage
+ * This software may be used and distributed according to the terms of the GNU
+ * General Public License version 2 or any later version.
+ */
+
+#include <array>
+
+#include <catch.hpp>
+
+#include <dynarmic/A64/a64.h>
+
+#include "common/assert.h"
+#include "common/common_types.h"
+
+class TestEnv final : public Dynarmic::A64::UserCallbacks {
+    u64 ticks_left = 0;
+    std::array<u32, 3000> code_mem{};
+
+    std::uint32_t MemoryReadCode(u64 vaddr) override {
+        if (vaddr < code_mem.size() * sizeof(u32)) {
+            size_t index = vaddr / sizeof(u32);
+            return code_mem[index];
+        }
+        ASSERT_MSG(false, "MemoryReadCode(%llx)", vaddr);
+    }
+
+    std::uint8_t MemoryRead8(u64 vaddr) override { ASSERT_MSG(false, "MemoryRead8(%llx)", vaddr); }
+    std::uint16_t MemoryRead16(u64 vaddr) override { ASSERT_MSG(false, "MemoryRead16(%llx)", vaddr); }
+    std::uint32_t MemoryRead32(u64 vaddr) override { ASSERT_MSG(false, "MemoryRead32(%llx)", vaddr); }
+    std::uint64_t MemoryRead64(u64 vaddr) override { ASSERT_MSG(false, "MemoryRead64(%llx)", vaddr); }
+
+    void MemoryWrite8(u64 vaddr, std::uint8_t value) override { ASSERT_MSG(false, "MemoryWrite8(%llx, %hhi)", vaddr, value); }
+    void MemoryWrite16(u64 vaddr, std::uint16_t value) override { ASSERT_MSG(false, "MemoryWrite16(%llx, %hi)", vaddr, value); }
+    void MemoryWrite32(u64 vaddr, std::uint32_t value) override { ASSERT_MSG(false, "MemoryWrite32(%llx, %i)", vaddr, value); }
+    void MemoryWrite64(u64 vaddr, std::uint64_t value) override { ASSERT_MSG(false, "MemoryWrite64(%llx, %lli)", vaddr, value); }
+
+    void InterpreterFallback(u64 pc, size_t num_instructions) override { ASSERT_MSG(false, "InterpreterFallback(%llx, %zu)", pc, num_instructions); }
+
+    void CallSVC(std::uint32_t swi) override { ASSERT_MSG(false, "CallSVC(%u)", swi); }
+
+    void AddTicks(std::uint64_t ticks) override {
+        if (ticks > ticks_left) {
+            ticks_left = 0;
+            return;
+        }
+        ticks_left -= ticks;
+    }
+    std::uint64_t GetTicksRemaining() override {
+        return ticks_left;
+    }
+
+};
+
+TEST_CASE("A64", "[a64]") {
+    TestEnv env;
+    Dynarmic::A64::Jit jit{Dynarmic::A64::UserConfig{&env}};
+}
\ No newline at end of file
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7e779b0d..3f47eed2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,31 +1,32 @@
 add_executable(dynarmic_tests
-    arm/fuzz_arm.cpp
-    arm/fuzz_thumb.cpp
-    arm/test_arm_disassembler.cpp
-    arm/test_thumb_instructions.cpp
+    A32/fuzz_arm.cpp
+    A32/fuzz_thumb.cpp
+    A32/skyeye_interpreter/dyncom/arm_dyncom_dec.cpp
+    A32/skyeye_interpreter/dyncom/arm_dyncom_dec.h
+    A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp
+    A32/skyeye_interpreter/dyncom/arm_dyncom_interpreter.h
+    A32/skyeye_interpreter/dyncom/arm_dyncom_run.h
+    A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.cpp
+    A32/skyeye_interpreter/dyncom/arm_dyncom_thumb.h
+    A32/skyeye_interpreter/dyncom/arm_dyncom_trans.cpp
+    A32/skyeye_interpreter/dyncom/arm_dyncom_trans.h
+    A32/skyeye_interpreter/skyeye_common/arm_regformat.h
+    A32/skyeye_interpreter/skyeye_common/armstate.cpp
+    A32/skyeye_interpreter/skyeye_common/armstate.h
+    A32/skyeye_interpreter/skyeye_common/armsupp.cpp
+    A32/skyeye_interpreter/skyeye_common/armsupp.h
+    A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h
+    A32/skyeye_interpreter/skyeye_common/vfp/vfp.cpp
+    A32/skyeye_interpreter/skyeye_common/vfp/vfp.h
+    A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h
+    A32/skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp
+    A32/skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp
+    A32/skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp
+    A32/test_arm_disassembler.cpp
+    A32/test_thumb_instructions.cpp
+    A64/a64.cpp
     main.cpp
     rand_int.h
-    skyeye_interpreter/dyncom/arm_dyncom_dec.cpp
-    skyeye_interpreter/dyncom/arm_dyncom_dec.h
-    skyeye_interpreter/dyncom/arm_dyncom_interpreter.cpp
-    skyeye_interpreter/dyncom/arm_dyncom_interpreter.h
-    skyeye_interpreter/dyncom/arm_dyncom_run.h
-    skyeye_interpreter/dyncom/arm_dyncom_thumb.cpp
-    skyeye_interpreter/dyncom/arm_dyncom_thumb.h
-    skyeye_interpreter/dyncom/arm_dyncom_trans.cpp
-    skyeye_interpreter/dyncom/arm_dyncom_trans.h
-    skyeye_interpreter/skyeye_common/arm_regformat.h
-    skyeye_interpreter/skyeye_common/armstate.cpp
-    skyeye_interpreter/skyeye_common/armstate.h
-    skyeye_interpreter/skyeye_common/armsupp.cpp
-    skyeye_interpreter/skyeye_common/armsupp.h
-    skyeye_interpreter/skyeye_common/vfp/asm_vfp.h
-    skyeye_interpreter/skyeye_common/vfp/vfp.cpp
-    skyeye_interpreter/skyeye_common/vfp/vfp.h
-    skyeye_interpreter/skyeye_common/vfp/vfp_helper.h
-    skyeye_interpreter/skyeye_common/vfp/vfpdouble.cpp
-    skyeye_interpreter/skyeye_common/vfp/vfpinstr.cpp
-    skyeye_interpreter/skyeye_common/vfp/vfpsingle.cpp
 )
 
 include(CreateDirectoryGroups)