Clean up SDK debug logging, fix getTPage()

1 files changed, 13 insertions, 8 deletions

diff --git a/libpsn00b/libc/abort.c b/libpsn00b/libc/abort.c
index 2db5016..9a4661a 100644
--- a/libpsn00b/libc/abort.c
+++ b/libpsn00b/libc/abort.c
@@ -1,19 +1,24 @@
+/*
+ * PSn00bSDK assert macro and internal logging
+ * (C) 2022 spicyjpeg - MPL licensed
+ */
 
-#include <psxetc.h>
+#include <assert.h>
+#include <psxapi.h>
 
-/* Standard abort */
+/* Internal function used by assert() macro */
 
-void abort(void) {
-	_sdk_log("abort()\n");
+void _assert_abort(const char *file, int line, const char *expr) {
+	_sdk_log_inner("%s:%d: assert(%s)\n", file, line, expr);
 
 	for (;;)
 		__asm__ volatile("");
 }
 
-/* Internal function used by assert() macro */
+/* Standard abort */
 
-void _assert_abort(const char *file, int line, const char *expr) {
-	_sdk_log("%s:%d: assert(%s)\n", file, line, expr);
+void abort(void) {
+	_sdk_log_inner("abort()\n");
 
 	for (;;)
 		__asm__ volatile("");
@@ -22,7 +27,7 @@ void _assert_abort(const char *file, int line, const char *expr) {
 /* Pure virtual function call (C++) */
 
 void __cxa_pure_virtual(void) {
-	_sdk_log("__cxa_pure_virtual()\n");
+	_sdk_log_inner("__cxa_pure_virtual()\n");
 
 	for (;;)
 		__asm__ volatile("");