VAmiga support

Author: dartfnm

CMakeLists.txt

@@ -1,12 +1,16 @@
-# Minimum CMake version requirement
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
-#set(CMAKE_GENERATOR_TOOLSET "ClangCl") # test compilation on clang-c
+project(quaesar LANGUAGES CXX)
 
+#set(CMAKE_GENERATOR_TOOLSET "ClangCl") # test compilation on clang-c
 option(ENABLE_CODE_GENERATION "Enable code generation" OFF)
 
-# Project name and languages used
-project(quaesar LANGUAGES CXX)
+if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+    message(WARNING "You are doing an in-source build. Recommended:
+      ${CMAKE_COMMAND} -S ${CMAKE_SOURCE_DIR} -B build
+      ${CMAKE_COMMAND} --build build")
+endif()
+
 
 # Specify the C++ standard
 set(CMAKE_CXX_STANDARD 20)
@@ -25,6 +29,24 @@ include(scripts/cmake/format_sources.cmake)
 include(external/sdl2/sdl2.cmake)
 
 
+# ---------------------------------------------------------------------------
+# Global list of libraries to link with 'quaesar' collected from child cmake files
+# Children can call: quaesar_add_libs(<lib1> <lib2> ...)
+# ---------------------------------------------------------------------------
+set(QUAESAR_EXTRA_LIBS "" CACHE INTERNAL "Accumulated extra libraries for quaesar final link")
+function(quaesar_add_libs)
+    foreach(lib IN LISTS ARGN)
+        if(lib)
+            list(APPEND QUAESAR_EXTRA_LIBS "${lib}")
+        endif()
+    endforeach()
+    list(REMOVE_DUPLICATES QUAESAR_EXTRA_LIBS)
+    # Write back to cache so subdirectories (different scopes) see updated value
+    set(QUAESAR_EXTRA_LIBS "${QUAESAR_EXTRA_LIBS}" CACHE INTERNAL "Accumulated extra libraries for quaesar final link" FORCE)
+endfunction()
+
+
+
 # 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)
@@ -37,8 +59,12 @@ add_subdirectory(external/nativefiledialog-extended) #nfd
 add_subdirectory(libs/qd)
 add_subdirectory(libs/amDebugger)
 add_subdirectory(libs/exprParser)
-add_subdirectory(libs/vAmiga)
-add_subdirectory(libs/vamiga_imp_lib)
+
+option(VAMIGA "Enable VAmiga support" ON)
+if (VAMIGA)
+    include(VAmigaLib.cmake)
+endif()
+#-------------------------------------------------------------------------------------------
 
 # Quasar *.h/cpp files
 file(GLOB_RECURSE QUAESAR_SOURCES "src/*.cpp")
@@ -130,6 +156,9 @@ if (LINUX OR UNIX)
     target_link_libraries(quaesar PRIVATE dl)
 endif()
 
+
+include(user_custoom_plugins.cmake OPTIONAL)
+
 #-------------------------------------------------------------------------------------------
 # Include dirs
 #-------------------------------------------------------------------------------------------
@@ -153,12 +182,12 @@ target_link_libraries(quaesar PRIVATE
     qd
     uae_lib
     amDebugger
-    VamigaImpLib
+    ${QUAESAR_EXTRA_LIBS}
 )
 
 
 #if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/imgui.ini")
-    #file(COPY_FILE "${CMAKE_CURRENT_LIST_DIR}/bin/install/default_layout.ini" "${CMAKE_CURRENT_BINARY_DIR}/imgui.ini")
+# file(COPY_FILE "${CMAKE_CURRENT_LIST_DIR}/bin/install/default_layout.ini" "${CMAKE_CURRENT_BINARY_DIR}/imgui.ini")
 #endif()
 
 

VAmigaLib.cmake

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+
+set(VAMIGA ON CACHE BOOL "Enable VAmiga support")
+
+add_subdirectory(libs/vAmiga)
+add_subdirectory(libs/vAmiga_imp_lib)
+
+quaesar_add_libs(VAmigaImpLib)

libs/amDebugger/src/amDebugger/codeAnalyzer/cdaServer.h

@@ -28,6 +28,7 @@ struct CodeChunk : public eastl::intrusive_list_node {
     qd::array<cda::CodeItem*, cda::g_chunkSize / 2> m_codeItems = {};
     uint16_t m_idx = 0;
     union {
+        EA_DISABLE_VC_WARNING(4201) // nameless struct/union
         uint16_t m_flags = 0;
         struct {
             bool m_bAddrValid :1;

libs/amDebugger/src/amDebugger/dbgConnection.h

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

libs/amDebugger/src/amDebugger/debugger.cpp

@@ -54,13 +54,8 @@ void Debugger::fetchVmState()
 }
 
 
-amD::IVmServiceProvider* Debugger::getConnection() const
-{
-    return m_pConnection.get();
-}
-
 
-void Debugger::setConnection(ref_ptr<IVmServiceProvider> pCon)
+void Debugger::setDbgServiceBridge(ref_ptr<IVmDbgServiceBridge> pCon)
 {
     if (m_pConnection == pCon)
         return;

libs/amDebugger/src/amDebugger/debugger.h

@@ -9,7 +9,7 @@
 namespace amD {
 
 class DebuggerApp;
-class IVmServiceProvider;
+class IVmDbgServiceBridge;
 
 constexpr static int BREAKPOINTS_MAX = 20;
 
@@ -59,7 +59,7 @@ class Debugger
     , public qd::IOperationEnvironment
 {
     DebuggerApp* m_pDbgApp = nullptr;
-    ref_ptr<IVmServiceProvider> m_pConnection;
+    ref_ptr<IVmDbgServiceBridge> m_pConnection;
     ref_ptr<IVm::VM> m_pVm = nullptr; // owner
 
 public:
@@ -69,8 +69,7 @@ class Debugger
     IVm::VM* getVm() const;
     amD::DebuggerApp* getDbgApp() const { return m_pDbgApp; }
 
-    amD::IVmServiceProvider* getConnection() const;
-    void setConnection(ref_ptr<IVmServiceProvider> pCon);
+    void setDbgServiceBridge(ref_ptr<IVmDbgServiceBridge> pCon);
 
     void execConsoleCmd(qd::string&& cmd);
 

libs/amDebugger/src/amDebugger/debuggerServer.h

@@ -16,7 +16,7 @@ class IVmConnectionBuilder : public qd::RefCounted, public qd::IOperationEnviron
 
     void init();
     IVm::VM* getVm() const { return vm; }
-    virtual ref_ptr<amD::IVmServiceProvider> createConnection() const = 0;
+    virtual ref_ptr<amD::IVmDbgServiceBridge> createConnection() const = 0;
 
 }; // class IVmConnectionBuilder
 

libs/amDebugger/src/amDebugger/debuggerWndApp.h

@@ -23,7 +23,7 @@ FORWARD_DECLARATION_2(IVm, VM);
 namespace amD {
 
 class DebuggerDesktop;
-class IVmServiceProvider;
+class IVmDbgServiceBridge;
 
 
 class IVmConnectionsManager
@@ -32,7 +32,7 @@ class IVmConnectionsManager
 
 public:
     virtual uint32_t getNumConnections() = 0;
-    virtual ref_ptr<amD::IVmServiceProvider> createVmProvider(const char* conn_id) = 0;
+    virtual ref_ptr<amD::IVmDbgServiceBridge> createVmProvider(const char* conn_id) = 0;
 }; // class IVmConnectionsManager
 
 

libs/amDebugger/src/amDebugger/exprValue.cpp

@@ -81,7 +81,7 @@ void ExprValStr::parse()
     }
     catch (const ExprError& e)
     {
-        qd::log_debug("[ FAIL ] ParserOop: \"%s\" unexpected error: %s\n", m_strVal.c_str(), e.message());
+        qd::logDbg("[ FAIL ] ParserOop: \"%s\" unexpected error: %s\n", m_strVal.c_str(), e.message());
     }
 }
 

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

@@ -138,7 +138,7 @@ void DebuggerDesktop::createAllUiWndows()
         auto* pCreateAttr = pCurWindowType->getAttribute_<qd::tsAttr::CreateClassCb>();
         if (!pCreateAttr)
         {
-            log_error("Creator not defined in class:'%s'", pCurWindowType->getFullName().c_str());
+            logErr("Creator not defined in class:'%s'", pCurWindowType->getFullName().c_str());
             continue;
         }
         UiViewCreateCtx cv(this);