Fix app quit

Author: dartfnm

libs/amDebugger/src/amDebugger/codeAnalyzer/copperDisasm.h

@@ -9,8 +9,8 @@ namespace amD {
 struct DecodedCopperList {
     struct CopInst {
         AddrRef addr = 0;
-        uint16_t w1 = -1;
-        uint16_t w2 = -1;
+        uint16_t w1 = ~0u;
+        uint16_t w2 = ~0u;
     };
 
     struct Entry : public CopInst {

libs/amDebugger/src/amDebugger/codeAnalyzer/quadTreeAddrMap.h

@@ -14,7 +14,7 @@ class QuadTreeAddrMap
     struct Node {
         Node* m_children[4] = {nullptr, nullptr, nullptr, nullptr};
         TItem m_item = {};
-        uint16_t m_idx = -1;
+        uint16_t m_idx = ~0u;
     public:
         Node()
         {}

libs/amDebugger/src/amDebugger/debuggerApp.cpp

@@ -119,21 +119,17 @@ amD::DebuggerApp* DebuggerApp::get() {
 
 
 void DebuggerApp::destroy() {
-    if (m_pGui)
-        m_pGui->destroy();
     if (m_pOperationMgr)
         m_pOperationMgr->destroy();
     m_pOperationMgr = nullptr;
 
-    // Cleanup
-    ImGui_ImplSDLRenderer2_Shutdown();
-    ImGui_ImplSDL2_Shutdown();
-    ImGui::DestroyContext();
-
-    delete m_pGui;
+    if (m_pGui)
+        m_pGui->destroy();
     m_pGui = nullptr;
+
     IVm::VM::destrotVmInst();
 
+    SAFE_DESTROY(m_pQimGuiCtx);
     SDL_DestroyRenderer(m_pWndRenderer);
     m_pWndRenderer = nullptr;
     SDL_DestroyWindow(m_pWindow);

libs/amDebugger/src/amDebugger/debuggerApp.h

@@ -49,7 +49,7 @@ class DebuggerApp : public qd::ApplicationPart, public qd::IOperationEnvironment
 public:
 
     ref_ptr<amD::Debugger> m_pDebugger = nullptr; // current debugger client
-    amD::DebuggerDesktop* m_pGui = nullptr;
+    ref_ptr<amD::DebuggerDesktop> m_pGui;
     qd::OperationsRegistry* m_pOperationMgr = nullptr;
 
 public:
@@ -85,7 +85,7 @@ class DebuggerApp : public qd::ApplicationPart, public qd::IOperationEnvironment
 private:
     void createRenderWindow();
     void initImGui();
-    ~DebuggerApp();
+    virtual ~DebuggerApp() override;
 
 };  // class DebuggerApp
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

libs/amDebugger/src/amDebugger/exprValue.cpp

@@ -66,9 +66,9 @@ class AmDbgEvaluator : public ExprEvaluator
         : ExprEvaluator(0)
     {}
 
-    uint8_t memByte(ExprValue address) const { return address + 0x10; }
-    uint16_t memWord(ExprValue address) const { return address - 0xb0; }
-    uint32_t memDword(ExprValue address) const { return address * 4; }
+    virtual uint8_t memByte(ExprValue address) const override { return uint8_t(address + 0x10); }
+    virtual uint16_t memWord(ExprValue address) const override { return uint16_t(address - 0xb0); }
+    virtual uint32_t memDword(ExprValue address) const override { return uint32_t(address * 4); }
 };
 
 void ExprValStr::parse()

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

@@ -96,8 +96,9 @@ void DebuggerDesktop::_drawMainMenuBar()
         // Windows
         if (auto pEm = qIm::LockMenu("Window"))
         {
-            for (qd::UiNode* pCurWnd : m_pWindows)
+            for (int i = 0; i < getNumChild(); ++i)
             {
+                qd::UiNode* pCurWnd = getChild(i);
                 if (!pCurWnd)
                     continue;
                 bool bVis = pCurWnd->isVisible();
@@ -115,13 +116,12 @@ void DebuggerDesktop::onNodeCreated(qd::UiNodeCreator* mk)
 {
     TSuper::onNodeCreated(mk);
 
-    m_pWindows.resize((size_t)WndId::MostCommonCount);
     m_pOperationMgr = &qd::OperationsRegistry::get(); // createComp_<qd::UiOperationMgrComp>()->m_pOpMgr;
     m_pShortcutMgr = qd::ShortcutsMgr::get(); // createComp_<qd::UiShortcutsMgrComp>();
     m_pShortcutMgr->createPredefinedShortcuts(
         eastl::span(&amD::shortcut::g_shortcuts_list[0], (size_t)amD::shortcut::EId::MAX_COUNT));
 
-    // create all m_pWindows
+    // create all m_pChilds
     createAllUiWndows();
 
     amD::operation::AmDebuggerOperationCreator operationCreate;
@@ -147,14 +147,18 @@ void DebuggerDesktop::createAllUiWndows()
         UiViewCreateCtx cv(this);
         amD::AmDbgWindow* pCurWnd = pCreateAttr->makeInstance_<amD::AmDbgWindow>(cv);
         assert(pCurWnd);
-        addWindowNode(pCurWnd);
+        addChild(pCurWnd);
     }
 }
 
+void DebuggerDesktop::destroy()
+{
+    TSuper::destroy();
+}
+
 
 DebuggerDesktop::~DebuggerDesktop()
 {
-    assert(m_pWindows.empty());
 }
 
 
@@ -266,10 +270,5 @@ void DebuggerDesktop::_drawToolBar()
 
 
 
-void DebuggerDesktop::destroy()
-{
-    TSuper::destroy();
-}
-
 
 }; // namespace amD

libs/amDebugger/src/amDebugger/vm/customRegs.cpp

@@ -85,8 +85,8 @@ amD::CustomFlagsDesc& CustomFlagsDesc::addBit(const char* p_name, uint8_t bits_c
     cb.name = p_name;
     cb.shiftL = shift_l;
     cb.mask = (1u << bits_count) - 1u;
-    cb.noBeg = nextNo;
-    cb.noEnd = nextNo + bits_count;
+    cb.noBeg = (uint8_t)nextNo;
+    cb.noEnd = (uint8_t)(nextNo + bits_count);
     cb.description = p_desc;
     return *this;
 }

libs/qd/CMakeLists.txt

@@ -25,7 +25,6 @@ add_source_group("app")
 add_source_group("math")
 add_source_group("mem")
 add_source_group("file")
-add_source_group("net")
 add_source_group("debug")
 add_source_group("enum")
 add_source_group("platform")

libs/qd/app/appPartsMgr.cpp

@@ -149,6 +149,7 @@ void AppPartsManager::destroy()
         }
         c_def(0);
     }
+    m_pParts.clear();
 }
 
 

libs/qd/app/application.cpp

@@ -29,7 +29,7 @@ Application::~Application()
 void Application::destroy()
 {
     destroyImp();
-    m_pAppParts->destroy();
+    SAFE_DESTROY(m_pAppParts);
 }