Compare commits

...

1 Commits

Author SHA1 Message Date
coah
72c7044368 NWC24MBoxCtrl: 23/25 functions (worker cdaba1ae) 2026-09-30 02:00:47 +00:00
3 changed files with 141 additions and 54 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 83.59% | 74.11% | 56.76% | 86.51% |
| 83.59% | 74.20% | 56.76% | 86.51% |
units 748/1027 complete, functions 10795/12563 matched.
units 748/1027 complete, functions 10798/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -243,10 +243,11 @@ BOOL NWC24iIsMsgObjReadable(const MBCEntry* entry) {
NWC24Err NWC24GetMsgIdList(NWC24MBoxType type, u32* ids, u32 maxLength) {
MBCHeader* header;
NWC24File file;
NWC24Err result, err, closeResult;
u32 count, offset;
NWC24Err result;
char* path;
u32* next;
NWC24Err err, closeResult;
u32 offset;
u32 count;
MBCEntry* entry;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
return NWC24_ERR_LIB_NOT_OPENED;
@@ -262,7 +263,6 @@ NWC24Err NWC24GetMsgIdList(NWC24MBoxType type, u32* ids, u32 maxLength) {
if (result != NWC24_OK)
return result;
count = 0;
next = ids;
for (offset = 128; offset < header->fileSize; offset += 128) {
err = NWC24FSeek(&file, offset, NWC24_SEEK_BEG);
if (err != NWC24_OK) {
@@ -275,7 +275,7 @@ NWC24Err NWC24GetMsgIdList(NWC24MBoxType type, u32* ids, u32 maxLength) {
break;
}
if (entry->msgId != 0 && entry->msgId <= 1000000) {
*next++ = entry->msgId;
ids[count] = entry->msgId;
++count;
if (count == header->numMessages) {
result = NWC24_OK;
@@ -560,28 +560,30 @@ static inline void GetOldestMsgId(const MBCHeader* header, u32* id) {
}
NWC24Err NWC24iMBoxCheck(NWC24MBoxType type, u32 size) {
u32 oldestId;
u32 required;
MBCHeader* header;
struct {
u32 oldestId;
MBCHeader* header;
} mailbox;
NWC24Err err;
if (size >= 0x31C00)
return NWC24_ERR_OVERFLOW;
required = size + 0x4000;
err = GetCachedMBCHeader(type, &header);
err = GetCachedMBCHeader(type, &mailbox.header);
if (err != NWC24_OK)
return err;
if (type == NWC24_MBOX_TYPE_SEND) {
if (header->numMessages >= header->capacity)
if (mailbox.header->numMessages >= mailbox.header->capacity)
return NWC24_ERR_FULL;
if (header->freeBytes <= required)
if (mailbox.header->freeBytes <= required)
return NWC24_ERR_FULL;
} else if (type == NWC24_MBOX_TYPE_RECV) {
while (header->numMessages >= header->capacity || header->freeBytes <= required) {
GetOldestMsgId(header, &oldestId);
err = DeleteMsg(type, oldestId, FALSE);
while (mailbox.header->numMessages >= mailbox.header->capacity || mailbox.header->freeBytes <= required) {
GetOldestMsgId(mailbox.header, &mailbox.oldestId);
err = DeleteMsg(type, mailbox.oldestId, FALSE);
if (err != NWC24_OK)
return err;
err = GetCachedMBCHeader(type, &header);
err = GetCachedMBCHeader(type, &mailbox.header);
if (err != NWC24_OK)
return err;
}
@@ -664,13 +666,14 @@ static inline int CompareMsgId(u32 left, u32 right) {
static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
MBCHeader* header;
NWC24File file;
MBCEntry* entry;
char* path;
NWC24Err result;
u32 count = 0;
u32 offset;
u32 foundOffset = 0;
u32 oldest = 0;
u32 offset;
NWC24Err err, result, clearResult, deleteResult, writeResult, closeResult;
MBCEntry* entry;
char* path;
NWC24Err err, deleteResult, closeResult;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
return NWC24_ERR_LIB_NOT_OPENED;
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
@@ -687,11 +690,15 @@ static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
result = NWC24_ERR_NOT_FOUND;
for (offset = 128; offset < header->fileSize; offset += 128) {
err = NWC24FSeek(&file, offset, NWC24_SEEK_BEG);
if (err != NWC24_OK)
if (err != NWC24_OK) {
result = err;
break;
}
err = NWC24FRead(entry, 128, &file);
if (err != NWC24_OK)
if (err != NWC24_OK) {
result = err;
break;
}
if (entry->msgId == 0)
continue;
++count;
@@ -699,12 +706,12 @@ static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
if (protect) {
if ((entry->type & 2) && entry->appId == 0) {
if (NWC24GetAppId() != 0x48414541) {
err = NWC24_ERR_PROTECTED;
result = NWC24_ERR_PROTECTED;
break;
}
} else if ((entry->appId & 0xFFFFFF00) != (NWC24GetAppId() & 0xFFFFFF00)) {
if (!(entry->type & 8) || NWC24GetAppId() != 0x48414541) {
err = NWC24_ERR_PROTECTED;
result = NWC24_ERR_PROTECTED;
break;
}
}
@@ -714,41 +721,43 @@ static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
} else if (oldest == 0 || CompareMsgId(oldest, entry->msgId) > 0)
oldest = entry->msgId;
}
if (offset >= header->fileSize)
err = result;
err = result;
if (err == NWC24_ERR_NOT_FOUND && header->numMessages != count) {
header->numMessages = count;
if (NWC24FSeek(&file, 0, NWC24_SEEK_BEG) == NWC24_OK)
NWC24FWrite(header, 128, &file);
WriteMBCHeader(header, &file);
}
if (err != NWC24_OK) {
NWC24FClose(&file);
return id == 0 ? NWC24_ERR_INVALID_VALUE : err;
}
header->oldestId = oldest;
clearResult = ClearMBCEntry(header, &file, foundOffset);
protect = ClearMBCEntry(header, &file, foundOffset);
deleteResult = DeleteMsgFile(type, id);
if (clearResult != NWC24_OK)
deleteResult = clearResult;
writeResult = NWC24FSeek(&file, 0, NWC24_SEEK_BEG);
if (writeResult == NWC24_OK)
writeResult = NWC24FWrite(header, 128, &file);
if (protect != NWC24_OK)
deleteResult = protect;
type = WriteMBCHeader(header, &file);
if (deleteResult != NWC24_OK)
writeResult = deleteResult;
type = deleteResult;
closeResult = NWC24FClose(&file);
return writeResult != NWC24_OK ? writeResult : closeResult;
return type != NWC24_OK ? type : closeResult;
}
static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* msg, NWC24File* file, NWC24MBoxType type) {
MBCEntry* entry;
u32 count = 0, oldest = 0, duplicateId = 0, duplicateOffset = 0;
NWC24Err err = NWC24_OK;
u32 offset;
u32 count = 0;
u32 duplicateId = 0;
u32 duplicateOffset = 0;
u32 oldest = 0;
MBCEntry* entry;
BOOL candidate;
NWC24Err err = NWC24_OK, clearResult, deleteResult;
NWC24Err clearResult, deleteResult;
if (type == NWC24_MBOX_TYPE_SEND)
return NWC24_OK;
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
for (offset = 128; offset < header->fileSize && count < header->numMessages; offset += 128) {
for (offset = 128; offset < header->fileSize; offset += 128) {
if (count >= header->numMessages)
break;
err = NWC24FSeek(file, offset, NWC24_SEEK_BEG);
if (err != NWC24_OK)
break;
@@ -758,31 +767,40 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
if (entry->msgId == 0)
continue;
++count;
candidate = entry->msgId != msg->msgId;
candidate = TRUE;
if (entry->msgId == msg->msgId)
candidate = FALSE;
if (entry->type & msg->type & 1) {
if (entry->appId != msg->appId)
candidate = FALSE;
if (entry->fromId != msg->fromId)
candidate = FALSE;
}
if (candidate && (((msg->tag & 0xFFFF) && (entry->tag & 0xFFFF) == (msg->tag & 0xFFFF)) ||
(msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
entry->flags == msg->unk_0x10 && entry->date == msg->unk_0x28))) {
duplicateOffset = offset;
duplicateId = entry->msgId;
} else {
if (oldest == 0 || CompareMsgId(oldest, entry->msgId) > 0)
oldest = entry->msgId;
if (candidate) {
if ((msg->tag & 0xFFFF) && (entry->tag & 0xFFFF) == (msg->tag & 0xFFFF)) {
duplicateId = entry->msgId;
duplicateOffset = offset;
continue;
}
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->unk_0x28) {
duplicateId = entry->msgId;
duplicateOffset = offset;
continue;
}
}
if (oldest == 0 || CompareMsgId(oldest, entry->msgId) > 0)
oldest = entry->msgId;
}
if (err != NWC24_OK)
return err;
header->oldestId = oldest;
if (duplicateId == 0)
return err;
clearResult = ClearMBCEntry(header, file, duplicateOffset);
deleteResult = DeleteMsgFile(type, duplicateId);
return clearResult != NWC24_OK ? clearResult : deleteResult;
if (duplicateId != 0) {
clearResult = ClearMBCEntry(header, file, duplicateOffset);
deleteResult = DeleteMsgFile(type, duplicateId);
return clearResult != NWC24_OK ? clearResult : deleteResult;
}
return err;
}
static NWC24Err GetCachedMBCHeader(NWC24MBoxType type, MBCHeader** header) {

View File

@@ -18,3 +18,72 @@ Scalar assignments with explicit packed-field temporaries match both conversion
Cached-header lifetimes, file declaration order, explicit close-error returns, and separate send-file status resolve the control/header/open/close functions. Inline header-write and forced-unmount helpers reproduce the target lifetimes without assembly or uninitialized values.
The eight strings are identical in pool order. .data and .sdata are 100%; .sbss scores 50%. MountInfo is an eight-byte count/type structure, while the extracted target labels its first four bytes and leaves the second word unnamed. No symbol-size or placement edits were made.
## Continuation after the first merge
Starting point: 20/25 instruction-exact functions, 7420/10604 matched code bytes,
184/192 matched data bytes. All five previously open functions received at least
three distinct source-level attempts in this continuation.
### Newly exact functions
- NWC24GetMsgIdList: indexing the output by count replaces the explicit cursor
and reduces register differences from 21 to 19. Separating offset/count
declarations gives eight differences. Declaring the path before the errors
gives four differences; putting it between the persistent result and the
transient errors gives zero differences, 153/153 instructions, 100%.
An inline open helper was also tried; it left five differences, including
an error-branch destination, and was discarded.
- DeleteMsg: keeping seek/read/protection failures in the persistent scan result
corrects the scan's exit paths. Using the existing inline header writer for
both recovery and final flush gives 296/296 instructions. Result/counter/entry
declaration order then reduces 41 register differences to 25, 16, and 12.
Reusing the consumed protection/type arguments for completion status and
ordering the scan declarations gives zero differences, 100%. Named completion
helpers were tried as alternatives: a header-value helper gives 78 differences,
a header-reference helper gives eight, and a clear/delete helper gives ten.
Separate named completion errors give nine differences. None was retained.
- DuplicationCheck: explicit candidate initialization gives 94.27928%; separate
tag/content duplicate branches give 91.927925%; putting the message-count
limit inside the scan gives 93.07658%. Combining those changes gives
98.62613%, 223/222 instructions. A positive final duplicate branch removes
the extra instruction, giving 99.12162%, 222/222. Moving the error before
counters and ordering offset/count/duplicate-ID/duplicate-offset/oldest/entry
declarations then gives zero differences, 100%. Date comparisons use the
signed comparison shown in the target.
### Functions still open
- NWC24iIsMsgObjReadable: an immutable message-pointer local, a separate
private-message pointer view, and a copied entry parameter retain five
prologue scheduling differences, 57/57 instructions, 92.98245%. A cached type
scalar gives 58/57 instructions and 90.61404%. Combining type validity checks
gives 55/57 and 89.29825%. A nested LED-validity body gives 57/57 but 41
differences, 85.789474%. An inline readability helper retains the five
differences. The target stores LR/r31 and copies the argument before loading
type; MWCC schedules the load and mask among those prologue instructions.
- NWC24iMBoxCheck: an oldest-ID wrapper, a one-element output array, and a
returned output pointer retain 66/68 instructions and 96.92647%. Grouping
the cached header and oldest ID in a mailbox local gives 67/68 instructions,
98.382355%; reversing the fields gives 98.30882%. A direct oldest-ID
assignment gives 96.92647%. Copying the ID through memcpy or Mail_memcpy
gives 70/68 instructions and 90.867645%. The retained mailbox local restores
the target's oldest-ID store and header stack offset, but MWCC forwards the
stored value into r4 rather than emitting the target's subsequent load.
### Data verification
The eight strings remain identical in pool order. .data and .sdata each score
100%. The compiler emits 166/12 bytes versus extracted 168/16 bytes respectively;
the target's additional trailing bytes are alignment zeros. The eight .sbss
bytes are byte-identical zeros. The sole MountInfo symbol has size eight in the
compiled object, whereas the extraction labels only the first four bytes.
Target instructions access the type using MountInfo plus its four-byte field
position. Its real count/type structure therefore remains eight bytes; the
extracted symbol boundary accounts for the 50% .sbss score. No symbol metadata,
placement directive, extra object, or other unit was changed.
Current result: 23/25 instruction-exact functions, 10104/10604 matched code
bytes, 184/192 matched data bytes. All 23 exact functions have zero ctxdiff
differences. The two open functions and extracted MountInfo extent remain
unresolved.