Changeset 101786 in vbox for trunk

Timestamp:

Nov 4, 2023 7:58:23 PM (16 months ago)

Author:

vboxsync

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

159882

Message:

libs/xpcom: Make PR_Malloc and friends inline helpers and get rid of prmem.c, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/prmem.h (modified) (2 diffs)
• nsprpub/pr/src/malloc (deleted)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -526 +526 @@
         nsprpub/pr/src/io/prstdio.c \
         nsprpub/pr/src/linking/prlink.c \
-        nsprpub/pr/src/malloc/prmem.c \
         nsprpub/pr/src/md/prosdep.c \
         nsprpub/pr/src/memory/prseg.c \

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prmem.h

@@ -47 +47 @@
 #include <stddef.h>
 #include <stdlib.h>
+#include <iprt/mem.h>
 
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
@@ -64 +65 @@
 */
 
-/*
-** PR_Malloc, PR_Calloc, PR_Realloc, and PR_Free have the same signatures
-** as their libc equivalent malloc, calloc, realloc, and free, and have
-** the same semantics.  (Note that the argument type size_t is replaced
-** by PRUint32.)  Memory allocated by PR_Malloc, PR_Calloc, or PR_Realloc
-** must be freed by PR_Free.
-*/
+#ifdef VBOX
+DECL_FORCE_INLINE(void *) PR_Malloc(PRUint32 size)
+{
+    return RTMemAlloc(RT_MAX(size, 1));
+}
 
-NSPR_API(void *) PR_Malloc(PRUint32 size);
+DECL_FORCE_INLINE(void *) PR_Calloc(PRUint32 nelem, PRUint32 elsize)
+{
+    return RTMemAllocZ(RT_MAX(nelem * (size_t)elsize, 1));
+}
 
-NSPR_API(void *) PR_Calloc(PRUint32 nelem, PRUint32 elsize);
+DECL_FORCE_INLINE(void *) PR_Realloc(void *ptr, PRUint32 size)
+{
+    return RTMemRealloc(ptr, size);
+}
 
-NSPR_API(void *) PR_Realloc(void *ptr, PRUint32 size);
-
-NSPR_API(void) PR_Free(void *ptr);
+DECL_FORCE_INLINE(void) PR_Free(void *ptr)
+{
+    RTMemFree(ptr);
+}
+#else
+# error "Not supported"
+#endif
 
 /*