Use a fixed array size for checking the heaps

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -621,16 +621,11 @@ struct WarpByIndexStruct
 	const char *EntranceList[32];
 };
 
-struct CheckHeaps
-{
-	const char *StandardHeapArray[16];
-	const char *SmartHeapArray[16];
-};
-
 extern Menus Menu[27];
 extern Cheats Cheat[20];
 extern bool Displays[9];
 extern char DisplayBuffer[256];
+extern char HeapBuffer[1024];
 extern MemoryWatchStruct MemoryWatch[60];
 
 extern AutoIncrement AdjustableValueMenu;
@@ -651,7 +646,6 @@ extern OnScreenTimerDisplay OnScreenTimer;
 extern DisplayActionCommandTiming DisplayActionCommands;
 extern MemoryCardStruct MenuSettings;
 extern WarpByIndexStruct WarpByIndex;
-extern CheckHeaps CheckHeap;
 
 extern const char *VersionNumber;
 extern uint8_t CheatsOrder[];

ttyd-tools/rel/source/draw.cpp

@@ -3860,27 +3860,12 @@ void drawHeapArrayErrors()
 	int32_t PosY 			= 120;
 	float Scale 			= 0.6;
 
-	// Draw the standard heap text
-	const char **tempStandardHeapArray = CheckHeap.StandardHeapArray;
-	uint32_t Counter = 0;
-	
-	while (tempStandardHeapArray[Counter])
-	{
-		drawText(tempStandardHeapArray[Counter], PosX, PosY, Alpha, TextColor, Scale);
-		PosY -= 20;
-		Counter++;
-	}
-	
-	// Draw the smart heap text
-	const char **tempSmartHeapArray = CheckHeap.SmartHeapArray;
-	Counter = 0;
+	// Draw the text
+	char *tempHeapBuffer = HeapBuffer;
+	drawText(tempHeapBuffer, PosX, PosY, Alpha, TextColor, Scale);
 
-	while (tempSmartHeapArray[Counter])
-	{
-		drawText(tempSmartHeapArray[Counter], PosX, PosY, Alpha, TextColor, Scale);
-		PosY -= 20;
-		Counter++;
-	}
+	// Clear the heap buffer
+	clearMemory(tempHeapBuffer, sizeof(HeapBuffer));
 }
 
 void drawTitleScreenInfo()

ttyd-tools/rel/source/global.cpp

@@ -1321,6 +1321,7 @@ struct Menus Menu[27];
 struct Cheats Cheat[20];
 bool Displays[9];
 char DisplayBuffer[256];
+char HeapBuffer[1024];
 struct MemoryWatchStruct MemoryWatch[60];
 
 struct AutoIncrement AdjustableValueMenu;
@@ -1341,7 +1342,6 @@ struct OnScreenTimerDisplay OnScreenTimer;
 struct DisplayActionCommandTiming DisplayActionCommands;
 struct MemoryCardStruct MenuSettings;
 struct WarpByIndexStruct WarpByIndex;
-struct CheckHeaps CheckHeap;
 
 bool HideMenu 							= false;
 bool MenuIsDisplayed 					= false;

ttyd-tools/rel/source/main.cpp

@@ -382,68 +382,32 @@ uint32_t Mod::pauseArtAttackTimer()
 	return mPFN_scissor_timer_main_trampoline();
 }
 
