stratosphere/dmnt.gen2/source/dmnt2_breakpoint_manager.cpp

@@ -45,7 +45,7 @@ namespace ams::dmnt {
         }
 
         if (R_FAILED(result)) {
-            AMS_DMNT2_GDB_LOG_DEBUG("BreakPointManager::SetBreakPoint %p 0x%lx !!! Fail 0x%08x !!!\n", bp, address, result.GetValue());
+            AMS_DMNT2_GDB_LOG_DEBUG("BreakPointManager::SetBreakPoint %p 0x%lx !!! Fail 0x%08x !!!\n", bp, bp->m_address, result.GetValue());
         }
 
         R_RETURN(result);

stratosphere/dmnt.gen2/source/dmnt2_gdb_server_impl.cpp

@@ -1538,18 +1538,13 @@ namespace ams::dmnt {
     }
 
     void GdbServerImpl::Q() {
-        if (ParsePrefix(m_receive_packet, "QStartNoAckMode")) {
-            this->QStartNoAckMode();
+        if (false) {
+            /* TODO: QStartNoAckMode? */
         } else {
             AMS_DMNT2_GDB_LOG_DEBUG("Not Implemented Q: %s\n", m_receive_packet);
         }
     }
 
-    void GdbServerImpl::QStartNoAckMode() {
-        m_packet_io.SetNoAck();
-        AppendReplyOk(m_reply_cur, m_reply_end);
-    }
-
     void GdbServerImpl::T() {
         if (const char *dot = std::strchr(m_receive_packet, '.'); dot != nullptr) {
             const u64 thread_id = DecodeHex(dot + 1);
@@ -1924,7 +1919,6 @@ namespace ams::dmnt {
         R_SUCCEED();
     }
 
-
     void GdbServerImpl::q() {
         if (ParsePrefix(m_receive_packet, "qAttached:")) {
             this->qAttached();
@@ -2151,7 +2145,6 @@ namespace ams::dmnt {
         AppendReplyFormat(m_reply_cur, m_reply_end, ";swbreak+");
         AppendReplyFormat(m_reply_cur, m_reply_end, ";hwbreak+");
         AppendReplyFormat(m_reply_cur, m_reply_end, ";vContSupported+");
-        AppendReplyFormat(m_reply_cur, m_reply_end, ";QStartNoAckMode+");
     }
 
     void GdbServerImpl::qXfer() {

stratosphere/dmnt.gen2/source/dmnt2_gdb_server_impl.hpp

@@ -77,8 +77,6 @@ namespace ams::dmnt {
 
             void Q();
 
-            void QStartNoAckMode();
-
             void T();
 
             void Z();

stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp

@@ -46,11 +46,8 @@ namespace ams::dmnt::cheat::impl {
     void CheatVirtualMachine::OpenDebugLogFile() {
         #ifdef DMNT_CHEAT_VM_DEBUG_LOG
         CloseDebugLogFile();
-        fs::EnsureDirectory("sdmc:/atmosphere/cheat_vm_logs");
-        fs::CreateFile("sdmc:/atmosphere/cheat_vm_logs/debug_log.txt", 0);
-        R_ABORT_UNLESS(fs::OpenFile(std::addressof(m_debug_log_file), "sdmc:/atmosphere/cheat_vm_logs/debug_log.txt", fs::OpenMode_Write | fs::OpenMode_AllowAppend));
+        R_ABORT_UNLESS(fs::OpenFile(std::addressof(m_debug_log_file), "sdmc:/atmosphere/cheat_vm_logs/debug_log.txt"));
         m_debug_log_file_offset = 0;
-        m_has_debug_log_file = true;
         #endif
     }
 
@@ -83,8 +80,7 @@ namespace ams::dmnt::cheat::impl {
             fmt_len += 1;
         }
 
-        fs::WriteFile(m_debug_log_file, m_debug_log_file_offset, m_debug_log_format_buf, fmt_len, fs::WriteOption::Flush);
-        m_debug_log_file_offset += fmt_len;
+        fs::WriteFile(m_debug_log_file, m_debug_log_offset, m_debug_log_format_buf, fmt_len, fs::WriteOption::Flush);
         #else
         AMS_UNUSED(format);
         #endif