Compare commits

..

4 Commits

Author SHA1 Message Date
coah
5db0cd6086 cleanup(CDBDatabase): name error message string labels (#581)
Rename Matching lbl_* CDBReportError messages to scCdbMsg_*.
2026-10-01 18:02:31 -05:00
coah
54b44a3534 Restore keyboard unit filename and getter emission order, then link (#572) 2026-10-01 18:02:26 -05:00
coah
1493baaba0 match(pf_fat12): PFFAT12_WriteFATEntryWithBuf (#573)
Reorder locals and rewrite cross-byte stores as p_buf[offset+1].

Co-authored-by: matcher <matcher@local>
2026-10-01 18:02:05 -05:00
coah
22dd088277 match(SOBasic): SOPoll (#571)
Reorder locals (size, bytes, result, rm) for register allocation.

Co-authored-by: matcher <matcher@local>
2026-10-01 18:00:59 -05:00
9 changed files with 56 additions and 40 deletions

View File

@@ -1054,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
.data start:0x8165F818 end:0x8165F8F0
.sdata2 start:0x81694E10 end:0x81694E28
src/keyboard/tiManager.cpp:
src/keyboard/tiKeyboard.cpp:
.text start:0x81437558 end:0x81439608
.ctors start:0x8160D208 end:0x8160D20C
.data start:0x8165F8F0 end:0x81660378

View File

@@ -18235,13 +18235,13 @@ jumptable_8166B3D0 = .data:0x8166B3D0; // type:object size:0x30 scope:local
@1137 = .data:0x8166B450; // type:object size:0x22 scope:local data:string
jumptable_8166B478 = .data:0x8166B478; // type:object size:0x30 scope:local
lbl_8166B4B8 = .data:0x8166B4B8; // type:object size:0x70
lbl_8166B528 = .data:0x8166B528; // type:object size:0x25 data:string
lbl_8166B550 = .data:0x8166B550; // type:object size:0x29 data:string
lbl_8166B57C = .data:0x8166B57C; // type:object size:0x2B data:string
lbl_8166B5A8 = .data:0x8166B5A8; // type:object size:0xD data:string
lbl_8166B5B8 = .data:0x8166B5B8; // type:object size:0x15 data:string
lbl_8166B5D0 = .data:0x8166B5D0; // type:object size:0x46 data:string
lbl_8166B618 = .data:0x8166B618; // type:object size:0x48 data:string
scCdbMsg_DatabaseClosed = .data:0x8166B528; // type:object size:0x25 data:string
scCdbMsg_CantCreateRecordClosed = .data:0x8166B550; // type:object size:0x29 data:string
scCdbMsg_CantCreateRecordReadonly = .data:0x8166B57C; // type:object size:0x2B data:string
scCdbMsg_InvalidKey = .data:0x8166B5A8; // type:object size:0xD data:string
scCdbMsg_FileNotFound = .data:0x8166B5B8; // type:object size:0x15 data:string
scCdbMsg_CantCleanupDirsClosed = .data:0x8166B5D0; // type:object size:0x46 data:string
scCdbMsg_CantCleanupDirsReadonly = .data:0x8166B618; // type:object size:0x48 data:string
@1360 = .data:0x8166B660; // type:object size:0x12 scope:local data:string
...data.0 = .data:0x8166B660; // type:label scope:local
@1362 = .data:0x8166B674; // type:object size:0x1C scope:local data:string

View File

@@ -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/tiKeyboard.cpp", 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

@@ -135,8 +135,13 @@ namespace textinput {
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
#ifdef TIMANAGER_IMPLEMENTATION
virtual void* getSignKeyboard();
virtual const void* getSignKeyboard() const;
#else
virtual void* getSignKeyboard() { return mpSignWindow; }
virtual const void* getSignKeyboard() const { return mpSignWindow; }
#endif
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
@@ -144,8 +149,13 @@ namespace textinput {
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
#ifdef TIMANAGER_IMPLEMENTATION
virtual void* getPredictLanguageSelectDialog();
virtual const void* getPredictLanguageSelectDialog() const;
#else
virtual void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
#endif
virtual inputform::EditBuffer* createEditBuffer();
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();

View File

@@ -80,11 +80,11 @@ typedef struct {
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 offset,
WADProcessCallback processCallback);
s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
WADProcessCallback processCB);
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADBlocks* blocks, u32* fileListOut);
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADProcessCallback processCallback);
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7);
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB);
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);

View File

@@ -120,13 +120,13 @@ pf_s32 VFiPFFAT12_WriteFATEntry(PF_VOLUME* p_vol, pf_u16 cluster, pf_u16 value)
}
pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 value, PF_CACHE_PAGE* p_page) {
pf_s32 err;
pf_u32 next_sector;
pf_u32 offset_in_sector;
pf_u16 current_fat;
pf_s32 fat_offset;
pf_u32 fat_sector;
pf_s32 result;
pf_u32 next_sector;
pf_s32 err;
fat_offset = (pf_u16)(cluster + (cluster >> 1));
fat_sector = (pf_u16)(p_vol->bpb.active_FAT_sector + (fat_offset >> p_vol->bpb.log2_bytes_per_sector));
offset_in_sector = fat_offset & (p_vol->bpb.bytes_per_sector - 1);
@@ -153,7 +153,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
p_page->sector = next_sector;
p_page->p_buf[0] = value >> 4;
} else {
((pf_u16)offset_in_sector + p_page->p_buf)[1] = value >> 4;
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = value >> 4;
}
} else {
p_page->p_buf[(pf_u16)offset_in_sector] = value;
@@ -165,7 +165,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
p_page->sector = next_sector;
p_page->p_buf[0] = (p_page->p_buf[0] & 0xF0) | ((pf_u8)(value >> 8));
} else {
((pf_u16)offset_in_sector + p_page->p_buf)[1] = (((pf_u16)offset_in_sector + p_page->p_buf)[1] & 0xF0) | ((pf_u8)(value >> 8));
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = (*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) & 0xF0) | ((pf_u8)(value >> 8));
}
}
if (err != 0) { result = err; }

