Implement public header files

src/CMakeLists.txt

@@ -1,6 +1,3 @@
-include_directories(.)
-include(CreateDirectoryGroups)
-
 set(SRCS
     backend_x64/abi.cpp
     backend_x64/block_of_code.cpp
@@ -39,6 +36,9 @@ set(SRCS
     )
 
 set(HEADERS
+    ../include/dynarmic/dynarmic.h
+    ../include/dynarmic/callbacks.h
+    ../include/dynarmic/disassembler.h
     backend_x64/abi.h
     backend_x64/block_of_code.h
     backend_x64/emit_x64.h
@@ -54,8 +54,8 @@ set(HEADERS
     common/mp.h
     common/scope_exit.h
     common/string_util.h
-    frontend/arm_types.h
     frontend/arm/FPSCR.h
+    frontend/arm_types.h
     frontend/decoder/arm.h
     frontend/decoder/decoder_detail.h
     frontend/decoder/thumb16.h
@@ -70,10 +70,14 @@ set(HEADERS
     frontend/ir/value.h
     frontend/translate/translate.h
     frontend/translate/translate_arm/translate_arm.h
-    interface/interface.h
     ir_opt/passes.h
     )
 
+include(CreateDirectoryGroups)
 create_directory_groups(${SRCS} ${HEADERS})
+
 add_library(dynarmic STATIC ${SRCS} ${HEADERS})
 set_target_properties(dynarmic PROPERTIES LINKER_LANGUAGE CXX)
+target_include_directories(dynarmic
+                           PUBLIC ../include
+                           PRIVATE .)

src/backend_x64/emit_x64.h

@@ -15,11 +15,11 @@
 
 #include "backend_x64/block_of_code.h"
 #include "backend_x64/reg_alloc.h"
+#include "dynarmic/callbacks.h"
 #include "frontend/arm_types.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/microinstruction.h"
 #include "frontend/ir/terminal.h"
-#include "interface/interface.h"
 
 namespace Dynarmic {
 namespace BackendX64 {

src/backend_x64/interface_x64.cpp

@@ -19,9 +19,9 @@
 #include "common/common_types.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
+#include "dynarmic/dynarmic.h"
 #include "frontend/arm_types.h"
 #include "frontend/translate/translate.h"
-#include "interface/interface.h"
 #include "ir_opt/passes.h"
 
 namespace Dynarmic {

src/interface/interface.h

@@ -1,108 +0,0 @@
-/* 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.
- */
-
-#pragma once
-
-#include <memory>
-
-#include "common/common_types.h"
-
-namespace Dynarmic {
-
-namespace Arm {
-struct LocationDescriptor;
-}
-
-class Jit;
-
-/// These function pointers may be inserted into compiled code.
-struct UserCallbacks {
-    u8 (*MemoryRead8)(u32 vaddr);
-    u16 (*MemoryRead16)(u32 vaddr);
-    u32 (*MemoryRead32)(u32 vaddr);
-    u64 (*MemoryRead64)(u32 vaddr);
-
-    void (*MemoryWrite8)(u32 vaddr, u8 value);
-    void (*MemoryWrite16)(u32 vaddr, u16 value);
-    void (*MemoryWrite32)(u32 vaddr, u32 value);
-    void (*MemoryWrite64)(u32 vaddr, u64 value);
-
-    bool (*IsReadOnlyMemory)(u32 vaddr);
-
-    /// The intrepreter must execute only one instruction at PC.
-    void (*InterpreterFallback)(u32 pc, Jit* jit);
-
-    bool (*CallSVC)(u32 swi);
-};
-
-class Jit final {
-public:
-    explicit Jit(Dynarmic::UserCallbacks callbacks);
-    ~Jit();
-
-    /**
-     * Runs the emulated CPU for about cycle_count cycles.
-     * Cannot be recursively called.
-     * @param cycle_count Estimated number of cycles to run the CPU for.
-     * @returns Actual cycle count.
-     */
-    size_t Run(size_t cycle_count);
-
-    /**
-     * Clears the code cache of all compiled code.
-     * Cannot be called from a callback.
-     * @param poison_memory If true, poisons memory to crash if any stray code pointers are called.
-     */
-    void ClearCache(bool poison_memory = true);
-
-    /**
-     * Reset CPU state to state at startup. Does not clear code cache.
-     * Cannot be called from a callback.
-     */
-    void Reset();
-
-    /**
-     * Stops execution in Jit::Run.
-     * Can only be called from a callback.
-     */
-    void HaltExecution();
-
-    /// View and modify registers.
-    std::array<u32, 16>& Regs();
-    const std::array<u32, 16>& Regs() const;
-    std::array<u32, 64>& ExtRegs();
-    const std::array<u32, 64>& ExtRegs() const;
-
-    /// View and modify CPSR.
-    u32& Cpsr();
-    u32 Cpsr() const;
-
-    /// View and modify FPSCR.
-    u32 Fpscr() const;
-    void SetFpscr(u32 value) const;
-
-    /**
-     * Returns true if Jit::Run was called but hasn't returned yet.
-     * i.e.: We're in a callback.
-     */
-    bool IsExecuting() const {
-        return is_executing;
-    }
-
-    /**
-     * @param descriptor Basic block descriptor.
-     * @return A string containing disassembly of the host machine code produced for the basic block.
-     */
-    std::string Disassemble(const Arm::LocationDescriptor& descriptor);
-
-private:
-    bool is_executing = false;
-
-    struct Impl;
-    std::unique_ptr<Impl> impl;
-};
-
-} // namespace Dynarmic