Implemented a function for drawing on the debug layer with a specified order

Currently applying this to the heap errors, as they need to be readable when displayed with other things.

Author: Zephiles

ttyd-tools/rel/Makefile

@@ -54,7 +54,7 @@ MACHDEP		= -mno-sdata -mgcn -DGEKKO -mcpu=750 -meabi -mhard-float
 CFLAGS		= -nostdlib -ffreestanding -ffunction-sections -fdata-sections -g -Os -Wall -Werror $(MACHDEP) $(INCLUDE)
 CXXFLAGS	= -fno-exceptions -fno-rtti -std=gnu++17 $(CFLAGS)
 
-FUNCWRAPS	= -Wl,--wrap,sprintf -Wl,--wrap,strcmp -Wl,--wrap,strncmp -Wl,--wrap,strcpy -Wl,--wrap,strncpy -Wl,--wrap,strcat -Wl,--wrap,strlen -Wl,--wrap,memcpy -Wl,--wrap,memset -Wl,--wrap,sysMsec2Frame -Wl,--wrap,keyGetButton -Wl,--wrap,keyGetButtonTrg -Wl,--wrap,seqGetSeq -Wl,--wrap,seqGetNextSeq -Wl,--wrap,swByteGet -Wl,--wrap,swByteSet -Wl,--wrap,swClear -Wl,--wrap,swSet -Wl,--wrap,marioStGetSystemLevel -Wl,--wrap,marioStSystemLevel -Wl,--wrap,marioGetPartyId -Wl,--wrap,marioGetExtraPartyId -Wl,--wrap,marioGetPtr -Wl,--wrap,partyGetPtr -Wl,--wrap,pouchGetPtr -Wl,--wrap,btlGetScreenPoint -Wl,--wrap,evtGetWork -Wl,--wrap,eventStgNum -Wl,--wrap,eventStgDtPtr -Wl,--wrap,winGetPtr -Wl,--wrap,winOpenEnable -Wl,--wrap,CARDClose -Wl,--wrap,DCFlushRange -Wl,--wrap,ICInvalidateRange -Wl,--wrap,__udivdi3 -Wl,--wrap,__umoddi3
+FUNCWRAPS	= -Wl,--wrap,sprintf -Wl,--wrap,strcmp -Wl,--wrap,strncmp -Wl,--wrap,strcpy -Wl,--wrap,strncpy -Wl,--wrap,strcat -Wl,--wrap,strlen -Wl,--wrap,memcpy -Wl,--wrap,memset -Wl,--wrap,sysMsec2Frame -Wl,--wrap,keyGetButton -Wl,--wrap,keyGetButtonTrg -Wl,--wrap,seqGetSeq -Wl,--wrap,seqGetNextSeq -Wl,--wrap,swByteGet -Wl,--wrap,swByteSet -Wl,--wrap,swClear -Wl,--wrap,swSet -Wl,--wrap,marioStGetSystemLevel -Wl,--wrap,marioStSystemLevel -Wl,--wrap,marioGetPartyId -Wl,--wrap,marioGetExtraPartyId -Wl,--wrap,marioGetPtr -Wl,--wrap,partyGetPtr -Wl,--wrap,pouchGetPtr -Wl,--wrap,btlGetScreenPoint -Wl,--wrap,evtGetWork -Wl,--wrap,eventStgNum -Wl,--wrap,eventStgDtPtr -Wl,--wrap,winGetPtr -Wl,--wrap,winOpenEnable -Wl,--wrap,CARDClose -Wl,--wrap,DCFlushRange -Wl,--wrap,ICInvalidateRange -Wl,--wrap,__udivdi3 -Wl,--wrap,__umoddi3 -Wl,--wrap,dispEntry
 
 LDFLAGS		= -r -e _prolog -u _prolog -u _epilog -u _unresolved -Wl,--gc-sections -nostdlib -g $(MACHDEP) -Wl,-Map,$(notdir $@).map $(FUNCWRAPS)
 

ttyd-tools/rel/include/draw.h

@@ -5,6 +5,7 @@
 namespace mod {
 
 void drawFunctionOnDebugLayer(void (*func)());
+void drawFunctionOnDebugLayerWithOrder(void (*func)(), float order);
 void drawFunctionOn2DLayer(void (*func)());
 
 void drawMenuWindow();

ttyd-tools/rel/source/draw.cpp

@@ -59,6 +59,15 @@ void drawFunctionOnDebugLayer(void (*func)())
 	}, reinterpret_cast<void *>(func));
 }
 
+void drawFunctionOnDebugLayerWithOrder(void (*func)(), float order)
+{
+	ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::kDebug3d, 2, order, 
+		[](ttyd::dispdrv::CameraId cameraId, void *user)
+	{
+		reinterpret_cast<void (*)()>(user)();
+	}, reinterpret_cast<void *>(func));
+}
+
 void drawFunctionOn2DLayer(void (*func)())
 {
 	ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::k2d, 2, 0.f, 

ttyd-tools/rel/source/main.cpp

@@ -629,7 +629,7 @@ void checkHeaps()
 	// Draw any errors that occured
 	if (HeapBuffer[0] != '\0')
 	{
-		drawFunctionOnDebugLayer(drawHeapArrayErrors);
+		drawFunctionOnDebugLayerWithOrder(drawHeapArrayErrors, 100.f);
 	}
 }
 

ttyd-tools/rel/source/wrappers.cpp

@@ -4,6 +4,7 @@
 #include <ttyd/mario.h>
 #include <ttyd/evtmgr.h>
 #include <ttyd/event.h>
+#include <ttyd/dispdrv.h>
 
 #include <cstdint>
 #include <cstdio>
@@ -49,6 +50,9 @@ extern "C"
 	uint64_t __real___udivdi3(uint64_t a, uint64_t b);
 	uint64_t __real___umoddi3(uint64_t a, uint64_t b);
 
+	void __real_dispEntry(ttyd::dispdrv::CameraId cameraId, uint8_t renderMode, 
+		float order, ttyd::dispdrv::PFN_dispCallback callback, void *user);
+	
 	// Wrap functions
 	// sprintf
 	__attribute__((noinline)) int32_t __wrap_sprintf(char *buffer, const char *format, ...)
@@ -269,4 +273,11 @@ extern "C"
 	{
 		return __real___umoddi3(a, b);
 	}
+	
+	// dispEntry
+	__attribute__((noinline)) void __wrap_dispEntry(ttyd::dispdrv::CameraId cameraId, 
+		uint8_t renderMode, float order, ttyd::dispdrv::PFN_dispCallback callback, void *user)
+	{
+		__real_dispEntry(cameraId, renderMode, order, callback, user);
+	}
 }