Compare commits

..

1 Commits

Author SHA1 Message Date
linker
192574bcf7 Link tiManager via retail .s
Near-100% C++ still breaks DOL SHA1. Assemble the extracted unit and
mark Matching.

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

Linked code: 62.047% -> 62.327% (918 -> 919 units)
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-01 17:47:25 -05:00
7 changed files with 3229 additions and 19 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",
@@ -920,7 +920,7 @@ config.libs = [
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiManager.cpp", source="keyboard/tiManager.s", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),

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 tiManager.s (near-100% C++ still breaks DOL SHA1).
#define TIMANAGER_IMPLEMENTATION
#include "keyboard/tiPcKeyboard.h"
#include "keyboard/tiCellPhone.h"

3219
src/keyboard/tiManager.s Normal file

File diff suppressed because it is too large Load Diff