VAmiga imp theblacklotus#2

Author: dartfnm

CMakeLists.txt

@@ -18,24 +18,27 @@ set(CMAKE_CXX_EXTENSIONS False)
 set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 set(CAPSTONE_M68K_SUPPORT ON CACHE BOOL "" FORCE)
 
-include(scripts/cmake/format_sources.cmake)
+
+# Include CMake helper utils
 include(scripts/cmake/compile_options.cmake)
+include(scripts/cmake/format_sources.cmake)
 include(external/sdl2/sdl2.cmake)
 
-# Libraries
+
+# Include CMakelists.txt libraries
+set(UAE_CUSTOM_IMPL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/uae_lib_imp" CACHE INTERNAL "Path to UAE custom implementation directory")
+add_subdirectory(libs/uae_lib)
 add_subdirectory(external/zlib)
 add_subdirectory(external/ADFlib)
 add_subdirectory(external/dear_imgui)
 add_subdirectory(external/EASTL)
 add_subdirectory(external/capstone)
 add_subdirectory(external/nativefiledialog-extended) #nfd
 add_subdirectory(libs/qd)
-add_subdirectory(libs/vAmiga)
 add_subdirectory(libs/amDebugger)
 add_subdirectory(libs/exprParser)
-
-set(UAE_CUSTOM_IMPL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/uae_lib_imp" CACHE INTERNAL "Path to UAE custom implementation directory")
-add_subdirectory(libs/uae_lib)
+add_subdirectory(libs/vAmiga)
+add_subdirectory(libs/vamiga_imp_lib)
 
 # Quasar *.h/cpp files
 file(GLOB_RECURSE QUAESAR_SOURCES "src/*.cpp")
@@ -150,7 +153,7 @@ target_link_libraries(quaesar PRIVATE
     qd
     uae_lib
     amDebugger
-    VACore
+    VamigaImpLib
 )
 
 
@@ -162,7 +165,6 @@ target_link_libraries(quaesar PRIVATE
 add_option_edit_and_continue(quaesar)
 add_option_edit_and_continue(qd)
 add_option_edit_and_continue(amDebugger)
-add_option_edit_and_continue(VACore)
 
 
 if (WIN32)

libs/amDebugger/src/amDebugger/codeAnalyzer/cdaServer.cpp

@@ -96,6 +96,8 @@ struct CapstoneDisassemblerContext {
     {
         reset();
         const uint8_t* startDisasmDat = vm->mem->getRealAddr(begAddr);
+        if (!startDisasmDat)
+            return;
         uint32_t countBytes = endAddr - begAddr;
         m_nInstructions =
             cs_disasm(*m_pCapstone, startDisasmDat, countBytes, begAddr, countBytes / 2, &m_pInstructions);

libs/amDebugger/src/amDebugger/dbgConnection.h

@@ -7,7 +7,7 @@ namespace amD {
 class UaeSharedConnectionImpl;
 
 
-class IVmServiceConnection : public qd::RefCounted
+class IVmServiceProvider : public qd::RefCounted
 {
 public:
     qd::string m_name;
@@ -16,12 +16,12 @@ class IVmServiceConnection : public qd::RefCounted
     virtual ref_ptr<IVm::VM> getClientVm() = 0;
     virtual ref_ptr<IVm::VM> getServerVm() = 0;
 
-}; // IVmServiceConnection
+}; // IVmServiceProvider
 //////////////////////////////////////////////////////////////////////////
 
 
-ref_ptr<IVmServiceConnection> create_dummy_connection();
-ref_ptr<IVmServiceConnection> create_uae_shared_connection(const char* name);
+ref_ptr<IVmServiceProvider> create_dummy_connection();
+ref_ptr<IVmServiceProvider> create_uae_shared_connection(const char* name);
 
 
 }; // namespace amD

libs/amDebugger/src/amDebugger/debugger.cpp

@@ -8,18 +8,17 @@ namespace amD {
 DbgProjOptinons g_opt = {};
 
 
-Debugger::Debugger(DebuggerApp* _app, ref_ptr<IVmServiceConnection> pCon)
+Debugger::Debugger(DebuggerApp* _app)
     : m_pDbgApp(_app)
-    , m_pConnection(pCon)
 {
-    assert(m_pConnection);
 }
 
 
-void Debugger::init()
+
+
+IVm::VM* Debugger::getVm() const
 {
-    m_pVm = m_pConnection->getClientVm();
-    assert(m_pVm);
+    return m_pVm.get();
 }
 
 
@@ -48,6 +47,31 @@ qd::EFlow Debugger::setupDefaultOperationArgsImp(qd::operation::BaseOpArgs* args
 }
 
 
+void Debugger::fetchVmState()
+{
+    if (m_pVm)
+        m_pVm->fetchStateFromEmu();
+}
+
+
+amD::IVmServiceProvider* Debugger::getConnection() const
+{
+    return m_pConnection.get();
+}
+
+
+void Debugger::setConnection(ref_ptr<IVmServiceProvider> pCon)
+{
+    if (m_pConnection == pCon)
+        return;
+    m_pConnection = pCon;
+    if (m_pConnection)
+        m_pVm = m_pConnection->getClientVm();
+    else
+        m_pVm = nullptr;
+}
+
+
 void Debugger::execConsoleCmd(qd::string&& cmd)
 {
     amD::operation::ExecConsoleCmd exec;

libs/amDebugger/src/amDebugger/debugger.h

@@ -9,7 +9,7 @@
 namespace amD {
 
 class DebuggerApp;
-class IVmServiceConnection;
+class IVmServiceProvider;
 
 constexpr static int BREAKPOINTS_MAX = 20;
 
@@ -20,7 +20,7 @@ class Breakpoint
     AddrRef addr1 = {};
     AddrRef addr2 = {};
     bool enabled = false;
-    EReg reg;
+    IVm::EReg reg;
 }; // class Breakpoint
 //////////////////////////////////////////////////////////////////////////
 
@@ -51,28 +51,26 @@ struct DbgProjOptinons
 extern DbgProjOptinons g_opt;
 
 
-// Debugger client
+//------------------------------------------------------------------------
+// Debugger client engine
 //
 class Debugger
     : public qd::RefCounted
     , public qd::IOperationEnvironment
 {
     DebuggerApp* m_pDbgApp = nullptr;
-    ref_ptr<IVmServiceConnection> m_pConnection;
+    ref_ptr<IVmServiceProvider> m_pConnection;
+    ref_ptr<IVm::VM> m_pVm = nullptr; // owner
 
 public:
-    ref_ptr<IVm::VM> m_pVm = nullptr;
-
-public:
-    Debugger(DebuggerApp* _app, ref_ptr<IVmServiceConnection> pCon);
+    Debugger(DebuggerApp* _app);
     virtual ~Debugger() override = default;
 
-    void init();
-    IVm::VM* getVm() const { return m_pVm.get(); }
+    IVm::VM* getVm() const;
     amD::DebuggerApp* getDbgApp() const { return m_pDbgApp; }
 
-
-    amD::IVmServiceConnection* getConnection() const { return m_pConnection.get(); }
+    amD::IVmServiceProvider* getConnection() const;
+    void setConnection(ref_ptr<IVmServiceProvider> pCon);
 
     void execConsoleCmd(qd::string&& cmd);
 
@@ -88,15 +86,16 @@ class Debugger
 
     bool isDebugActivated() const;
     void setDebugMode(EVmDebugMode debug_mode);
+    void fetchVmState();
 
     //------------------------------------------------------------------------
     // Implement Operation Environment
     virtual IOperationEnvironment* getOpEnvParent() const override { return nullptr; }
     virtual qd::EFlow applyOperationMsgProcImp(qd::operation::BaseOpArgs* args) override;
     virtual qd::EFlow setupDefaultOperationArgsImp(qd::operation::BaseOpArgs* args) const override;
 
-
 }; // class Debugger
+//////////////////////////////////////////////////////////////////////////
 
 
 }; // namespace amD

libs/amDebugger/src/amDebugger/debuggerOps.h

@@ -10,6 +10,7 @@ FORWARD_DECLARATION_2(amD, DebuggerDesktop);
 FORWARD_DECLARATION_3(amD, operation, Operation);
 FORWARD_DECLARATION_3S(amD, shortcut, EId);
 
+using namespace IVm;
 
 namespace amD {
 
@@ -109,7 +110,7 @@ struct DebugTraceContinue : public amD::operation::OperationArgs {
         d.m_name = "Continue";
         d.addShortcut(amD::shortcut::EId::DebugTraceContinue);
     }
-    amD::EVmDebugMode debugMode = EVmDebugMode::Live;
+    IVm::EVmDebugMode debugMode = EVmDebugMode::Live;
 };
 
 

libs/amDebugger/src/amDebugger/debuggerServer.h

@@ -9,12 +9,14 @@ namespace amD {
 
 class IVmConnectionBuilder : public qd::RefCounted, public qd::IOperationEnvironment
 {
-public:
+protected:
     IVm::VM* vm = nullptr;
 
+public:
+
     void init();
     IVm::VM* getVm() const { return vm; }
-    virtual ref_ptr<amD::IVmServiceConnection> createConnection() const = 0;
+    virtual ref_ptr<amD::IVmServiceProvider> createConnection() const = 0;
 
 }; // class IVmConnectionBuilder
 

libs/amDebugger/src/amDebugger/debuggerWndApp.cpp

@@ -27,7 +27,9 @@ constexpr uint32_t g_nDebuggerWndSizeY = 800;
 DebuggerApp::DebuggerApp()
 {
     setPartActive(true);
-    setPartVisible(true);
+    setPartRenderable(true);
+
+    m_pDebugger = new amD::Debugger(this); // Debugger client
 }
 
 
@@ -43,14 +45,7 @@ void DebuggerApp::init()
     createRenderWindow();
     initImGui();
 
-    amD::IVmConnectionsManager* pConnMgr = m_pApp->getInterface_<amD::IVmConnectionsManager>();
-    ASSERT_AND_DO(pConnMgr, return);
-    ref_ptr<IVmServiceConnection> pCurConnect = pConnMgr->createVmConnectionByInd(0);
-    assert(pCurConnect);
-
-    m_pDebugger = new amD::Debugger(this, pCurConnect); // Debugger client
-    m_pDebugger->init();
-
+    // m_pDebugger->setConnection(pCurConnect);
 
     assert(m_pDebugger);
     qd::UiNodeCreator mk;
@@ -88,7 +83,6 @@ void DebuggerApp::createRenderWindow()
 
 void DebuggerApp::initImGui()
 {
-
     auto pImGuiMgr = qd::ModuleManager::get()->getModuleInstOrCreate_<qd::ImGuiContextManager>();
     m_pQimGuiCtx = pImGuiMgr->createContextImGui(m_pWindow, m_pWndRenderer);
 
@@ -115,13 +109,6 @@ qd::EFlow DebuggerApp::applyOperationMsgProcImp(qd::operation::BaseOpArgs* p_msg
 }
 
 
-// amD::DebuggerApp* DebuggerApp::get() {
-//     return g_pInstance;
-// }
-
-
-
-
 void DebuggerApp::destroy()
 {
     if (m_pOperationMgr)
@@ -147,6 +134,7 @@ void DebuggerApp::update(float /*dt*/, float /*time*/)
     if (isWndVisible())
     {
         m_pQimGuiCtx->newFrame();
+        getDbg()->fetchVmState();
         m_pGui->drawImGuiMainFrame();
         m_pQimGuiCtx->endFrame();
     }
@@ -176,12 +164,12 @@ void DebuggerApp::setWndVisible(bool v)
     if (v)
     {
         SDL_ShowWindow(m_pWindow);
-        setPartVisible(true);
+        setPartRenderable(true);
     }
     else
     {
         SDL_HideWindow(m_pWindow);
-        setPartVisible(false);
+        setPartRenderable(false);
     }
 }
 
@@ -212,6 +200,12 @@ qd::EFlow DebuggerApp::onSdlEventProc(SDL_Event& event)
 }
 
 
+IVm::VM* DebuggerApp::getVm() const
+{
+    return m_pDebugger->getVm();
+}
+
+
 const amD::Breakpoint* BreakpointsSortedList::getBpByAddr(AddrRef addr, EReg /*reg*/) const
 {
     OneAddrBp lh;

libs/amDebugger/src/amDebugger/debuggerWndApp.h

@@ -23,7 +23,7 @@ FORWARD_DECLARATION_2(IVm, VM);
 namespace amD {
 
 class DebuggerDesktop;
-class IVmServiceConnection;
+class IVmServiceProvider;
 
 
 class IVmConnectionsManager
@@ -32,7 +32,7 @@ class IVmConnectionsManager
 
 public:
     virtual uint32_t getNumConnections() = 0;
-    virtual ref_ptr<amD::IVmServiceConnection> createVmConnectionByInd(uint32_t idx) = 0;
+    virtual ref_ptr<amD::IVmServiceProvider> createVmProvider(const char* conn_id) = 0;
 }; // class IVmConnectionsManager
 
 
@@ -69,7 +69,7 @@ class DebuggerApp
     void setWndVisible(bool v);
     virtual qd::EFlow onSdlEventProc(SDL_Event& event) override;
 
-    IVm::VM* getVm() const { return m_pDebugger->getVm(); }
+    IVm::VM* getVm() const;
 
     amD::Debugger* getDbg() const { return m_pDebugger; }
 

libs/amDebugger/src/amDebugger/ui/debuggerDesktop.cpp

@@ -66,7 +66,7 @@ void DebuggerDesktop::_drawMainMenuBar()
 
         if (auto pm = qIm::LockMenu("Debug"))
         {
-            amD::EVmDebugMode debugMode = vm->getVmDebugMode();
+            IVm::EVmDebugMode debugMode = vm->getVmDebugMode();
             qIm::menuItemFromOperationArgs_<amD::operation::DebugTraceContinue>(pDbg, "", false,
                 debugMode.isBreak());
             qIm::menuItemFromOperationArgs_<amD::operation::DebugTraceStart>(pDbg, "", false, debugMode.isLive());