From 72db767f5a5bdb958bb11bcb6fe6b9b332a2b195 Mon Sep 17 00:00:00 2001
From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com>
Date: Sun, 20 Feb 2022 12:31:31 +0100
Subject: Rewrite assert() and DL_CALL(), update mkpsxiso

---
 libpsn00b/psxetc/dl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libpsn00b/psxetc/dl.c')

diff --git a/libpsn00b/psxetc/dl.c b/libpsn00b/psxetc/dl.c
index cbdcb66..6d37605 100644
--- a/libpsn00b/psxetc/dl.c
+++ b/libpsn00b/psxetc/dl.c
@@ -587,7 +587,8 @@ DLL *DL_CreateDLL(void *ptr, size_t size, DL_ResolveMode mode) {
 	if (ctor_list) {
 		for (uint32_t i = ((uint32_t) ctor_list[0]); i >= 1; i--) {
 			void (*ctor)(void) = (void (*)(void)) ctor_list[i];
-			DL_CALL(ctor);
+			DL_PRE_CALL(ctor);
+			ctor();
 		}
 	}
 
@@ -619,7 +620,8 @@ void DL_DestroyDLL(DLL *dll) {
 		if (dtor_list) {
 			for (uint32_t i = 0; i < ((uint32_t) dtor_list[0]); i++) {
 				void (*dtor)(void) = (void (*)(void)) dtor_list[i + 1];
-				DL_CALL(dtor);
+				DL_PRE_CALL(dtor);
+				dtor();
 			}
 		}
 	}
-- 
cgit v1.2.3