Changeset 95860 in vbox

Timestamp:

Jul 27, 2022 12:54:16 AM (3 years ago)

Author:

vboxsync

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

152585

Message:

IPRT/new: Added a generic new/delete operator implementation based on RTMemAlloc (derived from alloc-ef-cpp.cpp). bugref:10261

Location:

trunk

Files:

• include/iprt/nocrt/new (added)
• src/VBox/Runtime/generic/new-delete-generic.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/alloc-ef-cpp.cpp ) (3 diffs)

trunk/src/VBox/Runtime/generic/new-delete-generic.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include "alloc-ef.h"
+#include <iprt/nocrt/new>
 
-#include <iprt/asm.h>
-#include <new>
+#include <iprt/assert.h>
+#include <iprt/mem.h>
 
 
@@ -40 +40 @@
 /** @todo test this on MSC */
 
-/** MSC declares the operators as cdecl it seems. */
-#ifdef _MSC_VER
-# define RT_EF_CDECL    __cdecl
-#else
-# define RT_EF_CDECL
-#endif
-
-/** MSC doesn't use the standard namespace. */
-#ifdef _MSC_VER
-# define RT_EF_SIZE_T   size_t
-#else
-# define RT_EF_SIZE_T   std::size_t
-#endif
-
-/** The hint that we're throwing std::bad_alloc is not apprecitated by MSC. */
+void *RT_NEW_DELETE_CDECL operator new(RT_NEW_DELETE_SIZE_T cb) RT_NEW_DELETE_THROWS_BAD_ALLOC
+{
+    void *pv = RTMemAlloc(cb);
 #ifdef RT_EXCEPTIONS_ENABLED
-# ifdef _MSC_VER
-#  define RT_EF_THROWS_BAD_ALLOC
-#  define RT_EF_NOTHROW               RT_NO_THROW_DEF
-# else
-#  ifdef _GLIBCXX_THROW
-#   define RT_EF_THROWS_BAD_ALLOC     _GLIBCXX_THROW(std::bad_alloc)
-#  elif defined(__cplusplus) && (__cplusplus + 0) < 201700
-#   define RT_EF_THROWS_BAD_ALLOC     throw(std::bad_alloc)
-#  else
-#   define RT_EF_THROWS_BAD_ALLOC     noexcept(false)
-#  endif
-#  define RT_EF_NOTHROW               throw()
-# endif
-#else  /* !RT_EXCEPTIONS_ENABLED */
-# define RT_EF_THROWS_BAD_ALLOC
-# define RT_EF_NOTHROW
-#endif /* !RT_EXCEPTIONS_ENABLED */
-
-
-void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb) RT_EF_THROWS_BAD_ALLOC
-{
-    void *pv = rtR3MemAlloc("new", RTMEMTYPE_NEW, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
     if (!pv)
         throw std::bad_alloc();
+#endif
     return pv;
 }
 
 
-void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb, const std::nothrow_t &) RT_EF_NOTHROW
+void *RT_NEW_DELETE_CDECL operator new(RT_NEW_DELETE_SIZE_T cb, const std::nothrow_t &) RT_NEW_DELETE_NOTHROW
 {
-    void *pv = rtR3MemAlloc("new nothrow", RTMEMTYPE_NEW, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
-    return pv;
+    return RTMemAlloc(cb);
 }
 
 
-void RT_EF_CDECL operator delete(void *pv) RT_EF_NOTHROW
+void RT_NEW_DELETE_CDECL operator delete(void *pv) RT_NEW_DELETE_NOTHROW
 {
-    rtR3MemFree("delete", RTMEMTYPE_DELETE, pv, 0, ASMReturnAddress(), NULL, 0, NULL);
+    RTMemFree(pv);
 }
 
 
 #ifdef __cpp_sized_deallocation
-void RT_EF_CDECL operator delete(void *pv, RT_EF_SIZE_T cb) RT_EF_NOTHROW
+void RT_NEW_DELETE_CDECL operator delete(void *pv, RT_NEW_DELETE_SIZE_T cb) RT_NEW_DELETE_NOTHROW
 {
     NOREF(cb);
     AssertMsgFailed(("cb ignored!\n"));
-    rtR3MemFree("delete", RTMEMTYPE_DELETE, pv, 0, ASMReturnAddress(), NULL, 0, NULL);
+    RTMemFree(pv);
 }
 #endif
 
 
-void RT_EF_CDECL operator delete(void * pv, const std::nothrow_t &) RT_EF_NOTHROW
+void RT_NEW_DELETE_CDECL operator delete(void *pv, const std::nothrow_t &) RT_NEW_DELETE_NOTHROW
 {
-    rtR3MemFree("delete nothrow", RTMEMTYPE_DELETE, pv, 0, ASMReturnAddress(), NULL, 0, NULL);
+    RTMemFree(pv);
 }
 
@@ -121 +87 @@
  */
 
-void *RT_EF_CDECL operator new[](RT_EF_SIZE_T cb) RT_EF_THROWS_BAD_ALLOC
+void *RT_NEW_DELETE_CDECL operator new[](RT_NEW_DELETE_SIZE_T cb) RT_NEW_DELETE_THROWS_BAD_ALLOC
 {
-    void *pv = rtR3MemAlloc("new[]", RTMEMTYPE_NEW_ARRAY, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
+    void *pv = RTMemAlloc(cb);
+#ifdef RT_EXCEPTIONS_ENABLED
     if (!pv)
         throw std::bad_alloc();
+#endif
     return pv;
 }
 
 
-void * RT_EF_CDECL operator new[](RT_EF_SIZE_T cb, const std::nothrow_t &) RT_EF_NOTHROW
+void *RT_NEW_DELETE_CDECL operator new[](RT_NEW_DELETE_SIZE_T cb, const std::nothrow_t &) RT_NEW_DELETE_NOTHROW
 {
-    void *pv = rtR3MemAlloc("new[] nothrow", RTMEMTYPE_NEW_ARRAY, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
-    return pv;
+    return RTMemAlloc(cb);
 }
 
 
-void RT_EF_CDECL operator delete[](void * pv) RT_EF_NOTHROW
+void RT_NEW_DELETE_CDECL operator delete[](void * pv) RT_NEW_DELETE_NOTHROW
 {
-    rtR3MemFree("delete[]", RTMEMTYPE_DELETE_ARRAY, pv, 0, ASMReturnAddress(), NULL, 0, NULL);
+    RTMemFree(pv);
 }
 
 
 #ifdef __cpp_sized_deallocation
-void RT_EF_CDECL operator delete[](void * pv, RT_EF_SIZE_T cb) RT_EF_NOTHROW
+void RT_NEW_DELETE_CDECL operator delete[](void * pv, RT_NEW_DELETE_SIZE_T cb) RT_NEW_DELETE_NOTHROW
 {
     NOREF(cb);
     AssertMsgFailed(("cb ignored!\n"));
-    rtR3MemFree("delete[]", RTMEMTYPE_DELETE_ARRAY, pv, 0, ASMReturnAddress(), NULL, 0, NULL);
+    RTMemFree(pv);
 }
 #endif
 
 
-void RT_EF_CDECL operator delete[](void *pv, const std::nothrow_t &) RT_EF_NOTHROW
+void RT_NEW_DELETE_CDECL operator delete[](void *pv, const std::nothrow_t &) RT_NEW_DELETE_NOTHROW
 {
-    rtR3MemFree("delete[] nothrow", RTMEMTYPE_DELETE_ARRAY, pv, 0, ASMReturnAddress(), NULL, 0, NULL);
+    RTMemFree(pv);
 }