Merge pull request #1954 from yaz0r/gdb_sharedmem

Add monitor command to retrieve the shared memory name. Only for wram so far

Author: nicolasnoble

src/core/gdb-server.cc

@@ -760,6 +760,16 @@ void PCSX::GdbClient::processMonitorCommand(const std::string& cmd) {
             g_emulator->m_cdrom->setIso(new CDRIso(pathView));
             g_emulator->m_cdrom->check();
         }
+    } else if (words[0] == "sharedmem") {
+        if (words.size() != 2) {
+            writeEscaped("Usage: sharedmem <type>");
+        } else {
+            if (words[1] == "wram") {
+                writeEscaped(g_emulator->m_mem->m_wramShared.getSharedName());
+            } else {
+                writeEscaped("Unknown type. Valid types: wram");
+            }
+        }
     }
     write("OK");
 }

src/core/psxmem.h

@@ -307,6 +307,7 @@ class Memory {
     uint32_t m_biosCRC = 0;
 
     // Shared memory wrappers, pointers below point to these where appropriate
+    friend class GdbClient;
     SharedMem m_wramShared;
 
     uint32_t m_BIU = 0;

src/support/sharedmem-windows.cc

@@ -37,11 +37,11 @@ bool PCSX::SharedMem::init(const char* id, size_t size, bool initToZero) {
     // Try to create a shared memory mapping, if an id is provided
     if (id != nullptr) {
         // Build the full name to share as
-        std::string fullname = getSharedName(id, static_cast<uint32_t>(GetCurrentProcessId()));
+        m_sharedName = getSharedName(id, static_cast<uint32_t>(GetCurrentProcessId()));
         // Create the memory mapping handle
         m_fileHandle =
             CreateFileMappingA(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, static_cast<uint32_t>(size >> 32),
-                               static_cast<uint32_t>(size), fullname.c_str());
+                               static_cast<uint32_t>(size), m_sharedName.c_str());
         if (m_fileHandle != INVALID_HANDLE_VALUE) {
             // Create a view of the memory mapping at 0 offset
             void* basePointer = MapViewOfFileEx(m_fileHandle, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, size, nullptr);
@@ -56,9 +56,11 @@ bool PCSX::SharedMem::init(const char* id, size_t size, bool initToZero) {
             } else {
                 CloseHandle(m_fileHandle);
                 m_fileHandle = nullptr;
+                m_sharedName.clear();
             }
         } else {
             m_fileHandle = nullptr;
+            m_sharedName.clear();
         }
     }
     // Alloc memory directly if we opted out or had problems creating the memory map
@@ -76,6 +78,7 @@ PCSX::SharedMem::~SharedMem() {
         m_mem = nullptr;
         CloseHandle(m_fileHandle);
         m_fileHandle = nullptr;
+        m_sharedName.clear();
     } else {
         free(m_mem);
     }

src/support/sharedmem.h

@@ -49,6 +49,8 @@ class SharedMem {
     uint8_t* getPtr() { return m_mem; }
     size_t getSize() { return m_size; }
 
+    const std::string& getSharedName() { return m_sharedName; }
+
   private:
     std::string getSharedName(const char* id, uint32_t pid);