Minor fixes, add C++ placement new, n00bdemo 573 support

4 files changed, 38 insertions, 27 deletions

diff --git a/libpsn00b/include/elf.h b/libpsn00b/include/elf.h
index b4c4408..abfb3d5 100644
--- a/libpsn00b/include/elf.h
+++ b/libpsn00b/include/elf.h
@@ -12,7 +12,7 @@
 #ifndef __ELF_H
 #define __ELF_H 
 
-#include <sys/types.h>
+#include <stdint.h>
 
 typedef enum {
 	DT_NULL		= 0,		/* Marks end of dynamic section */
diff --git a/libpsn00b/libc/abort.c b/libpsn00b/libc/abort.c
index 1d07037..de4323d 100644
--- a/libpsn00b/libc/abort.c
+++ b/libpsn00b/libc/abort.c
@@ -1,5 +1,8 @@
+
 #include <stdio.h>
 
+/* Standard abort */
+
 void abort() {
 	printf("abort()\n");
 
@@ -7,9 +10,20 @@ void abort() {
 		__asm__ volatile("");
 }
 
+/* Internal function used by assert() macro */
+
 void _assert_abort(const char *file, int line, const char *expr) {
 	printf("%s:%d: assert(%s)\n", file, line, expr);
 
 	for (;;)
 		__asm__ volatile("");
 }
+
+/* Pure virtual function call (C++) */
+
+void __cxa_pure_virtual(void) {
+	printf("__cxa_pure_virtual()\n");
+
+	for (;;)
+		__asm__ volatile("");
+}
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;
+}
diff --git a/libpsn00b/libc/putchar.s b/libpsn00b/libc/putchar.s
deleted file mode 100644
index a3f6c57..0000000
--- a/libpsn00b/libc/putchar.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.set noreorder
-.section .text
-
-.global putchar
-.type putchar, @function
-putchar:
-	addiu	$t2, $0, 0xa0
-	jr		$t2
-	addiu	$t1, $0, 0x3c
-	
\ No newline at end of file