From 8c68b4b8a5bf7757b8e4d6bc2f68f10584b0deb1 Mon Sep 17 00:00:00 2001
From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com>
Date: Sat, 12 Mar 2022 14:28:11 +0100
Subject: Minor fixes, add C++ placement new, n00bdemo 573 support

---
 libpsn00b/libc/c++-support.cxx | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'libpsn00b/libc/c++-support.cxx')

diff --git a/libpsn00b/libc/c++-support.cxx b/libpsn00b/libc/c++-support.cxx
index d0c0f3a..38354dd 100644
--- a/libpsn00b/libc/c++-support.cxx
+++ b/libpsn00b/libc/c++-support.cxx
@@ -1,39 +1,46 @@
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-extern "C" void __cxa_pure_virtual(void) {
-	printf("__cxa_pure_virtual()\n");
-
-	for (;;)
-		__asm__ volatile("");
-}
+/* Default new/delete operators */
 
-void* operator new(size_t size) {
+void *operator new(size_t size) noexcept {
 	return malloc(size);
 }
 
-void* operator new[](size_t size) {
+void *operator new[](size_t size) noexcept {
 	return malloc(size);
 }
 
-void operator delete(void* ptr) {
+void operator delete(void *ptr) noexcept {
 	free(ptr);
 }
 
-void operator delete[](void* ptr) {
+void operator delete[](void *ptr) noexcept {
 	free(ptr);
 }
 
-/*-
- * <https://en.cppreference.com/w/cpp/memory/new/operator_delete>
+/*
+ * https://en.cppreference.com/w/cpp/memory/new/operator_delete
  *
  * Called if a user-defined replacement is provided, except that it's
  * unspecified whether other overloads or this overload is called when deleting
- * objects of incomplete type and arrays of non-class and trivially-destructible
- * class types.
+ * objects of incomplete type and arrays of non-class and trivially
+ * destructible class types.
  *
- * A memory allocator can use the given size to be more efficient */
-void operator delete(void* ptr, unsigned int) {
+ * A memory allocator can use the given size to be more efficient.
+ */
+void operator delete(void *ptr, size_t size) noexcept {
 	free(ptr);
 }
+
+/* Placement new operators */
+
+void *operator new(size_t size, void *ptr) noexcept {
+	return ptr;
+}
+
+void *operator new[](size_t size, void *ptr) noexcept {
+	return ptr;
+}
-- 
cgit v1.2.3