Changeset 46567 in vbox for trunk

Timestamp:

Jun 14, 2013 4:12:24 PM (12 years ago)

Author:

vboxsync

Message:

RTMemAllocEx for ring-3.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (2 diffs)
• include/iprt/mem.h (modified) (3 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (7 diffs)
• src/VBox/Runtime/include/internal/magics.h (modified) (1 diff)
• src/VBox/Runtime/r0drv/alloc-r0drv.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/generic/allocex-r3-generic.cpp (added)

trunk/include/iprt/mangling.h

@@ -812 +812 @@
 # define RTMd5ToString                                  RT_MANGLER(RTMd5ToString)
 # define RTMd5Update                                    RT_MANGLER(RTMd5Update)
-# define RTMemAllocExTag                                RT_MANGLER(RTMemAllocExTag) /* r0drv */
+# define RTMemAllocExTag                                RT_MANGLER(RTMemAllocExTag)
 # define RTMemAllocTag                                  RT_MANGLER(RTMemAllocTag)
 # define RTMemAllocVarTag                               RT_MANGLER(RTMemAllocVarTag)
@@ -852 +852 @@
 # define RTMemExecFree                                  RT_MANGLER(RTMemExecFree)
 # define RTMemFree                                      RT_MANGLER(RTMemFree)
-# define RTMemFreeEx                                    RT_MANGLER(RTMemFreeEx)     /* r0drv */
+# define RTMemFreeEx                                    RT_MANGLER(RTMemFreeEx)
 # define RTMemPageAllocTag                              RT_MANGLER(RTMemPageAllocTag)
 # define RTMemPageAllocZTag                             RT_MANGLER(RTMemPageAllocZTag)

trunk/include/iprt/mem.h

@@ -314 +314 @@
  * Will return VERR_NOT_SUPPORTED if not supported. */
 #define RTMEMALLOCEX_FLAGS_ANY_CTX          (RTMEMALLOCEX_FLAGS_ANY_CTX_ALLOC | RTMEMALLOCEX_FLAGS_ANY_CTX_FREE)
+/** Reachable by 16-bit address.
+ * Will return VERR_NOT_SUPPORTED if not supported.  */
+#define RTMEMALLOCEX_FLAGS_16BIT_REACH      RT_BIT(4)
+/** Reachable by 32-bit address.
+ * Will return VERR_NOT_SUPPORTED if not supported.  */
+#define RTMEMALLOCEX_FLAGS_32BIT_REACH      RT_BIT(5)
 /** Mask of valid flags. */
-#define RTMEMALLOCEX_FLAGS_VALID_MASK       UINT32_C(0x0000000f)
+#define RTMEMALLOCEX_FLAGS_VALID_MASK       UINT32_C(0x0000003f)
+/** Mask of valid flags for ring-0. */
+#define RTMEMALLOCEX_FLAGS_VALID_MASK_R0    UINT32_C(0x0000000f)
 /** @}  */
 
@@ -337 +345 @@
 /**
  * Extended heap allocation API, custom tag.
+ *
+ * Depending on the implementation, using this function may add extra overhead,
+ * so use the simpler APIs where ever possible.
  *
  * @returns IPRT status code.
@@ -358 +369 @@
  * @param   pv                  What to free, NULL is fine.
  * @param   cb                  The amount of allocated memory.
+ * @param   fFlags              The flags specified when allocating the memory.
+ *                              Whether the exact flags are requires depends on
+ *                              the implementation, but in general, ring-0
+ *                              doesn't require anything while ring-3 requires
+ *                              RTMEMALLOCEX_FLAGS_EXEC if used.
  */
 RTDECL(void) RTMemFreeEx(void *pv, size_t cb) RT_NO_THROW;

trunk/src/VBox/Runtime/Makefile.kmk

@@ -583 +583 @@
         generic/RTThreadGetNativeState-generic.cpp \
         nt/RTErrConvertFromNtStatus.cpp \
+        r3/generic/allocex-r3-generic.cpp \
         r3/posix/env-posix.cpp \
         r3/win/RTHandleGetStandard-win.cpp \
@@ -638 +639 @@
         generic/utf16locale-generic.cpp \
         generic/uuid-generic.cpp \
+        r3/generic/allocex-r3-generic.cpp \
         r3/linux/RTThreadGetNativeState-linux.cpp \
         r3/linux/mp-linux.cpp \
@@ -735 +737 @@
         generic/RTThreadGetNativeState-generic.cpp \
         os2/RTErrConvertFromOS2.cpp \
+        r3/generic/allocex-r3-generic.cpp \
         r3/os2/filelock-os2.cpp \
         r3/os2/mp-os2.cpp \
@@ -808 +811 @@
         r3/darwin/time-darwin.cpp \
         r3/darwin/RTPathUserDocuments-darwin.cpp \
+        r3/generic/allocex-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
@@ -868 +872 @@
         r3/freebsd/mp-freebsd.cpp \
         r3/freebsd/rtProcInitExePath-freebsd.cpp \
+        r3/generic/allocex-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
@@ -928 +933 @@
         generic/uuid-generic.cpp \
         generic/RTThreadGetNativeState-generic.cpp \
+        r3/generic/allocex-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
@@ -1003 +1009 @@
         r3/haiku/rtProcInitExePath-haiku.cpp \
         r3/haiku/time-haiku.cpp \
+        r3/generic/allocex-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \

trunk/src/VBox/Runtime/include/internal/magics.h

@@ -115 +115 @@
 /** The magic value for heap blocks. (Edgar Allan Poe) */
 #define RTMEMHDR_MAGIC                  UINT32_C(0x18090119)
+/** The magic value for heap blocks after freeing. */
+#define RTMEMHDR_MAGIC_DEAD             UINT32_C(0x18491007)
 /** The value of RTPIPEINTERNAL::u32Magic. (Frank Schaetzing) */
 #define RTPIPE_MAGIC                    UINT32_C(0x19570528)

trunk/src/VBox/Runtime/r0drv/alloc-r0drv.cpp

@@ -350 +350 @@
      * Validate and convert flags.
      */
-    AssertMsgReturn(!(fFlags & ~RTMEMALLOCEX_FLAGS_VALID_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!(fFlags & ~RTMEMALLOCEX_FLAGS_VALID_MASK_R0), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
     if (fFlags & RTMEMALLOCEX_FLAGS_ZEROED)
         fHdrFlags |= RTMEMHDR_FLAG_ZEROED;