Memory Watches - Adjust selected address for variables if the selected address would go out of bounds

Author: Zephiles

ttyd-tools/rel/source/commonfunctions.cpp

@@ -402,7 +402,7 @@ uint32_t checkIfPointerIsValid(const void *ptr)
         return PTR_CACHED;
     }
 
-    // Unached memory
+    // Uncached memory
     if ((ptrRaw >= 0xC0000000) && (ptrRaw < 0xC1800000))
     {
         return PTR_UNCACHED;

ttyd-tools/rel/source/memory.cpp

@@ -523,10 +523,13 @@ uint32_t adjustWatchValueControls(int32_t slot)
                         {
                             // Modifying the address
                             // Make sure the address is valid
-                            uint32_t tempMenuSecondaryValueUnsigned = MenuVar.MenuSecondaryValueUnsigned;
-                            if (checkIfPointerIsValid(reinterpret_cast<void *>(tempMenuSecondaryValueUnsigned)))
+                            void *tempMenuSecondaryValueUnsigned = reinterpret_cast<void *>(MenuVar.MenuSecondaryValueUnsigned);
+                            if (checkIfPointerIsValid(tempMenuSecondaryValueUnsigned))
                             {
-                                MemoryWatch[slot].Address = tempMenuSecondaryValueUnsigned;
+                                // Make sure the address is valid for the selected variable type
+                                tempMenuSecondaryValueUnsigned = fixBaseAddress(slot, tempMenuSecondaryValueUnsigned);
+                                
+                                MemoryWatch[slot].Address = reinterpret_cast<uint32_t>(tempMenuSecondaryValueUnsigned);
 
                                 MenuVar.MenuSelectionStates = 0;