VAmiga integration

Author: dartfnm

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

@@ -59,7 +59,7 @@ struct CodeChunk : public eastl::intrusive_list_node {
 
 class M68CodeDisassembler
 {
-    SINGLETON_DECLARE(M68CodeDisassembler);
+    SINGLETON_DECLARATION(M68CodeDisassembler);
 
 public:
     csh* m_pCapstone = nullptr;

libs/amDebugger/src/amDebugger/debuggerConfig.h

@@ -3,7 +3,7 @@
 
 
 struct DbgConfig {
-    SINGLETON_DECLARE(DbgConfig);
+    SINGLETON_DECLARATION(DbgConfig);
 
     bool showVHPopsLines = false;
 

libs/amDebugger/src/amDebugger/vm/vmInterface.cpp

@@ -1,4 +1,5 @@
 #include "vmInterface.h"
+#include "EASTL/span.h"
 
 namespace IVm {
 
@@ -7,8 +8,6 @@ namespace IVm {
 
 
 VM::VM()
-    : m_pModules({(IModule**)(&mem), (IModule**)(&cpu), (IModule**)&custom, (IModule**)&copper, (IModule**)&blitter,
-          (IModule**)&floppies[0]})
 {}
 
 
@@ -17,9 +16,9 @@ VM::~VM() {}
 
 void VM::init()
 {
-    for (IModule** curModule : m_pModules)
+    for (IModule* curModule : eastl::span<IModule *>(&m_modSectBeg, &m_modSectEnd))
     {
-        IModule* pCurMod = *curModule;
+        IModule* pCurMod = curModule;
         if (pCurMod)
             pCurMod->init(this);
     }
@@ -29,9 +28,9 @@ void VM::init()
 
 void VM::fetchStateFromEmu()
 {
-    for (IModule** curModule : m_pModules)
+    for (IModule* curModule : eastl::span<IModule *>(&m_modSectBeg, &m_modSectEnd))
     {
-        IModule* pCurMod = *curModule;
+        IModule* pCurMod = curModule;
         if (pCurMod)
             pCurMod->fetch();
     }

libs/amDebugger/src/amDebugger/vm/vmInterface.h

@@ -61,8 +61,8 @@ class VM
 
 
 protected:
-    int amiga_width = (754 + 7) & ~7;
-    int amiga_height = 576;
+    int m_scrSizeX = (754 + 7) & ~7;
+    int m_scrSizeY = 576;
     bool mInit = false;
     IVm::EVmDebugMode m_debugMode = IVm::EVmDebugMode::Live;
     VM();
@@ -75,30 +75,33 @@ class VM
     virtual qd::EFlow applyOperationMsgProcImp(qd::operation::BaseOpArgs* /*args*/) override;
     virtual void applyVmConfig(CfgVmPrefs* prefs);
 
-    int getScreenSizeX() const { return amiga_width; }
-    int getScreenSizeY() const { return amiga_height; }
+    int getScreenSizeX() const { return m_scrSizeX; }
+    int getScreenSizeY() const { return m_scrSizeY; }
     virtual int getCurCycle() { return -1; }
     virtual int getVPos() { return -1; }
     virtual int getHPos() { return -1; }
 
     virtual IVm::EVmDebugMode getVmDebugMode() const { return m_debugMode; }
     virtual void setVmDebugMode(IVm::EVmDebugMode debug_mode) { m_debugMode = debug_mode; }; // base
 
+    IVm::IModule* m_modSectBeg = nullptr;
     IVm::Memory* mem = nullptr;
     IVm::Cpu* cpu = nullptr;
     IVm::CustomRegs* custom = nullptr;
     IVm::Copper* copper = nullptr;
     IVm::Blitter* blitter = nullptr;
-    qd::array<IVm::Floppy*, IVm::MAX_FLOPPIES> floppies = {};
+    IVm::Floppy* floppy0 = nullptr;
+    IVm::Floppy* floppy1 = nullptr;
+    IVm::Floppy* floppy2 = nullptr;
+    IVm::Floppy* floppy3 = nullptr;
     IVm::Emu* emu = nullptr;
-
-    qd::array<IModule**, MS_MAX_COUNT> m_pModules;
+    IVm::IModule* m_modSectEnd = nullptr;
 
 }; // class IVm::VM
 //////////////////////////////////////////////////////////////////////////
 
 
-class Floppy : public IModule
+class Floppy : public IVm::IModule
 {
 public:
     int m_nFloppy = 0;
@@ -114,7 +117,7 @@ class Floppy : public IModule
 //////////////////////////////////////////////////////////////////////////
 
 
-class Emu : public IModule
+class Emu : public IVm::IModule
 {
 public:
     virtual int getDebugDmaMode() { return 0; }
@@ -131,7 +134,7 @@ class Emu : public IModule
 //////////////////////////////////////////////////////////////////////////
 
 
-class Memory : public IModule
+class Memory : public IVm::IModule
 {
 public:
     qd::array<IVm::MemBank, EMemSrc::MAX_COUNT> m_banks;
@@ -156,7 +159,7 @@ class Memory : public IModule
 //////////////////////////////////////////////////////////////////////////
 
 
-class Cpu : public IModule
+class Cpu : public IVm::IModule
 {
 public:
     virtual uint32_t getRegA(int i) const = 0;
@@ -168,7 +171,7 @@ class Cpu : public IModule
 //////////////////////////////////////////////////////////////////////////
 
 
-class CustomRegs : public IModule
+class CustomRegs : public IVm::IModule
 {
 public:
     virtual void fetch() override = 0;

libs/qd/base/baseTypes.h

@@ -15,7 +15,7 @@ static constexpr int64_t TTime64_MAX = INT64_MAX;
 
 
 //////////////////////////////////////////////////////////////////////////
-#define SINGLETON_DECLARE(TClassName)      \
+#define SINGLETON_DECLARATION(TClassName)  \
 public:                                    \
     static TClassName& getSingleton()      \
     {                                      \

libs/vAmiga_imp_lib/src/qvAmigaImp/va_server_app_part.cpp

@@ -3,38 +3,16 @@
 #include "qd/thread/thread.h"
 #include "quasar_app/qsr_application.h"
 
-
-
-class VAmigaServerProviderFactory : public qsr::IAppPartServerProviderFactory
-{
-    virtual bool createServerAppPart(qsr::ServerAppPartCreateCtx &ctx) override {
-        ctx.outName = "VAmiga";
-        ctx.outPartPtr = new qsr::VAmServerAppPart();
-        ctx.outTypeInfo = &qd::typeof_<qsr::VAmServerAppPart>();
-        return true;
-    }
-};
-static qsr::plugin_api::RegOnLoadAppPartServerFactory reg_me(std::make_unique<VAmigaServerProviderFactory>());
-
-
-
+//------------------------------------------------------------------------
 namespace qsr {
 
 
-VAmServerAppPart::VAmServerAppPart() {
-}
-
-
-VAmServerAppPart::~VAmServerAppPart() {
-}
-
 //------------------------------------------------------------------------
 class VAmSharedConnectionImpl : public amD::IVmDbgServiceBridge {
 public:
     ref_ptr<IVm::VM> m_pVAmVm;
 
-    VAmSharedConnectionImpl(ref_ptr<IVm::VM> pVAmVm) : m_pVAmVm(pVAmVm) {
-    }
+    VAmSharedConnectionImpl(ref_ptr<IVm::VM> pVAmVm) : m_pVAmVm(pVAmVm) {}
 
     virtual ref_ptr<IVm::VM> getClientVm() override {
         return m_pVAmVm;
@@ -47,18 +25,51 @@ class VAmSharedConnectionImpl : public amD::IVmDbgServiceBridge {
 //////////////////////////////////////////////////////////////////////////
 
 
-struct VAmConnImpl : public amD::IVmConnectionBuilder {
-    VAmServerAppPart *m_pVAmAppPart;
-    VAmConnImpl(VAmServerAppPart *pApp) : m_pVAmAppPart(pApp) {
+
+class VAmigaServerProviderFactory : public qsr::IAppPartServerProviderFactory
+{
+    qsr::VAmServerAppPart *m_pVAmAppPart = nullptr;
+public:
+    virtual void setup() override {
+        id = "vamiga";
+        guiName = "vAmiga emulator";
     }
-    virtual ref_ptr<amD::IVmDbgServiceBridge> createConnection() const override {
+
+    virtual bool createServerAppPart(qsr::ServerAppPartCreateCtx &ctx) override {
+        m_pVAmAppPart = new qsr::VAmServerAppPart();
+        ctx.outPartPtr = m_pVAmAppPart;
+        return true;
+    }
+
+    virtual ref_ptr<amD::IVmDbgServiceBridge> createConnection() override {
         ref_ptr<IVm::VM> vm = m_pVAmAppPart->getVm();
         assert(vm);
-        ref_ptr<VAmSharedConnectionImpl> pInst = new VAmSharedConnectionImpl(vm);
+        ref_ptr<qsr::VAmSharedConnectionImpl> pInst = new qsr::VAmSharedConnectionImpl(vm);
         return pInst;
     }
+
+};
+static qsr::plugin_api::RegOnLoadAppPartServerFactory reg_me(new VAmigaServerProviderFactory());
+//////////////////////////////////////////////////////////////////////////
+
+
+VAmServerAppPart::VAmServerAppPart() {
+}
+
+
+VAmServerAppPart::~VAmServerAppPart() {
+}
+
+
+
+/*
+struct VAmConnImpl : public amD::IVmConnectionBuilder {
+    VAmServerAppPart *m_pVAmAppPart;
+    VAmConnImpl(VAmServerAppPart *pApp) : m_pVAmAppPart(pApp) {
+    }
 };
 //////////////////////////////////////////////////////////////////////////
+*/
 
 
 void VAmServerAppPart::onPartCreate(qd::ApplicationPart::OnCreate_t &prm) {
@@ -67,9 +78,9 @@ void VAmServerAppPart::onPartCreate(qd::ApplicationPart::OnCreate_t &prm) {
     m_pVAmThread = new VAmServerThread(this);
     m_pVAmThread->initialize();
 
-    m_pConnBuilder = new VAmConnImpl(this);
-    QuaesarVmServersMgr *pSvMgr = ((QuaesarApplication *)getApp())->m_pVmServersMgr;
-    pSvMgr->registerVmServer(EQuaServerId::S_VAMIGA, m_pConnBuilder);
+//     m_pConnBuilder = new VAmConnImpl(this);
+//     QuaesarVmServersMgr *pSvMgr = ((QuaesarApplication *)getApp())->m_pVmServersMgr;
+//     pSvMgr->registerVmServer(EQuaServerId::S_VAMIGA, m_pConnBuilder);
 }
 
 

libs/vAmiga_imp_lib/src/qvAmigaImp/va_vm_imp.cpp

@@ -34,14 +34,14 @@ namespace IVm::imp {
 
 VAmVmImp::VAmVmImp(VAmServerThread* pVAmThread, vamiga::VAmiga* pVAmiga) {
   m_pVAmThread = pVAmThread;
-  m_vaAmiga = pVAmiga;
-  m_vaAccess = new QuaesarVAmigaInjectAccess(m_vaAmiga);
+  m_vAmiga = pVAmiga;
+  m_vaAccess = new QuaesarVAmigaInjectAccess(m_vAmiga);
   main = m_vaAccess->main;
 
   instCpu.m_pVm = this;
-  instCpu.m_pVAmiga = m_vaAmiga;
+  instCpu.m_pVAmiga = m_vAmiga;
   instMemory.m_pVm = this;
-  instMemory.m_pVAmiga = m_vaAmiga;
+  instMemory.m_pVAmiga = m_vAmiga;
   TSuper::cpu = &instCpu;
   TSuper::mem = &instMemory;
   TSuper::custom = &instCustomRegs;
@@ -51,10 +51,10 @@ VAmVmImp::VAmVmImp(VAmServerThread* pVAmThread, vamiga::VAmiga* pVAmiga) {
     instEmu.vm = this;
     TSuper::emu = &instEmu;
   }
-  for (size_t i = 0; i < TSuper::floppies.size(); ++i) {
+  for (size_t i = 0; i < IVm::MAX_FLOPPIES; ++i) {
     VAmVmImp::Floppy& curFloppy = instFloppies[i];
     curFloppy.m_nFloppy = (int)i;
-    TSuper::floppies[i] = &curFloppy;
+    (&floppy0)[i] = &curFloppy;
   }
 }
 
@@ -193,16 +193,16 @@ void VAmVmImp::Emu::setDebugDmaMode(int p_mode) {
 
 void VAmVmImp::setVmDebugMode(EVmDebugMode debug_mode) {
   TSuper::setVmDebugMode(debug_mode);
-  if (debug_mode == EVmDebugMode::Break) {
-    while (!instEmu.isDebugActivatedFull()) {
-      //             ::debugger_active = 0;
-      //             ::debugging = 0;
-      //             ::activate_debugger_new();
-    }
-  } else if (debug_mode == EVmDebugMode::Live) {
-    if (m_pVAmThread) m_pVAmThread->execConsoleCmd("g");
-    //        ::debugger_active = 0;
-  }
+//   if (debug_mode == EVmDebugMode::Break) {
+//     while (!instEmu.isDebugActivatedFull()) {
+//       //             ::debugger_active = 0;
+//       //             ::debugging = 0;
+//       //             ::activate_debugger_new();
+//     }
+//   } else if (debug_mode == EVmDebugMode::Live) {
+//     if (m_pVAmThread) m_pVAmThread->execConsoleCmd("g");
+//     //        ::debugger_active = 0;
+//   }
 }
 
 int VAmVmImp::getVPos() { return 0; }
@@ -235,6 +235,27 @@ void VAmVmImp::Floppy::setEnabled(bool v) {
   //     cfgFloppy.dfxtype = v ? 0 : -1;
 }
 
+
+void VAmVmImp::Floppy::setAdfPath(const qd::string &v)
+{
+    vamiga::FloppyDriveAPI *df = m_pVm->m_vAmiga->df[m_nFloppy];
+    df->insert(v.c_str(), m_writeProtect);
+}
+
+
+qd::string VAmVmImp::Floppy::getAdfPath()
+{
+    //vamiga::FloppyDriveAPI *df = m_pVm->m_vAmiga->df[m_nFloppy];
+    return "";
+}
+
+
+void VAmVmImp::Floppy::init(IVm::VM *vm)
+{
+    m_pVm = static_cast<VAmVmImp *>(vm);
+}
+
+
 bool VAmVmImp::Cpu::getFlg(ECpuFlg_ f) const {
   switch (f) {
     case IVm::CpuFlg_Z:
@@ -289,7 +310,7 @@ uint8_t* VAmVmImp::Memory::getRealAddr(AddrRef ptr) {
 
 void VAmVmImp::Memory::init(IVm::VM* p_vm) {
   m_pVm = (VAmVmImp*)p_vm;
-  vamiga::VAmiga* pVAmiga = m_pVm->m_vaAmiga;
+  vamiga::VAmiga* pVAmiga = m_pVm->m_vAmiga;
   const vamiga::MemInfo& memInfo = pVAmiga->mem.getInfo();
   const vamiga::MemConfig& memCfg = pVAmiga->mem.getConfig();