Changeset 85180 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 10, 2020 1:19:43 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139147

Message:

VMM/PGMDbg.cpp: Workaround for Clang 11 nothrow weirdness. bugref:9794

File:

• trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp

@@ -589 +589 @@
 
 
-static void pgmR3DbgSelectMemScanFunction(PFNPGMR3DBGFIXEDMEMSCAN *ppfnMemScan, uint32_t GCPhysAlign, size_t cbNeedle)
-{
-    *ppfnMemScan = NULL;
+static PFNPGMR3DBGFIXEDMEMSCAN pgmR3DbgSelectMemScanFunction(uint32_t GCPhysAlign, size_t cbNeedle)
+{
     switch (GCPhysAlign)
     {
         case 1:
             if (cbNeedle >= 8)
-                *ppfnMemScan = pgmR3DbgFixedMemScan8Wide1Step;
-            else if (cbNeedle >= 4)
-                *ppfnMemScan = pgmR3DbgFixedMemScan4Wide1Step;
-            else
-                *ppfnMemScan = pgmR3DbgFixedMemScan1Wide1Step;
-            break;
+                return pgmR3DbgFixedMemScan8Wide1Step;
+            if (cbNeedle >= 4)
+                return pgmR3DbgFixedMemScan4Wide1Step;
+            return pgmR3DbgFixedMemScan1Wide1Step;
         case 2:
             if (cbNeedle >= 2)
-                *ppfnMemScan = pgmR3DbgFixedMemScan2Wide2Step;
+                return pgmR3DbgFixedMemScan2Wide2Step;
             break;
         case 4:
             if (cbNeedle >= 4)
-                *ppfnMemScan = pgmR3DbgFixedMemScan4Wide4Step;
+                return pgmR3DbgFixedMemScan4Wide4Step;
             break;
         case 8:
             if (cbNeedle >= 8)
-                *ppfnMemScan = pgmR3DbgFixedMemScan8Wide8Step;
+                return pgmR3DbgFixedMemScan8Wide8Step;
             break;
     }
+    return NULL;
 }
 
@@ -685 +683 @@
                                : ~(RTGCPHYS)0;
 
-    PFNPGMR3DBGFIXEDMEMSCAN pfnMemScan;
-    pgmR3DbgSelectMemScanFunction(&pfnMemScan, (uint32_t)GCPhysAlign, cbNeedle);
+    PFNPGMR3DBGFIXEDMEMSCAN pfnMemScan = pgmR3DbgSelectMemScanFunction((uint32_t)GCPhysAlign, cbNeedle);
 
     /*
@@ -864 +861 @@
     GCPtr &= ~(RTGCPTR)PAGE_OFFSET_MASK;
 
-    PFNPGMR3DBGFIXEDMEMSCAN pfnMemScan;
-    pgmR3DbgSelectMemScanFunction(&pfnMemScan, (uint32_t)GCPtrAlign, cbNeedle);
+    PFNPGMR3DBGFIXEDMEMSCAN pfnMemScan = pgmR3DbgSelectMemScanFunction((uint32_t)GCPtrAlign, cbNeedle);
 
     VMSTATE         enmVMState              = pVM->enmVMState;