nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add GFX Stack to crash handler ext (#6130)

Browse Source
This commit is contained in:
Garrett Cox
2026-01-11 23:11:42 -06:00
committed by GitHub
parent 45fb38e309
commit e149e09e08
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
soh/soh/CrashHandlerExt.cpp
View File

@@ -5,6 +5,8 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <array> #include <array>
#include "soh/ActorDB.h"
#include <fast/interpreter.h>
#define WRITE_VAR_LINE(buff, len, varName, varValue) \ #define WRITE_VAR_LINE(buff, len, varName, varValue) \
append_str(buff, len, varName); \ append_str(buff, len, varName); \
@@ -40,7 +42,6 @@ static void append_line(char* buf, size_t* len, const char* str) {
static void CrashHandler_WriteActorData(char* buffer, size_t* pos) { static void CrashHandler_WriteActorData(char* buffer, size_t* pos) {
char intCharBuffer[16]; char intCharBuffer[16];
append_line(buffer, pos, "Actor Id Params");
for (unsigned int i = 0; i < ACTORCAT_MAX; i++) { for (unsigned int i = 0; i < ACTORCAT_MAX; i++) {
ActorListEntry* entry = &gPlayState->actorCtx.actorLists[i]; ActorListEntry* entry = &gPlayState->actorCtx.actorLists[i];
@@ -49,16 +50,15 @@ static void CrashHandler_WriteActorData(char* buffer, size_t* pos) {
if (entry->length == 0) { if (entry->length == 0) {
continue; continue;
} }
WRITE_VAR_LINE(buffer, pos, "Actor Cat: ", sCatToStrArray[i]); WRITE_VAR_LINE(buffer, pos, " Category: ", sCatToStrArray[i]);
cur = entry->head; cur = entry->head;
while (cur != nullptr) { while (cur != nullptr) {
// Actor ID std::string actorLine = " ";
snprintf(intCharBuffer, sizeof(intCharBuffer), "0x%03X ", cur->id); actorLine += ActorDB::Instance->RetrieveEntry(cur->id).entry.valid
append_str(buffer, pos, intCharBuffer); ? ActorDB::Instance->RetrieveEntry(cur->id).entry.desc
: "???";
// Actor Params actorLine += " (" + std::to_string(cur->params) + ")";
snprintf(intCharBuffer, sizeof(intCharBuffer), "0x%04X", cur->params); append_line(buffer, pos, actorLine.c_str());
append_line(buffer, pos, intCharBuffer);
cur = cur->next; cur = cur->next;
} }
@@ -74,12 +74,21 @@ extern "C" void CrashHandler_PrintSohData(char* buffer, size_t* pos) {
WRITE_VAR_LINE(buffer, pos, " Build Date: ", (const char*)gBuildDate); WRITE_VAR_LINE(buffer, pos, " Build Date: ", (const char*)gBuildDate);
if (gPlayState != nullptr) { if (gPlayState != nullptr) {
append_line(buffer, pos, "Actors:");
CrashHandler_WriteActorData(buffer, pos);
WRITE_VAR_LINE(buffer, pos, "Scene: ", sSceneIdToStrArray[gPlayState->sceneNum]); WRITE_VAR_LINE(buffer, pos, "Scene: ", sSceneIdToStrArray[gPlayState->sceneNum]);
snprintf(intCharBuffer, sizeof(intCharBuffer), "%i", gPlayState->roomCtx.curRoom.num); snprintf(intCharBuffer, sizeof(intCharBuffer), "%i", gPlayState->roomCtx.curRoom.num);
WRITE_VAR_LINE(buffer, pos, "Room: ", intCharBuffer); WRITE_VAR_LINE(buffer, pos, "Room: ", intCharBuffer);
append_line(buffer, pos, "Actors:");
CrashHandler_WriteActorData(buffer, pos);
append_line(buffer, pos, "GFX Stack:");
for (auto& disp : Fast::g_exec_stack.disp_stack) {
std::string line = " ";
line += disp.file;
line += ":";
line += std::to_string(disp.line);
append_line(buffer, pos, line.c_str());
}
} }
} }