-void clearHeapArray(const char **heap)
+void addTextToHeapArray(char *text)
 {
-	uint32_t Counter = 0;
-	while (heap[Counter])
-	{
-		delete[] heap[Counter];
-		heap[Counter] = nullptr;
-		Counter++;
-	}
-}
-
-void addTextToHeapArray(const char **heap, char *text)
-{
-	// Get the next available slot in the array
-	uint32_t TotalSlots = 16;
-	int32_t FreeSlot = -1;
+	char *tempHeapBuffer = HeapBuffer;
 
-	for (uint32_t i = 0; i < TotalSlots; i++)
-	{
-		if (!heap[i])
-		{
-			FreeSlot = i;
-			break;
-		}
-	}
+	// Make sure adding the new text will not result in an overflow
+	uint32_t NewTextSize = ttyd::string::strlen(text);
+	uint32_t CurrentHeapSize = ttyd::string::strlen(tempHeapBuffer);
 
-	// Make sure the new text can be added
-	if (FreeSlot == -1)
+	uint32_t NewHeapSize = CurrentHeapSize + NewTextSize + 1;
+	uint32_t MaxHeapSize = sizeof(HeapBuffer);
+	
+	if (NewHeapSize > MaxHeapSize)
 	{
-		// The new text cannot be added
+		// Adding the new text will result in an overflow, so don't add it
 		return;
 	}
 
-	// Add the new text at the current free slot
-	uint32_t TextSize = ttyd::string::strlen(text);
-	char *NewText = new char[TextSize + 1];
-	ttyd::string::strcpy(NewText, text);
-	heap[FreeSlot] = NewText;
-}
-
-bool checkIfTextAlreadyAdded(const char **heap, const char *text, uint32_t bytesToCompare)
-{
-	uint32_t Counter = 0;
-	while (heap[Counter])
-	{
-		if (compareStringsSize(heap[Counter], text, bytesToCompare))
-		{
-			return true;
-		}
-		Counter++;
-	}
-	return false;
+	// Add the new text onto the heap
+	ttyd::string::strcat(tempHeapBuffer, text);
 }
 
 void checkHeaps()
 {
-	const char **tempStandardHeapArray = CheckHeap.StandardHeapArray;
-	const char **tempSmartHeapArray = CheckHeap.SmartHeapArray;
 	char *tempDisplayBuffer = DisplayBuffer;
 
 	// Check the standard heaps
-	bool ErrorsFound = false;
 	for (int32_t i = 0; i < 5; i++)
 	{
 		const gc::os::HeapInfo &heap = gc::os::OSAlloc_HeapArray[i];
@@ -456,23 +420,20 @@ void checkHeaps()
 			// Check pointer sanity
 			if (!checkIfPointerIsValid(currentChunk))
 			{
-				ErrorsFound = true;
 				valid = false;
 				break;
 			}
 
 			// Sanity check size
 			if (currentChunk->size > 0x17FFFFF)
 			{
-				ErrorsFound = true;
 				valid = false;
 				break;
 			}
 
 			// Check linked list integrity
 			if (prevChunk != currentChunk->prev)
 			{
-				ErrorsFound = true;
 				valid = false;
 				break;
 			}
@@ -483,24 +444,15 @@ void checkHeaps()
 		if (!valid)
 		{
 			sprintf(tempDisplayBuffer,
-				"Standard Heap %" PRId32 " corrupted at 0x%08" PRIX32,
+				"Standard Heap %" PRId32 " corrupted at 0x%08" PRIX32 "\n",
 				i,
 				reinterpret_cast<uint32_t>(currentChunk));
 
-			// Only add the current heap once
-			if (!checkIfTextAlreadyAdded(tempStandardHeapArray, tempDisplayBuffer, 16))
-			{	
-				addTextToHeapArray(tempStandardHeapArray, tempDisplayBuffer);
-			}
+			// Add the text to the heap buffer
+			addTextToHeapArray(tempDisplayBuffer);
 		}
 	}
 
-	if (!ErrorsFound)
-	{
-		// No errors were found, so clear the standard heap array
-		clearHeapArray(tempStandardHeapArray);
-	}
-	
 	// Check the smart heap
 	ttyd::memory::SmartWork *gpSmartWork = *reinterpret_cast<ttyd::memory::SmartWork **>(SmartWorkAddress);
 	bool valid = true;
@@ -536,23 +488,15 @@ void checkHeaps()
 	if (!valid)
 	{
 		sprintf(tempDisplayBuffer,
-			"Smart Heap corrupted at 0x%08" PRIX32,
+			"Smart Heap corrupted at 0x%08" PRIX32 "\n",
 			reinterpret_cast<uint32_t>(currentChunk));
 
-		// Only add the current heap once
-		if (!checkIfTextAlreadyAdded(tempSmartHeapArray, tempDisplayBuffer, 16))
-		{	
-			addTextToHeapArray(tempSmartHeapArray, tempDisplayBuffer);
-		}
-	}
-	else
-	{
-		// No errors were found, so clear the smart heap array
-		clearHeapArray(tempSmartHeapArray);
+		// Add the text to the heap buffer
+		addTextToHeapArray(tempDisplayBuffer);
 	}
 
 	// Draw any errors that occured
-	if (tempStandardHeapArray[0] || tempSmartHeapArray[0])
+	if (HeapBuffer[0] != '\0')
 	{
 		drawFunctionOnDebugLayer(drawHeapArrayErrors);
 	}