Compare commits

...

5 Commits

Author SHA1 Message Date
asm2c
0ecc304fe5 match(CDBDatabase): decompile CDBDatabasePrivateCreateRecordAtOnceEx_
Exact match (73/73, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 17:55:58 -05:00
github-actions[bot]
1802d45758 docs: update progress [skip ci] 2026-10-01 22:48:56 +00:00
coah
130cc9e88e match(pf_fat): PFFAT_GetClusterAllocated (#570)
Reorder locals so p_start_cluster lands in r7 and p_vol in r8.

Co-authored-by: matcher <matcher@local>
2026-10-01 17:47:34 -05:00
coah
a801d1c5d6 cleanup(CXStreamingUncompression): rename Huffman init dest param (#568)
Match the Huffman prototype to the .c and the RL/LZ decls (param_2 → data).
2026-10-01 17:47:08 -05:00
coah
8ab07fbb20 Restore SD title button-string ownership (#567) 2026-10-01 17:46:43 -05:00
6 changed files with 46 additions and 93 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.71% | 62.05% | 92.06% |
| 99.37% | 87.72% | 62.05% | 92.06% |
units 918/1027 complete, functions 12214/12563 matched.
units 918/1027 complete, functions 12215/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

@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
.rodata start:0x81610608 end:0x81610918
.data start:0x81654B38 end:0x81654F98
.sdata2 start:0x81694B18 end:0x81694B60
.sdata start:0x81696DD0 end:0x81696E40
.sdata start:0x81696DD0 end:0x81696E30
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
.text start:0x813E4BBC end:0x813E947C
.rodata start:0x81610918 end:0x81610948
.data start:0x81654F98 end:0x81655638
.sdata2 start:0x81694B60 end:0x81694B88
.sdata start:0x81696E40 end:0x81696EF0
.sdata start:0x81696E30 end:0x81696EF0
src/scene/sdButton/iplSDButton.cpp:
.text start:0x813E947C end:0x813EA88C

View File

@@ -64,7 +64,7 @@ typedef struct CXUncompContextHuffman {
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);

View File

@@ -1180,20 +1180,24 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
u32 numClusters, u32* cluster)
{
u32* start;
PF_VOLUME* vol;
PFFAT_HINT* hint;
u32 fatType;
u32 locateStart;
u32 locateEnd;
s32 error;
fatType = file->p_vol->bpb.fat_type;
start = file->p_start_cluster;
vol = file->p_vol;
fatType = vol->bpb.fat_type;
hint = file->p_hint;
if (*file->p_start_cluster == 1) {
if (*start == 1) {
if (fatType <= FAT_16) {
*cluster = -1;
return 0;
}
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
*start = vol->bpb.root_dir_cluster;
}
*cluster = -1;
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);

View File

@@ -94,7 +94,7 @@ extern CDBErr CDBDatabasePrivateCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode);
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseFindByKey();
typedef struct {
@@ -314,86 +314,38 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord*
return result;
}
asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x80(r1)
mflr r0
stw r0, 0x84(r1)
addi r11, r1, 0x80
bl _savegpr_18
lwz r24, 0x9c(r1)
mr r28, r3
lwz r27, 0x88(r1)
mr r29, r4
lwz r26, 0x8c(r1)
mr r30, r5
lwz r22, 0x90(r1)
mr r31, r6
lwz r23, 0x94(r1)
mr r18, r7
lwz r25, 0x98(r1)
mr r19, r8
mr r20, r9
mr r21, r10
mr r3, r24
bl CDBIsGameCodeStr
cmpwi r3, 0x0
bne L_81487844
li r3, 0x4
b L_814878EC
L_81487844:
mr r3, r25
bl CDBIsMakerCodeStr
cmpwi r3, 0x0
bne L_8148785C
li r3, 0x3
b L_814878EC
L_8148785C:
mr r3, r25
addi r4, r1, 0x10
bl CDBConvMCStrToMCValue
mr r3, r24
addi r4, r1, 0x14
bl CDBConvGCStrToGCValue
li r0, 0x0
stw r18, 0x2c(r1)
addi r3, r1, 0x18
stw r19, 0x28(r1)
stw r20, 0x24(r1)
stw r21, 0x20(r1)
stw r27, 0x1c(r1)
stw r26, 0x18(r1)
stw r0, 0x38(r1)
stw r0, 0x3c(r1)
bl OSCalendarTimeToTicks
lhz r26, 0x10(r1)
mr r24, r4
lwz r27, 0x14(r1)
mr r25, r3
bl CDBLock
stw r22, 0x8(r1)
mr r3, r28
mr r4, r29
mr r5, r30
stw r23, 0xc(r1)
mr r6, r31
mr r8, r24
mr r7, r25
mr r9, r27
mr r10, r26
bl CDBDatabaseCreateRecordImAtOnce_
mr r26, r3
bl CDBUnlock
mr r3, r26
L_814878EC:
addi r11, r1, 0x80
bl _restgpr_18
lwz r0, 0x84(r1)
mtlr r0
addi r1, r1, 0x80
blr
#endif
CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode) {
u32 gameCodeVal;
u32 gameValue;
u16 makerCodeVal;
u16 makerValue;
CDBErr result;
OSTime time;
OSCalendarTime cal;
if (!CDBIsGameCodeStr(gameCode)) {
return CDB_ERROR_4;
}
if (!CDBIsMakerCodeStr(makerCode)) {
return CDB_ERROR_3;
}
CDBConvMCStrToMCValue(makerCode, &makerValue);
CDBConvGCStrToGCValue(gameCode, &gameValue);
cal.year = year;
cal.mon = month;
cal.mday = day;
cal.hour = hour;
cal.min = min;
cal.sec = sec;
cal.msec = 0;
cal.usec = 0;
time = OSCalendarTimeToTicks(&cal);
makerCodeVal = makerValue;
gameCodeVal = gameValue;
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCodeVal, makerCodeVal, recordData, recordDataSize);
CDBUnlock();
return result;
}
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {

View File

@@ -86,10 +86,7 @@ static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sd
memory->setTitleLists(sdRange, nandRange);
}
extern "C" char lbl_81696E30[];
extern "C" char lbl_81696E37[];
static const char* sButtonNames[2] = {lbl_81696E30, lbl_81696E37};
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
static const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};