View File

@@ -79,13 +79,13 @@ typedef struct {
} CDBSearchWork;
extern CDBSearchWork* CDBDatabaseWorkBuf;
extern char lbl_8166B528[];
extern char lbl_8166B550[];
extern char lbl_8166B57C[];
extern char lbl_8166B5A8[];
extern char lbl_8166B5B8[];
extern char lbl_8166B5D0[];
extern char lbl_8166B618[];
extern char scCdbMsg_DatabaseClosed[];
extern char scCdbMsg_CantCreateRecordClosed[];
extern char scCdbMsg_CantCreateRecordReadonly[];
extern char scCdbMsg_InvalidKey[];
extern char scCdbMsg_FileNotFound[];
extern char scCdbMsg_CantCleanupDirsClosed[];
extern char scCdbMsg_CantCleanupDirsReadonly[];
extern CDBErr CDBDatabaseInit();
extern CDBErr CDBDatabaseOpen();
@@ -165,7 +165,7 @@ CDBErr CDBDatabaseClose(CDBDatabase* database) {
CDBLock();
instance = database->instance;
if (instance == NULL || instance->flags == 0) {
CDBReportError(lbl_8166B528);
CDBReportError(scCdbMsg_DatabaseClosed);
result = CDB_ERROR_27;
} else {
status = CDBDatabaseFree(database);
@@ -403,17 +403,17 @@ CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record
instance = database->instance;
if (instance == NULL) {
CDBReportError(lbl_8166B550);
CDBReportError(scCdbMsg_CantCreateRecordClosed);
return CDB_ERROR_27;
}
flags = instance->flags;
if ((flags & 2) == 0) {
if (flags == 0) {
CDBReportError(lbl_8166B550);
CDBReportError(scCdbMsg_CantCreateRecordClosed);
return CDB_ERROR_27;
}
CDBReportError(lbl_8166B57C);
CDBReportError(scCdbMsg_CantCreateRecordReadonly);
return CDB_ERROR_26;
}
@@ -427,12 +427,12 @@ CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordK
CDBLock();
if (!CDBRecordKeyIsValid(recordKey)) {
CDBReportError(lbl_8166B5A8);
CDBReportError(scCdbMsg_InvalidKey);
result = CDB_ERROR_5;
} else {
CDBRecordInitDescriptor(record, database, recordKey);
if (!CDBRecordIsExistFile(record)) {
CDBReportError(lbl_8166B5B8, recordKey->keyString);
CDBReportError(scCdbMsg_FileNotFound, recordKey->keyString);
result = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
result = CDB_ERROR_OK;
@@ -2608,11 +2608,11 @@ CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocati
CDBUnlock();
if (flags == 0) {
CDBReportError(lbl_8166B5D0);
CDBReportError(scCdbMsg_CantCleanupDirsClosed);
return CDB_ERROR_27;
}
if (flags == 1) {
CDBReportError(lbl_8166B618);
CDBReportError(scCdbMsg_CantCleanupDirsReadonly);
return CDB_ERROR_26;
}
@@ -2663,16 +2663,16 @@ CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocati
#pragma section data_type ".data"
#pragma align 8
extern char lbl_8166B528[] = "CDBDatabaseClose database is closed\n";
extern char scCdbMsg_DatabaseClosed[] = "CDBDatabaseClose database is closed\n";
#pragma align 8
extern char lbl_8166B550[] = "can't create record; database is closed\n";
extern char scCdbMsg_CantCreateRecordClosed[] = "can't create record; database is closed\n";
#pragma align 8
extern char lbl_8166B57C[] = "can't create record; database is readonly\n";
extern char scCdbMsg_CantCreateRecordReadonly[] = "can't create record; database is readonly\n";
#pragma align 8
extern char lbl_8166B5A8[] = "invalid key\n";
extern char scCdbMsg_InvalidKey[] = "invalid key\n";
#pragma align 8
extern char lbl_8166B5B8[] = "file not found : %s\n";
extern char scCdbMsg_FileNotFound[] = "file not found : %s\n";
#pragma align 8
extern char lbl_8166B5D0[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n";
extern char scCdbMsg_CantCleanupDirsClosed[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n";
#pragma align 8
extern char lbl_8166B618[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n";
extern char scCdbMsg_CantCleanupDirsReadonly[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n";

View File

@@ -198,8 +198,10 @@ int SOShutdown(int socket, int how) {
}
int SOPoll(SOPollFD* fds, unsigned int count, s64 timeout) {
s32 size;
s32 bytes;
s32 result;
s32 rm;
s32 result,bytes,size;
PollRequest* request;
SOPollFD* reply;
if((result=SOiPrepare(NULL,&rm))==0) {

View File

@@ -312,6 +312,10 @@ void Manager::SetFont(nw4r::lyt::FontRefLink* link) {
if (mpInputForm) mpInputForm->nw4r::ut::CharWriter::SetFont(*font);
if (mpCellPhoneKeyboard) static_cast<nw4rmanager::Layout&>(*mpCellPhoneKeyboard).SetFontForce(font);
}
void* Manager::getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
const void* Manager::getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
void* Manager::getSignKeyboard() { return mpSignWindow; }
const void* Manager::getSignKeyboard() const { return mpSignWindow; }
void Manager::setDefaultPredictionJP(int count, const char** predictions) {
static_cast<tistring::WithAtok*>(getInputForm()->getAtokString())->setDefaultPrediction(count, predictions);
}