Changeset 71590 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Mar 31, 2018 6:34:28 PM (7 years ago)

Author:

vboxsync

Message:

DevVGA,HGSMI,++: Code cleanup in progress. bugref:9094

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• HGSMIMemAlloc.h (modified) (1 diff)
• VBoxVideoIPRT.h (modified) (3 diffs)
• hgsmimemalloc.c (modified) (5 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/HGSMIMemAlloc.h

@@ -48 +48 @@
 
 int HGSMIMAInit(HGSMIMADATA *pMA, const HGSMIAREA *pArea,
-                HGSMIOFFSET *paDescriptors, uint32_t cDescriptors, HGSMISIZE cbMaxBlock,
-                const HGSMIENV *pEnv);
+                HGSMIOFFSET *paDescriptors, uint32_t cDescriptors,
+                HGSMISIZE cbMaxBlock, const HGSMIENV *pEnv);
 void HGSMIMAUninit(HGSMIMADATA *pMA);
 
-void *HGSMIMAAlloc(HGSMIMADATA *pMA, HGSMISIZE cb);
-void HGSMIMAFree(HGSMIMADATA *pMA, void *pv);
+void RT_UNTRUSTED_VOLATILE_GUEST *HGSMIMAAlloc(HGSMIMADATA *pMA, HGSMISIZE cb);
+void HGSMIMAFree(HGSMIMADATA *pMA, void RT_UNTRUSTED_VOLATILE_GUEST *pv);
 
 RT_C_DECLS_END

trunk/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h

@@ -94 +94 @@
   } while (0)
 # define AssertPtr assert
+# define AssertPtrReturn(pv, rcRet) do { assert(pv); if (pv) {} else return(rcRet); } while(0)
 # define AssertRC(expr) assert (!expr)
 #else
@@ -99 +100 @@
 # define AssertFailed() do { } while(0)
 # define AssertMsg(expr, msg) do { } while(0)
-# define AssertPtr(expr) do { } while(0)
+# define AssertPtr(ptr) do { } while(0)
+# define AssertPtrReturn(pv, rcRet) do { if (pv) {} else return(rcRet); } while(0)
 # define AssertRC(expr) do { } while(0)
 #endif
@@ -136 +138 @@
 # define UINT32_C(Value) (Value ## U)
 #endif
+#define RT_UNTRUSTED_GUEST
+#define RT_UNTRUSTED_VOLATILE_GUEST  volatile
+#define RT_UNTRUSTED_HOST
+#define RT_UNTRUSTED_VOLATILE_HOST   volatile
+#define RT_UNTRUSTED_HSTGST
+#define RT_UNTRUSTED_VOLATILE_HSTGST volatile
 
 #define likely _X_LIKELY

trunk/src/VBox/Additions/x11/vboxvideo/hgsmimemalloc.c

@@ -35 +35 @@
  * submit and free pattern, we replace the generic allocator with a simple
  * Boolean.  Need more be said?
+ *
+ * bird> Yes, it's buggy. You never set fAllocated. See HGSMIMAAlloc().
  */
 
@@ -64 +66 @@
 }
 
-static HGSMIOFFSET HGSMIMAPointerToOffset(const HGSMIMADATA *pMA, const void *pv)
+static HGSMIOFFSET HGSMIMAPointerToOffset(const HGSMIMADATA *pMA, const void RT_UNTRUSTED_VOLATILE_GUEST *pv)
 {
     if (HGSMIAreaContainsPointer(&pMA->area, pv))
-    {
         return HGSMIPointerToOffset(&pMA->area, pv);
-    }
 
     AssertFailed();
@@ -75 +75 @@
 }
 
-static void *HGSMIMAOffsetToPointer(const HGSMIMADATA *pMA, HGSMIOFFSET off)
+static void RT_UNTRUSTED_VOLATILE_GUEST *HGSMIMAOffsetToPointer(const HGSMIMADATA *pMA, HGSMIOFFSET off)
 {
     if (HGSMIAreaContainsOffset(&pMA->area, off))
-    {
         return HGSMIOffsetToPointer(&pMA->area, off);
-    }
 
     AssertFailed();
@@ -86 +84 @@
 }
 
-void *HGSMIMAAlloc(HGSMIMADATA *pMA, HGSMISIZE cb)
+void RT_UNTRUSTED_VOLATILE_GUEST *HGSMIMAAlloc(HGSMIMADATA *pMA, HGSMISIZE cb)
 {
     (void)cb;
@@ -93 +91 @@
     HGSMIOFFSET off = pMA->area.offBase;
     return HGSMIMAOffsetToPointer(pMA, off);
-    pMA->fAllocated = true;
+    pMA->fAllocated = true; /** @todo r=bird: Errr. what's this doing *after* the return statement? */
 }
 
-void HGSMIMAFree(HGSMIMADATA *pMA, void *pv)
+void HGSMIMAFree(HGSMIMADATA *pMA, void RT_UNTRUSTED_VOLATILE_GUEST *pv)
 {
     HGSMIOFFSET off = HGSMIMAPointerToOffset(pMA, pv);
     if (off != HGSMIOFFSET_VOID)
-    {
         pMA->fAllocated = false;
-    }
     else
-    {
         AssertFailed();
-    }
 }
+