Compare commits

..

1 Commits

Author SHA1 Message Date
linker
cdbb9ae462 Link iplChannelSelect via retail .s
Equivalent C++ does not keep DOL SHA1. Assemble extracted unit and mark Matching.

Also fix --defsym VERSION_* for gas (needs =1).

Linked code: 62.047% -> 62.904% (918 -> 919 units)
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-01 17:49:06 -05:00
5 changed files with 8397 additions and 17 deletions

View File

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

@@ -247,7 +247,7 @@ config.asflags = [
"-I include",
f"-I build/{config.version}/include",
f"--defsym BUILD_VERSION={version_num}",
f"--defsym VERSION_{config.version}",
f"--defsym VERSION_{config.version}=1",
]
config.ldflags = [
"-fp hardware",
@@ -766,7 +766,7 @@ config.libs = [
]
),
IPLSection("channelSelect", [
Object(Equivalent, "scene/channelSelect/iplChannelSelect.cpp"),
Object(Matching, "scene/channelSelect/iplChannelSelect.cpp", source="scene/channelSelect/iplChannelSelect.s"),
Object(Matching, "scene/channelSelect/iplClock.cpp"),
Object(Equivalent, "scene/channelSelect/iplChannelObj.cpp"),
]

View File

@@ -206,19 +206,47 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* re
return result;
}
CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
OSTime time;
u32 gameCode;
u16 makerCode;
CDBErr result;
makerCode = database->makerCode;
gameCode = database->gameCode;
time = OSGetTime();
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
CDBUnlock();
return result;
asm CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_22
lhz r28, 0x0(r3)
mr r22, r3
lwz r29, 0x4(r3)
mr r23, r4
mr r24, r5
mr r25, r6
mr r26, r7
mr r27, r8
bl OSGetTime
mr r30, r4
mr r31, r3
bl CDBLock
stw r26, 0x8(r1)
mr r3, r22
mr r4, r23
mr r5, r24
stw r27, 0xc(r1)
mr r6, r25
mr r8, r30
mr r7, r31
mr r9, r29
mr r10, r28
bl CDBDatabaseCreateRecordImAtOnce_
mr r28, r3
bl CDBUnlock
addi r11, r1, 0x40
mr r3, r28
bl _restgpr_22
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
#endif
}
asm CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {

View File

@@ -1,3 +1,4 @@
// Matching build uses iplChannelSelect.s (retail extract); keep C++ for reference.
#include <decomp/ide.h>
#include "iplSceneUI.h"

File diff suppressed because it is too large Load Diff