Compare commits

...

2 Commits

Author SHA1 Message Date
coah
928026a802 cleanup(ErrorHandler): name set() arg storage fields
Rename unused debug-ish stash fields to match ErrorHandler::set params:
- unk_0x14 → mArg1 (char[4] from arg1)
- unk_0x0C → mArg2
- unk_0x10 → mArg3

Verified: ErrorHandler 100%/100%, build/43U/ok, DOL sha1
26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-02 14:06:29 -05:00
coah
00013016df cleanup(iplBS2Manager): name tick/update/abort/restart flags (#857)
unk_0x0C -> mbTickEnabled
unk_0x0D -> mbUpdateRequested
unk_0x0E -> mbAbortRequested
unk_0x0F -> mbRestartRequested

Matching 100% before/after; DOL sha1 unchanged.
2026-10-02 14:03:18 -05:00
4 changed files with 31 additions and 31 deletions

View File

@@ -89,10 +89,10 @@ namespace ipl {
int mIPLState; // 0x04
volatile BS2State mState; // 0x08
bool unk_0x0C;
bool unk_0x0D;
bool unk_0x0E;
bool unk_0x0F;
bool mbTickEnabled; // 0x0C
bool mbUpdateRequested; // 0x0D
bool mbAbortRequested; // 0x0E
bool mbRestartRequested; // 0x0F
bool mbIsDiagDisc; // 0x10
bool mbIncludesSeatTitles; // 0x11
u8* mpBannerBuffer; // 0x14

View File

@@ -60,9 +60,9 @@ namespace ipl {
int mMessageID; // 0x08
int unk_0x0C;
int unk_0x10;
char unk_0x14[4];
int mArg2;
int mArg3;
char mArg1[4];
u8* mpArcData; // 0x18
u32 mArcSize; // 0x1C

View File

@@ -14,7 +14,7 @@
namespace ipl {
namespace bs2 {
Manager::Manager(EGG::Heap* pHeap)
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), unk_0x0C(true), unk_0x0D(false), unk_0x0E(false), unk_0x0F(false),
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), mbTickEnabled(true), mbUpdateRequested(false), mbAbortRequested(false), mbRestartRequested(false),
mbIsDiagDisc(false), mbIncludesSeatTitles(false), mbHasBanner(FALSE), mUnlockedState(BS2_STT_NO_DISK), mbStartUpdate(false),
mEntries(NULL), mEntrySize(1), mEntryOffset(0) {
mpBannerBuffer = new (pHeap, DEFAULT_ALIGN) u8[BS2_DEFAULT_BANNER_SIZE];
@@ -30,13 +30,13 @@ namespace ipl {
return mIPLState;
}
if (unk_0x0F && !System::isNandFull()) {
if (mbRestartRequested && !System::isNandFull()) {
BS2RestartStateMachine();
unk_0x0C = true;
mbTickEnabled = true;
mIPLState = IPL_STATE_NO_DISK;
unk_0x0F = false;
} else if (unk_0x0C) {
mbRestartRequested = false;
} else if (mbTickEnabled) {
BOOL old = OSDisableInterrupts();
mState = BS2Tick();
@@ -51,7 +51,7 @@ namespace ipl {
if (mbIsDiagDisc && System::isRsrcLoaded()) {
__WPADReconnect(TRUE);
unk_0x0C = false;
mbTickEnabled = false;
bootNewSystem();
}
}
@@ -65,7 +65,7 @@ namespace ipl {
}
void Manager::startUpdate() {
unk_0x0D = true;
mbUpdateRequested = true;
mbStartUpdate = true;
mPrevEntry = 0;
mPrevFound = 0;
@@ -88,11 +88,11 @@ namespace ipl {
}
void Manager::reserveRVLGame() {
unk_0x0C = false;
mbTickEnabled = false;
}
void Manager::reserveGCGame() {
unk_0x0C = false;
mbTickEnabled = false;
}
void Manager::startRVLGame() {
@@ -103,13 +103,13 @@ namespace ipl {
}
void Manager::abort() {
unk_0x0E = true;
unk_0x0F = false;
mbAbortRequested = true;
mbRestartRequested = false;
}
void Manager::restart() {
unk_0x0E = false;
unk_0x0F = true;
mbAbortRequested = false;
mbRestartRequested = true;
System::checkNandOverFlowFlagAsync();
}
@@ -195,7 +195,7 @@ namespace ipl {
break;
}
case BS2_STT_64: {
unk_0x0C = false;
mbTickEnabled = false;
mIPLState = IPL_STATE_8;
break;
}
@@ -216,25 +216,25 @@ namespace ipl {
}
void Manager::execTick(BS2State state) {
if (unk_0x0D) {
if (mbUpdateRequested) {
if (state == BS2_STT_UPDATE_DISK) {
BS2StartUpdate();
} else {
mbStartUpdate = false;
}
} else if (unk_0x0E) {
} else if (mbAbortRequested) {
if (state == BS2_STT_NO_DISK || state == BS2_STT_COVER_OPEN || state == BS2_STT_55 || state == BS2_STT_WRONG_DISK ||
state == BS2_STT_66 || state == BS2_STT_67 || state == BS2_STT_68 || state == BS2_STT_FATAL_ERROR ||
state == BS2_STT_UPDATE_FAILED || state == BS2_STT_DIRTY_DISK) {
unk_0x0C = false;
mbTickEnabled = false;
mIPLState = IPL_STATE_8;
} else {
BS2AbortStateMachine();
}
}
unk_0x0D = false;
unk_0x0E = false;
mbUpdateRequested = false;
mbAbortRequested = false;
}
void Manager::updateTick() {

View File

@@ -43,13 +43,13 @@ namespace ipl {
mMessageID = msgId;
// Debug related? (seems to be incomplete; unused)
unk_0x0C = arg2;
unk_0x10 = arg3;
mArg2 = arg2;
mArg3 = arg3;
if (arg1) {
strncpy(unk_0x14, arg1, sizeof(unk_0x14));
unk_0x14[sizeof(unk_0x14) - 1] = 0;
strncpy(mArg1, arg1, sizeof(mArg1));
mArg1[sizeof(mArg1) - 1] = 0;
} else {
memset(unk_0x14, 0, sizeof(unk_0x14));
memset(mArg1, 0, sizeof(mArg1));
}
curThread = OSGetCurrentThread();