Sfoglia il codice sorgente

nvmap: Return the address of the nvmap object when Freeing it for the last time.

This behavior is confirmed by reverse engineering.
Subv 8 anni fa
parent
commit
a093feca62

+ 10 - 3
src/core/hle/service/nvdrv/devices/nvmap.cpp

@@ -148,6 +148,7 @@ u32 nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output) {
 }
 }
 
 
 u32 nvmap::IocFree(const std::vector<u8>& input, std::vector<u8>& output) {
 u32 nvmap::IocFree(const std::vector<u8>& input, std::vector<u8>& output) {
+    // TODO(Subv): These flags are unconfirmed.
     enum FreeFlags {
     enum FreeFlags {
         Freed = 0,
         Freed = 0,
         NotFreedYet = 1,
         NotFreedYet = 1,
@@ -161,15 +162,21 @@ u32 nvmap::IocFree(const std::vector<u8>& input, std::vector<u8>& output) {
     auto itr = handles.find(params.handle);
     auto itr = handles.find(params.handle);
     ASSERT(itr != handles.end());
     ASSERT(itr != handles.end());
 
 
+    ASSERT(itr->second->refcount > 0);
+
     itr->second->refcount--;
     itr->second->refcount--;
 
 
-    params.refcount = itr->second->refcount;
     params.size = itr->second->size;
     params.size = itr->second->size;
 
 
-    if (itr->second->refcount == 0)
+    if (itr->second->refcount == 0) {
         params.flags = Freed;
         params.flags = Freed;
-    else
+        // The address of the nvmap is written to the output if we're finally freeing it, otherwise
+        // 0 is written.
+        params.address = itr->second->addr;
+    } else {
         params.flags = NotFreedYet;
         params.flags = NotFreedYet;
+        params.address = 0;
+    }
 
 
     handles.erase(params.handle);
     handles.erase(params.handle);
 
 

+ 1 - 1
src/core/hle/service/nvdrv/devices/nvmap.h

@@ -94,7 +94,7 @@ private:
     struct IocFreeParams {
     struct IocFreeParams {
         u32_le handle;
         u32_le handle;
         INSERT_PADDING_BYTES(4);
         INSERT_PADDING_BYTES(4);
-        u64_le refcount;
+        u64_le address;
         u32_le size;
         u32_le size;
         u32_le flags;
         u32_le flags;
     };
     };