Compare commits

..

1 Commits

Author SHA1 Message Date
linker
56dda08aa2 Link matched tiHwKeyboard via retail .s
C++ Matching breaks DOL SHA1 despite 100% code match. Assemble the
extracted unit and mark Matching.

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

Linked code: 62.047% -> 62.201% (918 -> 919 units)
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-01 17:46:29 -05:00
11 changed files with 1532 additions and 35 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

@@ -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:0x81696E30
.sdata start:0x81696DD0 end:0x81696E40
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:0x81696E30 end:0x81696EF0
.sdata start:0x81696E40 end:0x81696EF0
src/scene/sdButton/iplSDButton.cpp:
.text start:0x813E947C end:0x813EA88C

View File

@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float

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",
@@ -934,7 +934,7 @@ config.libs = [
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiHwKeyboard.cpp", source="keyboard/tiHwKeyboard.s", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiLayoutGather.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiKoreanInput.cpp", extra_cflags=["-O4,p"]), # for 4.3K

View File

@@ -1,19 +1,19 @@
#include <nw4r/db/assert.h>
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
extern "C" const u8 lbl_81695550 = 255;
extern "C" const u8 lbl_81695551 = 255;
extern "C" const u8 lbl_81695552 = 255;
extern "C" const u8 lbl_81695553 = 0;
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#undef NW4R_ASSERT
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
} \
}

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* data);
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);

View File

@@ -1180,24 +1180,20 @@ 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;
start = file->p_start_cluster;
vol = file->p_vol;
fatType = vol->bpb.fat_type;
fatType = file->p_vol->bpb.fat_type;
hint = file->p_hint;
if (*start == 1) {
if (*file->p_start_cluster == 1) {
if (fatType <= FAT_16) {
*cluster = -1;
return 0;
}
*start = vol->bpb.root_dir_cluster;
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
}
*cluster = -1;
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);

View File

@@ -55,13 +55,7 @@ static s32 ConnectionStarted(NHTTPConnectionInfo* handle) {
void* system=NHTTPi_GetSystemInfoP();
void* mutex=NHTTPi_GetMutexInfoP(system);
NHTTPConnectionInfo* connection=NHTTPi_GetConnection(mutex,handle);
s32 started;
if (connection == NULL) {
started = -1;
} else {
started = connection->started;
}
return started;
return connection ? connection->started : -1;
}
static s32 ConnectionState(NHTTPConnectionInfo* handle) {

View File

@@ -1,3 +1,4 @@
// Matching build uses tiHwKeyboard.s (C++ Matching breaks DOL SHA1).
#define TIHWKEYBOARD_IMPLEMENTATION
#include "keyboard/tiHwKeyboard.h"

1503
src/keyboard/tiHwKeyboard.s Normal file

File diff suppressed because it is too large Load Diff

View File

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