Compare commits

...

1 Commits

Author SHA1 Message Date
coah
bc3069dfbc tiCellPhone 83/86 (data 100%), NWC24Download 17/30 (worker b5116e0e) 2026-09-30 14:03:35 +00:00
9 changed files with 1107 additions and 438 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 97.59% | 83.64% | 58.20% | 89.94% |
| 97.61% | 83.72% | 58.20% | 90.15% |
units 778/1027 complete, functions 12026/12563 matched.
units 778/1027 complete, functions 12031/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

@@ -183,125 +183,10 @@ namespace textinput {
#endif
};
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
public:
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
#ifdef TIMANAGER_IMPLEMENTATION
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpEventHandler(NULL) {}
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator* allocator);
virtual void init();
virtual void setCommandReceiver(CommandReceiver* receiver);
virtual void updateFromReceiver(u32 command, void* data);
virtual void onKey(u32 event, void* data);
virtual void setLanguage(Language language);
virtual void update();
virtual void onActive();
virtual void calc();
virtual void draw();
virtual void changeInputMode(InputMode mode);
virtual void setInputMode(InputMode mode);
virtual void setUpperCaseJP(bool upper);
virtual void setLangKeyActive(bool active);
virtual void goSignInputMode();
virtual void changePredictLanguage();
virtual void setAbcMode(bool abc);
virtual void doNumericMode(bool);
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R* dialog);
virtual void setSignWindow(signwindow::LayoutByNW4R* window);
#ifndef TI_CELLPHONE_MATCH_LAYOUT
#include "tiCellPhoneLayout.h"
#else
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_SAMPLE_CLASS)
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_cellPhone_a.brlyt", observer), mpSignWindow(NULL) {}
#endif
virtual void doNumericMode(bool);
#ifdef TI_CELLPHONE_IMPLEMENTATION
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R*);
virtual void setSignWindow(signwindow::LayoutByNW4R*);
#else
virtual void setPredictLanguageDialog(void*);
virtual void setSignWindow(void*);
#endif
#endif
virtual void doNumericWithDotMode(bool);
virtual void setLineFeedButton(bool);
virtual void setPredictLanguageButton(bool);
virtual void setSignWindowButton(bool);
#endif
virtual bool onClose();
void onPressedShift(bool shift);
void onReleasedShift();
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
bool hasLineFeedButton() const { return mbLineFeedButton; }
private:
bool mbLineFeedButton;
#ifdef TIMANAGER_IMPLEMENTATION
GXTexObj mSpaceTexture;
GXTexObj mSpaceTextureCN;
GXTexObj mSpaceTextureKR;
nw4rmanager::TiEventHandler* mpEventHandler;
predictlang::LayoutByNW4R* mpPredictDialog;
signwindow::LayoutByNW4R* mpSignWindow;
#endif
public:
#endif
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
virtual bool updateInput(input::HKBManager& hkbManager) override;
#endif
#ifdef TI_CELLPHONE_IMPLEMENTATION
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator* allocator) override;
virtual void init() override;
virtual void draw() override;
virtual void calc() override;
virtual void update() override;
virtual void onKey(u32 key, void* data) override;
virtual void onActive() override;
virtual void updateFromReceiver(u32 command, void* data) override;
virtual void changeInputMode(InputMode mode) override;
virtual void changePredictLanguage() override;
virtual void setAbcMode(bool enabled) override;
virtual void goSignInputMode() override;
virtual void setInputMode(InputMode mode) override;
virtual void setLanguage(Language language) override;
virtual void setCommandReceiver(CommandReceiver* receiver) override;
virtual CellPhoneAnmPane* getAnmPane(InputMode mode);
virtual void throwReleaseForAll();
virtual void changeAnimationAllToNormal();
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
virtual void changeKeyTop(const PaneNameToCharCode* keys);
virtual void changeSpaceKeyTop(const PaneNameToCharCode* keys);
void setUpperCaseJP(bool enabled);
void setLangKeyActive(bool enabled);
void resetHoldingButton();
private:
bool mbLineFeedButton;
GXTexObj mTextures[3];
EventHandler* mpEventHandler;
predictlang::LayoutByNW4R* mpPredictLanguageDialog;
signwindow::LayoutByNW4R* mpSignWindow;
#elif defined(TIMANAGER_IMPLEMENTATION)
virtual nw4rmanager::AnmPane* getAnmPane(InputMode mode);
virtual void throwReleaseForAll();
virtual void changeAnimationAllToNormal();
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
virtual void changeKeyTop(const struct PaneNameToCharCode* table);
virtual void changeSpaceKeyTop(const struct PaneNameToCharCode* table);
#endif
};
#ifdef TI_CELLPHONE_SAMPLE_CLASS
class Sample : public LayoutByNW4R {
public:
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
: LayoutByNW4R(manager, resAccessor, observer) {}
virtual ~Sample() {}
};
class LayoutByNW4R;
#endif
#ifdef TI_CELLPHONE_IMPLEMENTATION
@@ -322,6 +207,18 @@ namespace textinput {
KT_ControlButton,
};
#ifdef TI_CELLPHONE_MATCH_LAYOUT
class EventHandler : public nw4rmanager::TiEventHandler {
public:
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
virtual ~EventHandler();
virtual void onTiEvent(gui::PaneComponent* pane, u32 event, Input* input) override;
private:
LayoutByNW4R* mpLayoutByNW4R;
};
#endif
class CellPhoneAnmPane : public nw4rmanager::AnmPane {
public:
CellPhoneAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
@@ -355,6 +252,7 @@ namespace textinput {
virtual ~CellPhoneControlAnmPane();
};
#ifndef TI_CELLPHONE_MATCH_LAYOUT
class EventHandler : public nw4rmanager::TiEventHandler {
public:
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
@@ -364,7 +262,12 @@ namespace textinput {
private:
LayoutByNW4R* mpLayoutByNW4R;
};
#endif
#endif
#ifdef TI_CELLPHONE_MATCH_LAYOUT
#include "tiCellPhoneLayout.h"
#endif
} // namespace cellphonetype

View File

@@ -0,0 +1,126 @@
#ifndef TEXTINPUT_CELL_PHONE_LAYOUT_H
#define TEXTINPUT_CELL_PHONE_LAYOUT_H
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
public:
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
#ifdef TIMANAGER_IMPLEMENTATION
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpEventHandler(NULL) {}
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator* allocator);
virtual void init();
virtual void setCommandReceiver(CommandReceiver* receiver);
virtual void updateFromReceiver(u32 command, void* data);
virtual void onKey(u32 event, void* data);
virtual void setLanguage(Language language);
virtual void update();
virtual void onActive();
virtual void calc();
virtual void draw();
virtual void changeInputMode(InputMode mode);
virtual void setInputMode(InputMode mode);
virtual void setUpperCaseJP(bool upper);
virtual void setLangKeyActive(bool active);
virtual void goSignInputMode();
virtual void changePredictLanguage();
virtual void setAbcMode(bool abc);
virtual void doNumericMode(bool);
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R* dialog);
virtual void setSignWindow(signwindow::LayoutByNW4R* window);
#else
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_SAMPLE_CLASS)
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_cellPhone_a.brlyt", observer), mpSignWindow(NULL) {}
#endif
virtual void doNumericMode(bool);
#ifdef TI_CELLPHONE_IMPLEMENTATION
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R*);
virtual void setSignWindow(signwindow::LayoutByNW4R*);
#else
virtual void setPredictLanguageDialog(void*);
virtual void setSignWindow(void*);
#endif
#endif
virtual void doNumericWithDotMode(bool);
virtual void setLineFeedButton(bool);
virtual void setPredictLanguageButton(bool);
virtual void setSignWindowButton(bool);
#endif
virtual bool onClose();
void onPressedShift(bool shift);
void onReleasedShift();
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
bool hasLineFeedButton() const { return mbLineFeedButton; }
private:
bool mbLineFeedButton;
#ifdef TIMANAGER_IMPLEMENTATION
GXTexObj mSpaceTexture;
GXTexObj mSpaceTextureCN;
GXTexObj mSpaceTextureKR;
nw4rmanager::TiEventHandler* mpEventHandler;
predictlang::LayoutByNW4R* mpPredictDialog;
signwindow::LayoutByNW4R* mpSignWindow;
#endif
public:
#endif
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
virtual bool updateInput(input::HKBManager& hkbManager) override;
#endif
#ifdef TI_CELLPHONE_IMPLEMENTATION
virtual ~LayoutByNW4R();
virtual void create(MEMAllocator* allocator) override;
virtual void init() override;
virtual void draw() override;
virtual void calc() override;
virtual void update() override;
virtual void onKey(u32 key, void* data) override;
virtual void onActive() override;
virtual void updateFromReceiver(u32 command, void* data) override;
virtual void changeInputMode(InputMode mode) override;
virtual void changePredictLanguage() override;
virtual void setAbcMode(bool enabled) override;
virtual void goSignInputMode() override;
virtual void setInputMode(InputMode mode) override;
virtual void setLanguage(Language language) override;
virtual void setCommandReceiver(CommandReceiver* receiver) override;
virtual CellPhoneAnmPane* getAnmPane(InputMode mode);
virtual void throwReleaseForAll();
virtual void changeAnimationAllToNormal();
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
virtual void changeKeyTop(const PaneNameToCharCode* keys);
virtual void changeSpaceKeyTop(const PaneNameToCharCode* keys);
void setUpperCaseJP(bool enabled);
void setLangKeyActive(bool enabled);
void resetHoldingButton();
private:
bool mbLineFeedButton;
GXTexObj mTextures[3];
EventHandler* mpEventHandler;
predictlang::LayoutByNW4R* mpPredictLanguageDialog;
signwindow::LayoutByNW4R* mpSignWindow;
#elif defined(TIMANAGER_IMPLEMENTATION)
virtual nw4rmanager::AnmPane* getAnmPane(InputMode mode);
virtual void throwReleaseForAll();
virtual void changeAnimationAllToNormal();
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode);
virtual void changeKeyTop(const struct PaneNameToCharCode* table);
virtual void changeSpaceKeyTop(const struct PaneNameToCharCode* table);
#endif
};
#ifdef TI_CELLPHONE_SAMPLE_CLASS
class Sample : public LayoutByNW4R {
public:
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
: LayoutByNW4R(manager, resAccessor, observer) {}
virtual ~Sample() {}
};
#endif
#endif

View File

@@ -15,9 +15,12 @@ namespace textinput {
#if !(defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) && !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
virtual void create(MEMAllocator* alloc) override;
virtual void init() override;
#ifndef TI_CELLPHONE_MATCH_LAYOUT
virtual void setCommandReceiver(CommandReceiver* receiver) override;
virtual void sendCommand(u32 command, void*) override;
#endif
#endif
#if !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
virtual void updateFromReceiver(u32, void*) override;
#endif

View File

@@ -480,17 +480,19 @@ pf_s32 PFDIR_p_mkdir(PF_VOLUME* volume, PF_STR* path, pf_u32 option, PF_DTA* dat
PFDIR_FAT_HINT hint;
pf_u32 previous_chain[2];
pf_u32 found;
pf_u32 position;
pf_u32 page_size;
PF_CACHE_PAGE* page;
pf_u8 lfn_count = 0;
pf_u32 sector = 0;
pf_u32 written;
PF_CACHE_PAGE* page;
pf_u32 page_size;
pf_u32 position;
pf_u32 entry_sector;
pf_u16 filename_length;
pf_u16 original_offset;
pf_u8 lfn_count = 0;
pf_u8 checksum;
pf_u32 cluster;
pf_u32 index;
pf_u32 lfn_index;
pf_u32* next_sector;
pf_s32 error;
@@ -553,7 +555,7 @@ pf_s32 PFDIR_p_mkdir(PF_VOLUME* volume, PF_STR* path, pf_u32 option, PF_DTA* dat
entry.modify_date = entry.create_date;
original_offset = entry.entry_offset;
if (entry.long_name[0] != 0 && (entry.small_letter_flag & 0x18) == 0) {
lfn_count = filename_length / 13 + (filename_length % 13 != 0);
lfn_count = (pf_u32)filename_length / 13 + ((pf_u32)filename_length % 13 != 0);
error = PFENT_allocateEntryPos(&entry, lfn_count + 1, &ffd, previous_chain, &filename, &position);
if (error != 0) { return error; }
if ((pf_vol_set.setting & 2) == 2) { PFPATH_AdjustExtShortName(entry.short_name, position); }
@@ -602,22 +604,22 @@ pf_s32 PFDIR_p_mkdir(PF_VOLUME* volume, PF_STR* path, pf_u32 option, PF_DTA* dat
PFCACHE_FreeDataPage(volume, page);
if (error != 0) { return error; }
entry.num_entry_LFNs = lfn_count;
sector = entry.entry_sector;
entry_sector = entry.entry_sector;
checksum = PFENT_CalcCheckSum(&entry);
if ((parent_entry.small_letter_flag & 0x18) == 0) {
next_sector = previous_chain;
for (index = lfn_count; index >= 1; index--) {
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, &entry, index, checksum, index == lfn_count);
error = PFSEC_WriteData(volume, entry_buffer, sector, entry.entry_offset, 32, &written, 0);
for (lfn_index = lfn_count; lfn_index >= 1; lfn_index--) {
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, &entry, lfn_index, checksum, lfn_index == lfn_count);
error = PFSEC_WriteData(volume, entry_buffer, entry_sector, entry.entry_offset, 32, &written, 0);
if (error != 0) { return error; }
if (written != 32) { return 0x11; }
entry.entry_offset += 32;
if (entry.entry_offset >= volume->bpb.bytes_per_sector) {
entry.entry_offset = 0;
sector = *next_sector++;
entry_sector = *next_sector++;
}
}
entry.entry_sector = sector;
entry.entry_sector = entry_sector;
}
entry.start_cluster = cluster;
error = PFENT_updateEntry(&entry, 0);
@@ -657,7 +659,7 @@ pf_s32 PFDIR_p_chdir(PF_VOLUME* p_vol, PFDIR_STR* p_path_str) {
PF_DIR_ENT entry_dir;
if (((PFSTR_StrNCmp(p_path_str, (pf_s8*)"\\", 1U, 0, 1U) == 0) || (PFSTR_StrNCmp(p_path_str, (pf_s8*)"/", 1U, 0, 1U) == 0)) &&
(PFSTR_StrNCmp(p_path_str, (pf_s8*)"\0", 1U, 1, 1U) == 0)) {
(PFSTR_StrNCmp(p_path_str, (pf_s8*)"", 1U, 1, 1U) == 0)) {
err = PFENT_GetRootDir(p_vol, &entry_dir);
if (err != 0) {
return err;
@@ -897,10 +899,11 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
if (error != 0) { return error; }
error = PFENT_ITER_FindEntry(&source_iter, &source_entry, &source_name, 0x7F, 0, &found);
if (error != 0) { return error; }
if (found == 0 || (source_entry.attr & 8) != 0) { return 3; }
if (found == 0) { return 3; }
if ((source_entry.attr & 8) != 0) { return 3; }
if ((source_entry.attr & 1) != 0) { return 0x18; }
if (PFSTR_StrNCmp((PFDIR_STR*)new_path, (const pf_s8*)":", 1, 1, 1) == 0 &&
PFPATH_GetVolumeFromPath(new_path) != volume) { return 0x1F; }
volume != PFPATH_GetVolumeFromPath(new_path)) { return 0x1F; }
error = PFPATH_SplitPath((PFDIR_STR*)new_path, &directory, &destination_name);
if (error != 0) { return error; }
if (PFSTR_GetCodeMode(&destination_name) == 2) {
@@ -960,8 +963,8 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
destination_entry.num_entry_LFNs = 0;
PFENT_getcurrentDateTimeForEnt(&destination_entry.access_date, &time);
error = PFENT_updateEntry(&destination_entry, 1);
if (error != 0) { return error; }
return allocation_error;
if (error == 0) { return allocation_error; }
return error;
}
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
saved_initial_char = source_entry.long_name[0];
@@ -1004,7 +1007,7 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
if (allocation_error != 0) {
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
source_entry.long_name[0] = saved_initial_char;
source_entry.entry_offset -= source_entry.num_entry_LFNs * 32;
source_entry.entry_offset -= (pf_u16)(source_entry.num_entry_LFNs * 32);
}
update_entry = &source_entry;
} else {

View File

@@ -298,7 +298,8 @@ NWC24Err NWC24InitDlTask(NWC24DlTask* dlTask, NWC24DLType dlType) {
task->interval = 0x0b40;
task->intervalWait = 0x05a0;
useContentFile = dlType == NWC24_DLTYPE_OCTETSTREAM_V1 || dlType == NWC24_DLTYPE_OCTETSTREAM_V2;
if (dlType == NWC24_DLTYPE_OCTETSTREAM_V1 || dlType == NWC24_DLTYPE_OCTETSTREAM_V2) { useContentFile = TRUE; }
else { useContentFile = FALSE; }
if (useContentFile) {
strcpy(task->fileName, "content.bin");
}
@@ -547,6 +548,7 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
u16 taskId;
u16 maxTaskCount;
DlTaskListHeader* header;
DlTaskListHeader* entriesHeader;
if (NWC24WorkP != NULL) {
header = (DlTaskListHeader*)NWC24WorkP->dlHead;
@@ -577,32 +579,22 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
return NWC24_ERR_DONE;
}
for (; taskId < maxTaskCount; taskId++) {
if (work != NULL) {
header = (DlTaskListHeader*)work->dlHead;
entriesHeader = (DlTaskListHeader*)work->dlHead;
do {
header = work != NULL ? entriesHeader : NULL;
if (taskId >= header->maxTaskCount || taskId == 0xffff) {
result = NWC24_ERR_INVALID_VALUE;
} else {
header = NULL;
}
if (taskId >= header->maxTaskCount) {
return NWC24_ERR_INVALID_VALUE;
}
if (taskId == 0xffff) {
return NWC24_ERR_INVALID_VALUE;
}
if (work != NULL) {
header = (DlTaskListHeader*)work->dlHead;
} else {
header = NULL;
}
result = NWC24_ERR_NOT_FOUND;
if (header->entries[taskId].appId != 0) {
header = work != NULL ? entriesHeader : NULL;
result = NWC24_OK;
if (header->entries[taskId].appId == 0) { result = NWC24_ERR_NOT_FOUND; }
}
if (result >= NWC24_OK) {
*dlIterateId = taskId;
return result;
return NWC24_OK;
}
}
taskId++;
} while (taskId < (work != NULL ? entriesHeader : (DlTaskListHeader*)NULL)->maxTaskCount);
return NWC24_ERR_DONE;
}
@@ -653,20 +645,24 @@ NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIt
state->initialized = 0;
}
state->comparisonValue = (state->sortMode & 0x80000000) ? 0x80000001 : 0x7fffffff;
if (!(state->sortMode & 0x80000000)) { state->comparisonValue = 0x7fffffff; }
else { state->comparisonValue = (s32)0x80000001; }
result = NWC24IterateDlTask(&taskId, TRUE);
while (result >= NWC24_OK) {
value = getValue(taskId);
{
s32 selectedValue = state->selectedValue;
if (descending) {
passesSelected = value < state->selectedValue;
passesSelected = value < selectedValue;
} else {
passesSelected = value > state->selectedValue;
passesSelected = value > selectedValue;
}
if (passesSelected) {
s32 comparisonValue = state->comparisonValue;
if (descending) {
bestCandidate = value > state->comparisonValue;
bestCandidate = value > comparisonValue;
} else {
bestCandidate = value < state->comparisonValue;
bestCandidate = value < comparisonValue;
}
if (bestCandidate) {
*dlIterateId = taskId;
@@ -675,6 +671,7 @@ NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIt
found = TRUE;
}
}
}
result = NWC24IterateDlTask(&taskId, FALSE);
}
@@ -740,9 +737,7 @@ NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
task->unknown_0x1a = 0;
}
if (task->retryEnabled == 1) {
for (;;) {
result = CheckDlTaskRetry(dlTask, task->retryCount);
if (result != NWC24_ERR_DISABLED) { break; }
while ((result = CheckDlTaskRetry(dlTask, task->retryCount)) == NWC24_ERR_DISABLED) {
task->retryCount = (task->retryCount + 1) & 0x1f;
}
if (result < NWC24_OK) { return result; }
@@ -751,9 +746,10 @@ NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
}
NWC24Err NWC24DeleteDlTask(NWC24DlTask* dlTask) {
NWC24Err result;
if (NWC24GetAppId() != 0x48414541) { result = ValidateDlTask(dlTask, TRUE); }
else { result = NWC24_OK; }
if (result != NWC24_OK) { return result; }
if (NWC24GetAppId() != 0x48414541) {
result = ValidateDlTask(dlTask, TRUE);
if (result != NWC24_OK) { return result; }
}
return RemoveDlTask(dlTask);
}
@@ -883,14 +879,12 @@ NWC24Err NWC24PurgeOldestDlTask() {
state.initialized = 1;
state.valid = 1;
result = NWC24_OK;
do {
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
if (result != NWC24_OK) {
break;
}
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
while (result == NWC24_OK) {
header = GetCachedDlHeader();
} while (taskId < header->taskCount);
if (taskId >= header->taskCount) { break; }
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
}
if (result == NWC24_ERR_DONE) {
return NWC24_ERR_FAILED;
@@ -907,16 +901,18 @@ NWC24Err NWC24PurgeOldestDlTask() {
}
NWC24Err NWC24ManageDlTaskListForMenu() {
NWC24DlTask task;
NWC24DlTask* taskPointer;
u16 maxTaskCount;
NWC24Err result = GetMaxDlTaskCount(&maxTaskCount);
if (result < NWC24_OK) { return result; }
if (maxTaskCount >= NWC24_DL_TASK_MAX) { return NWC24_OK; }
result = NWC24ExtendDlTaskList(NWC24_DL_TASK_MAX);
if (result < NWC24_OK) { return result; }
result = ReadDlTaskInline(&task, 2);
taskPointer = &task;
result = ReadDlTaskInline(taskPointer, 2);
if (result == NWC24_ERR_NOT_FOUND) { return NWC24_OK; }
if (result < NWC24_OK) { return result; }
return RemoveDlTask(&task);
return RemoveDlTask(taskPointer);
}
NWC24Err NWC24GetDlOptOutFlags(NWC24DlTask* dlTask, u8* dlOptOutFlags) {

View File

@@ -54,14 +54,16 @@ namespace textinput {
namespace keyboard {
namespace cellphonetype {
struct InputModeEnabled { bool enabled; };
struct LanguageDependencyData {
u32 flags;
const KeySet* keySets[5];
};
static const wchar_t* csszPredictLanguage[] = {
L"Eng", L"Eng", L"Fra", L"Esp", L"EN", L"DE", L"FR",
L"ES", L"IT", L"NL", L"CN", L"KR", L""
L"", L"", L"Eng", L"Fra", L"Esp", L"EN", L"DE",
L"FR", L"ES", L"IT", L"NL", L"CN", L"KR"
};
struct PaneNameToControlKey {
@@ -89,73 +91,25 @@ namespace textinput {
const char* animationKey;
};
struct TogglePaneName {
char name[16];
};
struct NumericModePaneNames {
char predictionEuropeanMode[16];
char othersEuropean[16];
char smallCandidateChange[16];
char othersJapanese[16];
char predictionJapanese[16];
char spaceJapanese[16];
char key09[12];
char key11[12];
};
static const char* csNormalAnimationKey = "W_CPkey_00";
static const char* csToggleAnimationKey = "W_ChngTag_00";
static const char* csEuropeanAnimationKey = "W_othersBT_EU";
static PaneNameToAnimationKey csPaneNameNormalAnimationKey[] = {
{"W_CPkey_00", NULL}, {"W_CPkey_01", NULL}, {"W_CPkey_02", NULL},
{"W_CPkey_03", NULL}, {"W_CPkey_04", NULL}, {"W_CPkey_05", NULL},
{"W_CPkey_06", NULL}, {"W_CPkey_07", NULL}, {"W_CPkey_08", NULL},
{"W_CPkey_09", NULL}, {"W_CPkey_10", NULL}, {"W_CPkey_11", NULL},
{"W_CPkey_LF", NULL}, {"W_CPkey_DELETE", NULL}, {"W_spaceBT_JP", NULL},
{"W_othersBT_JP", NULL}, {"W_othersBT_EU", NULL},
{"W_CPkey_00", NULL}, {"W_CPkey_01", csNormalAnimationKey}, {"W_CPkey_02", csNormalAnimationKey},
{"W_CPkey_03", csNormalAnimationKey}, {"W_CPkey_04", csNormalAnimationKey}, {"W_CPkey_05", csNormalAnimationKey},
{"W_CPkey_06", csNormalAnimationKey}, {"W_CPkey_07", csNormalAnimationKey}, {"W_CPkey_08", csNormalAnimationKey},
{"W_CPkey_09", csNormalAnimationKey}, {"W_CPkey_10", csNormalAnimationKey}, {"W_CPkey_11", csNormalAnimationKey},
{"W_CPkey_LF", csNormalAnimationKey}, {"W_CPkey_DELETE", csNormalAnimationKey}, {"W_spaceBT_JP", csNormalAnimationKey},
{"W_othersBT_JP", csEuropeanAnimationKey}, {"W_othersBT_EU", NULL},
{"W_prdcModeBT_EU", NULL}, {"W_smlCptChngeBT", NULL},
};
static PaneNameToAnimationKey csPaneNameToggleAnimationKey[] = {
{"W_ChngTag_00", NULL}, {"W_ChngTag_01", NULL},
{"W_ChngTag_02", NULL}, {"W_ChngTag_03", NULL},
{"W_ChngTag_00", NULL}, {"W_ChngTag_01", csToggleAnimationKey},
{"W_ChngTag_02", csToggleAnimationKey}, {"W_ChngTag_03", csToggleAnimationKey},
};
struct TexturePaneNames {
char names[3][16];
};
static TexturePaneNames csTexturePaneNames = {
{"P_spaceBT_JP", "P_spaceBT_CN", "P_spaceBT_KR"},
};
struct AnimationKeyInitializer {
AnimationKeyInitializer() {
csPaneNameNormalAnimationKey[1].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[2].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[3].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[4].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[5].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[6].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[7].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[8].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[9].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[10].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[11].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[12].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[13].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[14].animationKey = csNormalAnimationKey;
csPaneNameNormalAnimationKey[15].animationKey = csEuropeanAnimationKey;
csPaneNameToggleAnimationKey[1].animationKey = csToggleAnimationKey;
csPaneNameToggleAnimationKey[2].animationKey = csToggleAnimationKey;
csPaneNameToggleAnimationKey[3].animationKey = csToggleAnimationKey;
}
};
static AnimationKeyInitializer sAnimationKeyInitializer;
static const PaneNameToControlKey csPaneNameToControlKey[] = {
{"B_CPkey_LF", 0},
{"B_CPkey_DELETE", 1},
@@ -177,6 +131,9 @@ namespace textinput {
{2, "fs_VK_cellPhone_a_Focus-OUT.brlan"},
{4, "fs_VK_cellPhone_a_Pushed.brlan"},
{3, "fs_VK_cellPhone_a_Roll_over.brlan"},
};
static const AnimationFileForControlKey csAnimationFileForToggleKey[] = {
{0, "fs_VK_cellPhone_a_normal.brlan"},
{1, "fs_VK_cellPhone_a_Focus-IN.brlan"},
{2, "fs_VK_cellPhone_a_Focus-OUT.brlan"},
@@ -240,6 +197,16 @@ namespace textinput {
return NULL;
}
static inline s32 findCellPhoneControlKey(const char* paneName) {
for (u16 index = 0; index < 12; ++index) {
if (util::strcmp(csPaneNameToControlKey[index].name, paneName)) {
return csPaneNameToControlKey[index].controlKey;
}
}
return 0x1B;
}
void Base::onKey(u32 event, void* data) {
struct KeyEvent { const char* paneName; u8 state; };
struct ConfirmInput {
@@ -255,26 +222,19 @@ namespace textinput {
const char* paneName = static_cast<KeyEvent*>(data)->paneName;
if (event == gui::EventHandler::ON_TRIG) {
u8 state = static_cast<KeyEvent*>(data)->state;
s32 controlKey = 0x1B;
for (u16 index = 0; index < 12; index++) {
if (util::strcmp(csPaneNameToControlKey[index].name, paneName)) {
controlKey = csPaneNameToControlKey[index].controlKey;
break;
}
}
s32 controlKey = findCellPhoneControlKey(paneName);
if (controlKey != 0x1B) {
onCtrlKey_(static_cast<VKeyCode>(controlKey));
} else if (!isZiActive() || getLanguage() == CN ||
(getLanguage() == KR && mCurrentInputMode != 0) || getInputType() == 1) {
LanguageDependencyData* inputModeTable = static_cast<LanguageDependencyData*>(mpInputModeTable);
if (mHoldingButton == NULL) {
u32 inputMode = mCurrentInputMode;
if (getLanguage() == JP && inputMode == IM_02) {
if (getLanguage() == JP && static_cast<s32>(inputMode) == IM_02) {
if (!mbUpperCaseMode) { inputMode = IM_04; }
} else if (inputModeTable->keySets[inputMode]->uType == KEY_TYPE_ABC_UPPER && !mbUpperCaseMode) {
} else if (static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[inputMode]->uType == KEY_TYPE_ABC_UPPER && !mbUpperCaseMode) {
inputMode = IM_01;
}
const PaneNameToCharCode* keys = inputModeTable->keySets[inputMode]->pPaneNameToCharCode;
const PaneNameToCharCode* keys = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[inputMode]->pPaneNameToCharCode;
mHoldingButton = findKeyForPane(keys, paneName);
if (state) {
mPreviousInputMode = 15;
@@ -283,7 +243,7 @@ namespace textinput {
} else {
if (state) { mPreviousInputMode--; }
else { mPreviousInputMode++; }
if (mPreviousInputMode == 16) { mPreviousInputMode = 0; }
if (static_cast<s32>(mPreviousInputMode) == 16) { mPreviousInputMode = 0; }
else if (static_cast<s32>(mPreviousInputMode) < 0) {
mPreviousInputMode = 15;
while (mHoldingButton->wc[mPreviousInputMode] == 0) { mPreviousInputMode--; }
@@ -320,7 +280,7 @@ namespace textinput {
commandData.character = character;
commandData.letterMode = mCurrentInputMode;
commandData.holdingKey = mHoldingButton;
bool convertSpace = false;
bool convertSpace;
sendCommand(0x20, &convertSpace);
if (character == L'0' && getLanguage() != KR) {
if (convertSpace) { sendCommand(6, NULL); }
@@ -331,12 +291,11 @@ namespace textinput {
mPreviousInputMode = 0;
mHoldingButton = NULL;
} else {
const LanguageDependencyData* table = static_cast<const LanguageDependencyData*>(mpInputModeTable);
const PaneNameToCharCode* currentKeys = table->keySets[mCurrentInputMode]->pPaneNameToCharCode;
const PaneNameToCharCode* currentKeys = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[mCurrentInputMode]->pPaneNameToCharCode;
commandData.holdingKey = findKeyForPane(currentKeys, paneName);
if (table->keySets[mCurrentInputMode]->uType == KEY_TYPE_ABC_UPPER && !mbAbcMode) {
if (static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[mCurrentInputMode]->uType == KEY_TYPE_ABC_UPPER && !mbAbcMode) {
commandData.letterMode = IM_01;
currentKeys = table->keySets[IM_01]->pPaneNameToCharCode;
currentKeys = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[IM_01]->pPaneNameToCharCode;
commandData.holdingKey = findKeyForPane(currentKeys, paneName);
}
commandData.character = convertToZiCellphoneInput_(commandData.character);
@@ -441,7 +400,7 @@ namespace textinput {
}
if (mode == IM_00) {
struct ActiveMode { bool enabled; } activeData = {true};
InputModeEnabled activeData = {true};
sendCommand(0x13, &activeData);
}
if (mode == IM_01) {
@@ -525,7 +484,7 @@ namespace textinput {
sendCommand(0x12, &commandData);
if (mCurrentInputMode == IM_00) {
struct ActiveMode { bool enabled; } activeData = {true};
InputModeEnabled activeData = {true};
sendCommand(0x13, &activeData);
}
@@ -571,16 +530,16 @@ namespace textinput {
wchar_t Base::convertToZiCellphoneInput_(wchar_t value) {
switch (value) {
case L'0': return 0xEFF1;
case L'1': return 0xEFF2;
case L'2': return 0xEFF3;
case L'3': return 0xEFF4;
case L'4': return 0xEFF5;
case L'5': return 0xEFF6;
case L'6': return 0xEFF7;
case L'7': return 0xEFF8;
case L'8': return 0xEFF9;
case L'9': return 0xEFFA;
case L'1': return 0xEFF1;
case L'2': return 0xEFF2;
case L'3': return 0xEFF3;
case L'4': return 0xEFF4;
case L'5': return 0xEFF5;
case L'6': return 0xEFF6;
case L'7': return 0xEFF7;
case L'8': return 0xEFF8;
case L'9': return 0xEFF9;
case L'0': return 0xEFFA;
default: return value;
}
}
@@ -636,22 +595,6 @@ namespace textinput {
EventHandler::~EventHandler() {}
static TogglePaneName csPaneNameTogglePanes[] = {
{"W_ChngTag_00"}, {"W_ChngTag_01"},
{"W_ChngTag_02"}, {"W_ChngTag_03"},
};
static NumericModePaneNames csNumericModePaneNames = {
"W_prdcModeBT_EU",
"W_othersBT_EU",
"W_smlCptChngeBT",
"W_othersBT_JP",
"W_CPkey_Prdc_JP",
"W_spaceBT_JP",
"W_CPkey_09",
"W_CPkey_11",
};
void LayoutByNW4R::create(MEMAllocator* allocator) {
Base::create(allocator);
mpEventHandler = new (MEMAllocFromAllocator(allocator, sizeof(EventHandler))) EventHandler(this);
@@ -660,57 +603,49 @@ namespace textinput {
mpPaneManager->setAllBoundingBoxComponentTriggerTarget(true);
for (u16 i = 0; i < sizeof(csPaneNameNormalAnimationKey) / sizeof(csPaneNameNormalAnimationKey[0]); ++i) {
void* paneMemory = MEMAllocFromAllocator(allocator, sizeof(CellPhoneAnmPane));
CellPhoneAnmPane* pane = static_cast<CellPhoneAnmPane*>(paneMemory);
if (paneMemory) {
pane = new (paneMemory) CellPhoneAnmPane(getPane(csPaneNameNormalAnimationKey[i].name), NULL);
}
CellPhoneAnmPane* pane = new (MEMAllocFromAllocator(allocator, sizeof(CellPhoneAnmPane)))
CellPhoneAnmPane(getPane(csPaneNameNormalAnimationKey[i].name), NULL);
nw4r::ut::List_Append(&mAnmPanes, pane);
const PaneNameToAnimationKey& paneName = csPaneNameNormalAnimationKey[i];
const char* animationKey = paneName.animationKey;
for (u16 j = 0; j < 5; ++j) {
const AnimationFileForControlKey& animation = csAninationFileForControlKey[j];
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation.filename);
void* resource = mpMultiArcResourceAccessor->GetResource(0, csAninationFileForControlKey[j].filename);
AnimTransformPane* transform = static_cast<AnimTransformPane*>(
getLayout()->CreateAnimTransform(resource, mpMultiArcResourceAccessor));
if (animationKey) {
pane->forceAddAnimation(allocator, animation.animation, transform,
pane->forceAddAnimation(allocator, csAninationFileForControlKey[j].animation, transform,
paneName.animationKey, false, true);
} else {
pane->addAnimation(allocator, animation.animation, transform, false, true);
pane->addAnimation(allocator, csAninationFileForControlKey[j].animation, transform, false, true);
}
}
}
for (u16 i = 0; i < sizeof(csPaneNameToggleAnimationKey) / sizeof(csPaneNameToggleAnimationKey[0]); ++i) {
void* paneMemory = MEMAllocFromAllocator(allocator, sizeof(CellPhoneControlAnmPane));
CellPhoneControlAnmPane* pane = static_cast<CellPhoneControlAnmPane*>(paneMemory);
if (paneMemory) {
pane = new (paneMemory) CellPhoneControlAnmPane(getPane(csPaneNameToggleAnimationKey[i].name), NULL);
}
CellPhoneControlAnmPane* pane = new (MEMAllocFromAllocator(allocator, sizeof(CellPhoneControlAnmPane)))
CellPhoneControlAnmPane(getPane(csPaneNameToggleAnimationKey[i].name), NULL);
nw4r::ut::List_Append(&mAnmPanes, pane);
const PaneNameToAnimationKey& paneName = csPaneNameToggleAnimationKey[i];
const char* animationKey = paneName.animationKey;
for (u16 j = 0; j < 6; ++j) {
const AnimationFileForControlKey& animation = csAninationFileForControlKey[j];
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation.filename);
void* resource = mpMultiArcResourceAccessor->GetResource(0, csAnimationFileForToggleKey[j].filename);
AnimTransformPane* transform = static_cast<AnimTransformPane*>(
getLayout()->CreateAnimTransform(resource, mpMultiArcResourceAccessor));
if (animationKey) {
pane->forceAddAnimation(allocator, animation.animation, transform,
pane->forceAddAnimation(allocator, csAnimationFileForToggleKey[j].animation, transform,
paneName.animationKey, false, true);
} else {
pane->addAnimation(allocator, animation.animation, transform, false, true);
pane->addAnimation(allocator, csAnimationFileForToggleKey[j].animation, transform, false, true);
}
}
}
nw4r::lyt::Pane* rootPane = mpLayout->GetRootPane();
rootPane->FindPaneByName(csTexturePaneNames.names[0], true)->GetMaterial()->GetTexture(&mTextures[0], 0);
rootPane->FindPaneByName(csTexturePaneNames.names[1], true)->GetMaterial()->GetTexture(&mTextures[1], 0);
rootPane->FindPaneByName(csTexturePaneNames.names[2], true)->GetMaterial()->GetTexture(&mTextures[2], 0);
rootPane->FindPaneByName("P_spaceBT_JP", true)->GetMaterial()->GetTexture(&mTextures[0], 0);
rootPane->FindPaneByName("P_spaceBT_CN", true)->GetMaterial()->GetTexture(&mTextures[1], 0);
rootPane->FindPaneByName("P_spaceBT_KR", true)->GetMaterial()->GetTexture(&mTextures[2], 0);
init();
setLanguage(getLanguage());
}
@@ -728,10 +663,10 @@ namespace textinput {
doNumericMode(false);
setPredictLanguageButton(true);
setSignWindowButton(true);
setVisible(csPaneNameTogglePanes[0].name, true);
setVisible(csPaneNameTogglePanes[1].name, true);
setVisible(csPaneNameTogglePanes[2].name, true);
setVisible(csPaneNameTogglePanes[3].name, true);
setVisible("W_ChngTag_00", true);
setVisible("W_ChngTag_01", true);
setVisible("W_ChngTag_02", true);
setVisible("W_ChngTag_03", true);
for (int i = 0; i < 4; ++i) {
const char* paneName = csPaneNameToggleAnimationKey[i].name;
@@ -752,43 +687,43 @@ namespace textinput {
}
if (getLanguage() == JP) {
setVisible(csNumericModePaneNames.predictionEuropeanMode, false);
setVisible(csNumericModePaneNames.othersEuropean, false);
setVisible(csNumericModePaneNames.smallCandidateChange, true);
setVisible(csNumericModePaneNames.othersJapanese, true);
setVisible(csNumericModePaneNames.predictionJapanese, true);
setVisible(csNumericModePaneNames.spaceJapanese, true);
setVisible(csNumericModePaneNames.key09, true);
setVisible(csNumericModePaneNames.key11, true);
setVisible("W_prdcModeBT_EU", false);
setVisible("W_othersBT_EU", false);
setVisible("W_smlCptChngeBT", true);
setVisible("W_othersBT_JP", true);
setVisible("W_CPkey_Prdc_JP", true);
setVisible("W_spaceBT_JP", true);
setVisible("W_CPkey_09", true);
setVisible("W_CPkey_11", true);
} else if (getLanguage() == CN) {
setVisible(csNumericModePaneNames.predictionEuropeanMode, true);
setVisible(csNumericModePaneNames.othersEuropean, true);
setVisible(csNumericModePaneNames.smallCandidateChange, false);
setVisible(csNumericModePaneNames.othersJapanese, false);
setVisible(csNumericModePaneNames.predictionJapanese, false);
setVisible(csNumericModePaneNames.spaceJapanese, true);
setVisible(csNumericModePaneNames.key09, true);
setVisible(csNumericModePaneNames.key11, false);
setVisible("W_prdcModeBT_EU", true);
setVisible("W_othersBT_EU", true);
setVisible("W_smlCptChngeBT", false);
setVisible("W_othersBT_JP", false);
setVisible("W_CPkey_Prdc_JP", false);
setVisible("W_spaceBT_JP", true);
setVisible("W_CPkey_09", true);
setVisible("W_CPkey_11", false);
setPredictLanguageButton(false);
} else if (getLanguage() == KR) {
setVisible(csNumericModePaneNames.predictionEuropeanMode, true);
setVisible(csNumericModePaneNames.othersEuropean, true);
setVisible(csNumericModePaneNames.smallCandidateChange, false);
setVisible(csNumericModePaneNames.othersJapanese, false);
setVisible(csNumericModePaneNames.predictionJapanese, false);
setVisible(csNumericModePaneNames.spaceJapanese, true);
setVisible(csNumericModePaneNames.key09, false);
setVisible(csNumericModePaneNames.key11, false);
setVisible("W_prdcModeBT_EU", true);
setVisible("W_othersBT_EU", true);
setVisible("W_smlCptChngeBT", false);
setVisible("W_othersBT_JP", false);
setVisible("W_CPkey_Prdc_JP", false);
setVisible("W_spaceBT_JP", true);
setVisible("W_CPkey_09", false);
setVisible("W_CPkey_11", false);
setPredictLanguageButton(false);
} else {
setVisible(csNumericModePaneNames.predictionEuropeanMode, true);
setVisible(csNumericModePaneNames.othersEuropean, true);
setVisible(csNumericModePaneNames.smallCandidateChange, false);
setVisible(csNumericModePaneNames.othersJapanese, false);
setVisible(csNumericModePaneNames.predictionJapanese, false);
setVisible(csNumericModePaneNames.spaceJapanese, false);
setVisible(csNumericModePaneNames.key09, false);
setVisible(csNumericModePaneNames.key11, false);
setVisible("W_prdcModeBT_EU", true);
setVisible("W_othersBT_EU", true);
setVisible("W_smlCptChngeBT", false);
setVisible("W_othersBT_JP", false);
setVisible("W_CPkey_Prdc_JP", false);
setVisible("W_spaceBT_JP", false);
setVisible("W_CPkey_09", false);
setVisible("W_CPkey_11", false);
}
changeInputMode(static_cast<InputMode>(mCurrentInputMode));
@@ -798,11 +733,11 @@ namespace textinput {
sendCommand(0x1F, &predictMode);
updatePredictLanguage(&predictMode);
static_cast<nw4rmanager::Layout*>(this)->initPaneLastDrawReceived();
initPaneLastDrawReceived();
mpLayout->Animate(0);
mpLayout->CalculateMtx(mDrawInfo);
nw4r::lyt::Pane* spacePane = mpLayout->GetRootPane()->FindPaneByName(csTexturePaneNames.names[0], true);
nw4r::lyt::Pane* spacePane = mpLayout->GetRootPane()->FindPaneByName("P_spaceBT_JP", true);
nw4r::lyt::Pane* henkanPane = mpLayout->GetRootPane()->FindPaneByName("P_HENKAN_JP", true);
spacePane->SetVisible(true);
henkanPane->SetVisible(false);
@@ -822,14 +757,6 @@ namespace textinput {
void LayoutByNW4R::update() {}
static inline s32 findCellPhoneControlKey(const char* paneName) {
for (u16 index = 0; index < 12; ++index) {
if (util::strcmp(csPaneNameToControlKey[index].name, paneName)) {
return csPaneNameToControlKey[index].controlKey;
}
}
return 0x1B;
}
void LayoutByNW4R::onKey(u32 event, void* data) {
Base::onKey(event, data);
@@ -842,7 +769,6 @@ namespace textinput {
controlKey = findCellPhoneControlKey(paneName);
if (controlKey != 0x1B) {
switch (controlKey) {
case 9:
case 11:
case 13:
case 18:
@@ -871,27 +797,8 @@ namespace textinput {
}
}
}
void LayoutByNW4R::onActive() {
u32 commandData = 0;
u8 inactiveData[4];
sendCommand(0x12, &commandData);
if (static_cast<s32>(mCurrentInputMode) == IM_00) {
struct ActiveMode { bool enabled; } activeData = {true};
sendCommand(0x13, &activeData);
}
if (static_cast<s32>(mCurrentInputMode) == IM_01) {
inactiveData[0] = 0;
sendCommand(0x13, inactiveData);
}
if (static_cast<s32>(mCurrentInputMode) == IM_00) {
sendCommand(6, NULL);
changeInputMode(static_cast<InputMode>(mCurrentInputMode));
}
updateFixMode();
Base::onActive();
nw4rmanager::Layout::init();
}
@@ -902,7 +809,7 @@ namespace textinput {
void LayoutByNW4R::calc() {
nw4rmanager::Layout::calc();
nw4r::lyt::Pane* spacePane = mpLayout->GetRootPane()->FindPaneByName(csTexturePaneNames.names[0]);
nw4r::lyt::Pane* spacePane = mpLayout->GetRootPane()->FindPaneByName("P_spaceBT_JP");
nw4r::lyt::Pane* henkanPane = mpLayout->GetRootPane()->FindPaneByName("P_HENKAN_JP");
bool canConvert = mpManager->getInputForm()->canConvert();
if (canConvert) {
@@ -928,22 +835,22 @@ namespace textinput {
if (!enabled) { return; }
{
setVisible(csNumericModePaneNames.smallCandidateChange, !enabled);
setVisible(csNumericModePaneNames.key09, !enabled);
setVisible("W_smlCptChngeBT", !enabled);
setVisible("W_CPkey_09", !enabled);
setVisible("P_CPkey_dakuten", !enabled);
setVisible(csNumericModePaneNames.smallCandidateChange, !enabled);
setVisible(csNumericModePaneNames.predictionEuropeanMode, !enabled);
setVisible(csNumericModePaneNames.othersEuropean, !enabled);
setVisible(csNumericModePaneNames.spaceJapanese, !enabled);
setVisible(csNumericModePaneNames.smallCandidateChange, !enabled);
setVisible(csNumericModePaneNames.othersJapanese, !enabled);
setVisible(csNumericModePaneNames.predictionJapanese, !enabled);
setVisible(csNumericModePaneNames.key09, !enabled);
setVisible(csNumericModePaneNames.key11, !enabled);
setVisible(csPaneNameTogglePanes[0].name, !enabled);
setVisible(csPaneNameTogglePanes[1].name, !enabled);
setVisible(csPaneNameTogglePanes[2].name, !enabled);
setVisible(csPaneNameTogglePanes[3].name, !enabled);
setVisible("W_smlCptChngeBT", !enabled);
setVisible("W_prdcModeBT_EU", !enabled);
setVisible("W_othersBT_EU", !enabled);
setVisible("W_spaceBT_JP", !enabled);
setVisible("W_smlCptChngeBT", !enabled);
setVisible("W_othersBT_JP", !enabled);
setVisible("W_CPkey_Prdc_JP", !enabled);
setVisible("W_CPkey_09", !enabled);
setVisible("W_CPkey_11", !enabled);
setVisible("W_ChngTag_00", !enabled);
setVisible("W_ChngTag_01", !enabled);
setVisible("W_ChngTag_02", !enabled);
setVisible("W_ChngTag_03", !enabled);
}
}
@@ -973,8 +880,7 @@ namespace textinput {
void LayoutByNW4R::doNumericWithDotMode(bool enabled) {
doNumericMode(enabled);
setString("T_CPkey_11", L".");
const NumericModePaneNames& paneNames = csNumericModePaneNames;
setVisible(paneNames.key11, enabled);
setVisible("W_CPkey_11", enabled);
mbNumericWithDotMode = true;
}
@@ -1036,22 +942,22 @@ namespace textinput {
void LayoutByNW4R::setPredictLanguageButton(bool enabled) {
setVisible(csNumericModePaneNames.predictionEuropeanMode, enabled);
setVisible("W_prdcModeBT_EU", enabled);
}
void LayoutByNW4R::setSignWindowButton(bool enabled) {
if (!enabled) {
setVisible(csNumericModePaneNames.othersEuropean, enabled);
setVisible(csNumericModePaneNames.othersJapanese, enabled);
setVisible("W_othersBT_EU", enabled);
setVisible("W_othersBT_JP", enabled);
return;
}
{
setVisible(csNumericModePaneNames.othersEuropean, false);
setVisible(csNumericModePaneNames.othersJapanese, false);
setVisible("W_othersBT_EU", false);
setVisible("W_othersBT_JP", false);
if (getLanguage() == JP) {
setVisible(csNumericModePaneNames.othersJapanese, true);
setVisible("W_othersBT_JP", true);
} else {
setVisible(csNumericModePaneNames.othersEuropean, true);
setVisible("W_othersBT_EU", true);
}
}
}
@@ -1059,7 +965,7 @@ namespace textinput {
void LayoutByNW4R::setLangKeyActive(bool enabled) {
Base::setLangKeyActive(enabled);
if (getLanguage() == KR || getLanguage() == CN) {
setVisible(csPaneNameTogglePanes[0].name, enabled);
setVisible("W_ChngTag_00", enabled);
setVisible("T_ChngTag_00", enabled);
}
}
@@ -1136,30 +1042,9 @@ namespace textinput {
}
void LayoutByNW4R::changeInputMode(InputMode mode) {
u8 inactiveData[4];
mCurrentInputMode = mode;
if (getLanguage()) {
mbUpperCaseMode = true;
mbAbcMode = true;
}
Base::changeInputMode(mode);
if (mpManager->getCandidateBox()) {
mpManager->getCandidateBox()->checkValidation();
}
if (mode == IM_00) {
struct ActiveMode { bool enabled; } activeData = {true};
sendCommand(0x13, &activeData);
}
if (mode == IM_01) {
inactiveData[0] = 0;
sendCommand(0x13, inactiveData);
}
updateFixMode();
sendCommand(0x29, NULL);
if (getLanguage() == JP) {
if (getLanguage() == JP) {
if (!mbUpperCaseMode && mode == IM_02) {
mode = IM_04;
}
@@ -1167,35 +1052,34 @@ namespace textinput {
switch (mode) {
case IM_00:
case IM_01:
setVisible(csNumericModePaneNames.smallCandidateChange, false);
setVisible(csNumericModePaneNames.key09, true);
setVisible(csNumericModePaneNames.spaceJapanese, true);
setVisible(csNumericModePaneNames.smallCandidateChange, false);
setVisible("W_smlCptChngeBT", false);
setVisible("W_CPkey_09", true);
setVisible("P_CPkey_dakuten", true);
setVisible("W_smlCptChngeBT", false);
break;
case IM_02:
case IM_04:
setVisible(csNumericModePaneNames.smallCandidateChange, true);
setVisible(csNumericModePaneNames.key09, false);
setVisible(csNumericModePaneNames.spaceJapanese, false);
setVisible(csNumericModePaneNames.smallCandidateChange, true);
setVisible("W_smlCptChngeBT", true);
setVisible("W_CPkey_09", false);
setVisible("P_CPkey_dakuten", false);
setVisible("W_smlCptChngeBT", true);
break;
case IM_03:
setVisible(csNumericModePaneNames.smallCandidateChange, false);
setVisible(csNumericModePaneNames.key09, true);
setVisible(csNumericModePaneNames.spaceJapanese, false);
setVisible(csNumericModePaneNames.smallCandidateChange, false);
setVisible("W_smlCptChngeBT", false);
setVisible("W_CPkey_09", true);
setVisible("P_CPkey_dakuten", false);
setVisible("W_smlCptChngeBT", false);
break;
default:
break;
}
} else {
setVisible(csNumericModePaneNames.spaceJapanese, false);
setVisible("P_CPkey_dakuten", false);
}
changeKeyTop(static_cast<const LanguageDependencyData*>(mpInputModeTable)
->keySets[mode]->pPaneNameToCharCode);
nw4rmanager::Layout* layout = this;
layout->initPaneLastDrawReceived();
initPaneLastDrawReceived();
}
void LayoutByNW4R::changeKeyTop(const PaneNameToCharCode* keys) {
@@ -1252,11 +1136,11 @@ namespace textinput {
KeyboardBase::setLanguage(language);
nw4r::lyt::Pane* rootPane = mpLayout->GetRootPane();
if (language == JP) {
rootPane->FindPaneByName(csTexturePaneNames.names[0], true)->GetMaterial()->SetTexture(0, mTextures[0]);
rootPane->FindPaneByName("P_spaceBT_JP", true)->GetMaterial()->SetTexture(0, mTextures[0]);
} else if (language == CN) {
rootPane->FindPaneByName(csTexturePaneNames.names[0], true)->GetMaterial()->SetTexture(0, mTextures[1]);
rootPane->FindPaneByName("P_spaceBT_JP", true)->GetMaterial()->SetTexture(0, mTextures[1]);
} else if (language == KR) {
rootPane->FindPaneByName(csTexturePaneNames.names[0], true)->GetMaterial()->SetTexture(0, mTextures[2]);
rootPane->FindPaneByName("P_spaceBT_JP", true)->GetMaterial()->SetTexture(0, mTextures[2]);
}
if (mpLayout) {
@@ -1428,7 +1312,7 @@ namespace textinput {
changeAnimation(ANM_Pushed);
}
break;
case ANM_FocusOut:
case ANM_RollOver:
if (event == PE_2) {
changeAnimation(ANM_FocusOut);
}
@@ -1436,7 +1320,7 @@ namespace textinput {
changeAnimation(ANM_Pushed);
}
break;
case ANM_RollOver:
case ANM_FocusOut:
if (event == PE_4) {
changeAnimation(ANM_Normal);
}

View File

@@ -0,0 +1,190 @@
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_chdir | data 1 deduplicate the ordinary empty root-path literal with opendir | objdiff 100.000000% | insns 159/159 | positional diffs 0 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24SetDlInterval | 1 give the final header update its own task ID lifetime | objdiff 99.897960% | insns 147/147 | positional diffs 3 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24SetDlInterval | 2 remove the duplicate task-pointer assignment and isolate final task ID | objdiff 99.897960% | insns 147/147 | positional diffs 3 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24SetDlInterval | 3 reuse the real next-time helper for the inlined header update | objdiff 99.727890% | insns 147/147 | positional diffs 8 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24ExtendDlTaskList | 1 give the final header reload result a separate local lifetime | objdiff 99.854010% | insns 137/137 | positional diffs 4 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24ExtendDlTaskList | 2 express final error precedence as a conditional return | objdiff 99.854010% | insns 137/137 | positional diffs 4 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24ExtendDlTaskList | 3 return close failure before returning a separately scoped reload result | objdiff 99.854010% | insns 137/137 | positional diffs 4 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24GetDlTask | 1 retain a named destination pointer for file reads | objdiff 99.728264% | insns 92/92 | positional diffs 5 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24GetDlTask | 2 separate the task ID value lifetime from the passed argument | objdiff 99.728264% | insns 92/92 | positional diffs 5 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24GetDlTask | 3 retain destination and task ID as local inputs to read validation | objdiff 99.728264% | insns 92/92 | positional diffs 5 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24iCreateDlTaskList | 1 scope the entry-initialization index after header creation | objdiff 99.624060% | insns 133/133 | positional diffs 10 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24iCreateDlTaskList | 2 reload the initialized header for its magic-field write | objdiff 97.218050% | insns 134/133 | positional diffs 120 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24iCreateDlTaskList | 3 use a natural unsigned counter for initializing all entries | objdiff 99.624060% | insns 133/133 | positional diffs 10 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24iCheckDlHeaderConsistency | 1 initialize the task pointer after the parameter aliases | objdiff 98.773580% | insns 212/212 | positional diffs 3 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24iCheckDlHeaderConsistency | 2 use the passed header and repair flag directly throughout the consistency loop | objdiff 98.773580% | insns 212/212 | positional diffs 3 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24iCheckDlHeaderConsistency | 3 bind a typed view for task fields separately from the file-read pointer | objdiff 98.773580% | insns 212/212 | positional diffs 3 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24DeleteDlTask | 1 keep the owner-validation result test inside the protected-app branch | objdiff 100.000000% | insns 105/105 | positional diffs 0 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24DeleteDlTask | 2 spell out the delete operation and retain its success result | objdiff 98.952380% | insns 104/105 | positional diffs 15 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24DeleteDlTask | 3 use early failure returns through the final delete and ID invalidation | objdiff 100.000000% | insns 105/105 | positional diffs 0 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24AddDlTask | 1 keep the header-count validation as a direct invalid-header branch | objdiff 94.748250% | insns 142/143 | positional diffs 137 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24AddDlTask | 2 place the next-time calculation inside the successful-time-query branch | objdiff 96.783220% | insns 145/143 | positional diffs 139 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24AddDlTask | 3 derive the final validation and header timestamp update directly from target blocks | objdiff 95.384610% | insns 146/143 | positional diffs 140 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24InitDlTask | 1 derive the explicit true and false content-file branches from target assembly | objdiff 98.923615% | insns 144/144 | positional diffs 31 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24InitDlTask | 2 use the common header validator and typed home-path element addresses | objdiff 96.541664% | insns 143/144 | positional diffs 103 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24InitDlTask | 3 reverse the two default interval stores and retain the boolean as a signed result | objdiff 96.541664% | insns 143/144 | positional diffs 102 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24ManageDlTaskListForMenu | 1 retain a task pointer across the read and removal blocks | BUILD FAILED: && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d
### mwcceppc.exe Compiler:
# File: libs\RevoEX\src\nwc24\NWC24Download.c
# ----------------------------------------------
# 918: NWC24DlTask* taskPointer = &task;
# Error: ^^^^^^^^^^^
# (10141) expression syntax error
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
libs/RevoEX/src/nwc24/NWC24Download | NWC24ManageDlTaskListForMenu | 2 spell out final read-validation, delete and invalidation blocks | objdiff 94.335526% | insns 149/152 | positional diffs 124 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24ManageDlTaskListForMenu | 3 scope final deletion result and consolidate failed-read handling | objdiff 92.217100% | insns 148/152 | positional diffs 126 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | AddTaskInternal | 1 derive the allocation loop as a while loop ending at task update | objdiff 71.753120% | insns 398/401 | positional diffs 319 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | AddTaskInternal | 2 retain the URL pointer across length and prefix checks as target does | objdiff 92.765590% | insns 393/401 | positional diffs 333 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | AddTaskInternal | 3 use one failure-result check after free-slot allocation or purging | objdiff 71.753120% | insns 398/401 | positional diffs 319 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24UpdateDlTask | 1 derive the retry loop with its test before the increment body | objdiff 94.173910% | insns 247/253 | positional diffs 249 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24UpdateDlTask | 2 remove the initial task-ID lifetime while preserving the target retry loop | objdiff 94.173910% | insns 247/253 | positional diffs 249 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24UpdateDlTask | 3 split universal-time and access-time failures before the corrected retry loop | objdiff 93.146250% | insns 245/253 | positional diffs 251 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24ManageDlTaskListForMenu | 4 retain the task pointer with a C89-compatible declaration | objdiff 94.736840% | insns 151/152 | positional diffs 137 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTaskEx | 1 derive separate ascending and descending initial-bound stores | objdiff 93.689650% | insns 147/145 | positional diffs 74 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTaskEx | 2 preload each comparison bound before the direction-dependent comparisons | objdiff 97.931040% | insns 145/145 | positional diffs 19 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTaskEx | 3 order the tie-breaking comparison and found flag as in the target blocks | objdiff 93.793106% | insns 147/145 | positional diffs 72 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24PurgeOldestDlTask | 1 derive the menu-task skipping loop with its iterator call at the test | objdiff 85.829544% | insns 171/176 | positional diffs 166 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24PurgeOldestDlTask | 2 reverse retained read-input lifetimes and spell out the final delete result | objdiff 83.715910% | insns 166/176 | positional diffs 86 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24PurgeOldestDlTask | 3 consolidate final iterator failures and use the selected task ID directly | objdiff 84.880684% | insns 166/176 | positional diffs 158 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 1 derive dynamic loop bounds and per-slot validation results from every target block | BUILD FAILED: /src/libs/RevoEX/src/nwc24/NWC24Download.d
### mwcceppc.exe Compiler:
# File: libs\RevoEX\src\nwc24\NWC24Download.c
# ----------------------------------------------
# 581: taskId < (work != NULL ? (DlTaskListHeader*)work->dlHead : NULL)->maxTaskCount; taskId++) {
# Error: ^^
# (10149) not a struct/union/class
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 2 express the re-derived slot scan as a while loop | BUILD FAILED: build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d
### mwcceppc.exe Compiler:
# File: libs\RevoEX\src\nwc24\NWC24Download.c
# ----------------------------------------------
# 581: taskId < (work != NULL ? (DlTaskListHeader*)work->dlHead : NULL)->maxTaskCount) {
# Error: ^^
# (10149) not a struct/union/class
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 3 separate the found and missing slot result assignments | BUILD FAILED: /src/libs/RevoEX/src/nwc24/NWC24Download.d
### mwcceppc.exe Compiler:
# File: libs\RevoEX\src\nwc24\NWC24Download.c
# ----------------------------------------------
# 581: taskId < (work != NULL ? (DlTaskListHeader*)work->dlHead : NULL)->maxTaskCount; taskId++) {
# Error: ^^
# (10149) not a struct/union/class
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 1 derive dynamic loop bounds and per-slot validation results from every target block | objdiff 94.620255% | insns 78/79 | positional diffs 51 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 2 express the re-derived slot scan as a while loop | objdiff 94.620255% | insns 78/79 | positional diffs 51 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 3 separate the found and missing slot result assignments | objdiff 94.620255% | insns 78/79 | positional diffs 51 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | data1 ordinary pane literals in first-use order and separate normal/toggle animation tables | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_GetSDD | 1 advance the indexed directory before the free-slot pointer | objdiff 99.681160% | insns 69/69 | positional diffs 2 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_GetSDD | 2 put the two directory advances in the for-loop step | objdiff 99.681160% | insns 69/69 | positional diffs 2 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_GetSDD | 3 derive the free candidate from the next indexed directory | objdiff 99.536230% | insns 69/69 | positional diffs 3 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_rename | 1 derive separate missing and volume-label branches and the short-name return | objdiff 97.712000% | insns 628/625 | positional diffs 540 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_rename | 2 match volume comparison operands and narrow the long-name offset adjustment | objdiff 97.808000% | insns 628/625 | positional diffs 540 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_rename | 3 give the final long-name emission loop its own counter lifetime | objdiff 97.712000% | insns 628/625 | positional diffs 540 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_move | 1 derive the not-found and final-update branches from the target blocks | objdiff 96.640250% | insns 634/631 | positional diffs 490 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_move | 2 use unsigned long-name division and narrow the saved entry adjustment | objdiff 96.148970% | insns 631/631 | positional diffs 482 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_move | 3 retain the stored byte-sized long-name count and advance the file pointer first | objdiff 96.354996% | insns 637/631 | positional diffs 567 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 1 derive unsigned long-name division from the target mulhwu block | objdiff 97.937720% | insns 566/562 | positional diffs 555 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 2 start the sector and long-name-count lifetimes at the allocation blocks | objdiff 97.405690% | insns 565/562 | positional diffs 376 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 3 retain the complete filename length and count through allocation | objdiff 97.076515% | insns 563/562 | positional diffs 396 | regressions 0
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 1 assign the control key after the target search and fallback blocks | objdiff 95.718475% | insns 685/682 | positional diffs 671 | regressions 0
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 2 express the control lookup with a while loop and selected fallback | objdiff 95.718475% | insns 685/682 | positional diffs 670 | regressions 0
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 3 retain the current control record instead of its multiplied index | objdiff 96.230200% | insns 679/682 | positional diffs 662 | regressions 0
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 1 call the inherited virtual directly without nullable base-pointer conversion | objdiff 98.526120% | insns 536/536 | positional diffs 155 | regressions 0
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 2 use an unsigned index for the four input-mode panes | objdiff 98.423510% | insns 536/536 | positional diffs 155 | regressions 0
src/keyboard/tiCellPhone | init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 3 retain the toggle-pane record through the label update loop | objdiff 98.522385% | insns 536/536 | positional diffs 155 | regressions 0
src/keyboard/tiCellPhone | doNumericWithDotMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 1 give the dot-key visibility value its own local lifetime | objdiff 100.000000% | insns 35/35 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | doNumericWithDotMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 2 store numeric-dot mode before the final visibility dispatch | objdiff 56.057144% | insns 35/35 | positional diffs 11 | regressions 0
src/keyboard/tiCellPhone | doNumericWithDotMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 3 derive the explicit true and false visibility alternatives | objdiff 100.000000% | insns 35/35 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | doNumericMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 1 place visibility updates in the enabled branch | objdiff 100.000000% | insns 169/169 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | doNumericMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 2 retain the toolbar across its presence check and numeric-mode update | BUILD FAILED: iCellPhone.cpp
# -------------------------------------
# 410: bool Base::onClose() {}
# Warning: ^
# (10184) return value expected
### mwcceppc.exe Compiler:
# 888: toolbar::ToolBar* toolbar = mpManager->getToolBar();
# Error: ^^^^^^^
# (10140) undefined identifier 'ToolBar'
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
src/keyboard/tiCellPhone | doNumericMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 3 retain one visibility value across the numeric-mode pane updates | objdiff 100.000000% | insns 169/169 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 1 test the typed pane allocation before placement construction | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 2 load the record animation key at its target conditional use | objdiff 92.732735% | insns 333/333 | positional diffs 155 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 3 give both animation attachment loops natural unsigned counters | objdiff 89.075070% | insns 331/333 | positional diffs 271 | regressions 0
src/keyboard/tiCellPhone | changeInputMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFQ59textinput8keyboard13cellphonetype4Base9InputMode | 1 derive the dakuten pane references and direct inherited virtual dispatch | objdiff 100.000000% | insns 207/207 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | changeInputMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFQ59textinput8keyboard13cellphonetype4Base9InputMode | 2 represent the disabled input-mode payload as its boolean field | objdiff 97.777780% | insns 207/207 | positional diffs 49 | regressions 0
src/keyboard/tiCellPhone | changeInputMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFQ59textinput8keyboard13cellphonetype4Base9InputMode | 3 test the selected mode before its upper-case state | objdiff 98.975845% | insns 207/207 | positional diffs 4 | regressions 0
src/keyboard/tiCellPhone | setSignWindowButton__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 1 retain the language across sign-window pane decisions | objdiff 100.000000% | insns 70/70 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | setSignWindowButton__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 2 test the Japanese language value directly | objdiff 100.000000% | insns 70/70 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | setSignWindowButton__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 3 use the stored sign-window enable state for visibility dispatch | BUILD FAILED: -----------------
# 410: bool Base::onClose() {}
# Warning: ^
# (10184) return value expected
### mwcceppc.exe Compiler:
# 1007: setVisible("W_othersBT_EU", mbSignWindowButton);
# Error: ^^^^^^^^^^^^^^^^^^
# (10140) undefined identifier 'mbSignWindowButton'
# Too many errors printed, aborting program
User break, cancelled...
ninja: build stopped: subcommand failed.
src/keyboard/tiCellPhone | doNumericMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 4 retain the correctly typed toolbar through its presence check | objdiff 96.976330% | insns 164/169 | positional diffs 133 | regressions 0
src/keyboard/tiCellPhone | setSignWindowButton__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 4 retain the language in the enabled sign-window branch | objdiff 100.000000% | insns 70/70 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | setSignWindowButton__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 5 reverse the language branch and its ordinary literal uses | objdiff 99.785710% | insns 70/70 | positional diffs 3 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | data2 inherit the command-sender vtable entries under the unit-only guard | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | data3 initialize animation-key fields directly in their ordinary table declarations | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | data4 share the actual input-mode-enabled command payload type | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | data5 define the layout destructor after the pane destructors it owns | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | data6 declare the layout after its event and pane classes under the unit-only guard | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | data7 declare event/pane/layout ownership in the target vtable emission order | objdiff 97.297295% | insns 335/333 | positional diffs 254 | regressions 0
src/keyboard/tiCellPhone | onActive__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | data8 reuse the base activation command sequence and its initializer | objdiff 100.000000% | insns 65/65 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | changeInputMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFQ59textinput8keyboard13cellphonetype4Base9InputMode | data9 reuse the base input-mode command sequence and its initializer | objdiff 100.000000% | insns 207/207 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | convertToZiCellphoneInput___Q49textinput8keyboard13cellphonetype4BaseFw | data10 derive digit labels from the target jump table: 1-9 then 0 | objdiff 100.000000% | insns 41/41 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFUlPv | data11 derive sign-window control 9 as the target switch default | objdiff 100.000000% | insns 107/107 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | onAnmEvent__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPaneFQ49textinput11nw4rmanager7AnmPane12AnmPaneEvent | data12 derive state-2/state-3 dispatch from the target jump-table relocations | objdiff 100.000000% | insns 149/149 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 4 use the same early-return control-lookup helper as layout onKey | objdiff 97.331375% | insns 680/682 | positional diffs 556 | regressions 0
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 5 reload input-mode records at target use sites and use signed mode/count comparisons | objdiff 99.523460% | insns 683/682 | positional diffs 305 | regressions 0
src/keyboard/tiCellPhone | onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 6 treat the convert-space query payload as its callee-written output | objdiff 99.670090% | insns 682/682 | positional diffs 37 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_GetSDD | 4 use the natural fixed-size descriptor index as the loop bound | objdiff 99.710144% | insns 69/69 | positional diffs 2 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_GetSDD | 5 count down the remaining descriptors in a while-loop test | objdiff 99.710144% | insns 69/69 | positional diffs 2 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_GetSDD | 6 use unsigned descriptor indices and remaining count | objdiff 99.710144% | insns 69/69 | positional diffs 2 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_GetSDD | 7 advance the free candidate after the indexed loop body | objdiff 99.681160% | insns 69/69 | positional diffs 2 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 4 separate allocated and long-name sectors and order live cache outputs as target stack slots | objdiff 99.418150% | insns 563/562 | positional diffs 552 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 5 initialize both real allocation counters from their common zero value | objdiff 99.596085% | insns 562/562 | positional diffs 39 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 6 begin the long-name-count lifetime after entry metadata initialization | objdiff 99.400350% | insns 563/562 | positional diffs 385 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 7 separate the sector countdown from the long-name entry countdown | objdiff 99.649470% | insns 562/562 | positional diffs 36 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 8 initialize the long-name counter before its sector-chain pointer | objdiff 99.596085% | insns 562/562 | positional diffs 39 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 9 initialize the long-name count from the allocated-sector initial state | objdiff 99.418150% | insns 563/562 | positional diffs 552 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 4 let placement construction supply the allocation null check once | objdiff 97.897896% | insns 333/333 | positional diffs 18 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 5 load each animation-table field through its real indexed record | objdiff 99.819820% | insns 333/333 | positional diffs 11 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 6 reuse the tested animation-key value when attaching its transform | objdiff 98.618620% | insns 333/333 | positional diffs 16 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 7 initialize the tested animation key before retaining the pane record | objdiff 99.774770% | insns 333/333 | positional diffs 14 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 8 read pane animation keys through their indexed records | objdiff 99.789790% | insns 333/333 | positional diffs 12 | regressions 0
src/keyboard/tiCellPhone | create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 9 retain the normal-pane record but index toggle-pane key reloads | objdiff 99.729730% | insns 333/333 | positional diffs 16 | regressions 0
src/keyboard/tiCellPhone | updatePredictLanguage__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFPQ39textinput15CommandReceiver17ChangePredictMode | data13 derive empty JP/USA captions and all subsequent language slots from the target pointer table | objdiff 100.000000% | insns 85/85 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | updatePredictLanguage__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFPQ39textinput15CommandReceiver17ChangePredictMode | data14 give the real empty-caption value an ordinary named character array | objdiff 100.000000% | insns 85/85 | positional diffs 0 | regressions 0
src/keyboard/tiCellPhone | updatePredictLanguage__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFPQ39textinput15CommandReceiver17ChangePredictMode | data15 give the real empty-caption value an ordinary named character array | objdiff 100.000000% | insns 85/85 | positional diffs 0 | regressions 0
libs/RVL_SDK/src/fa/pf_dir | PFDIR_p_mkdir | 10 initialize the allocated sector independently while retaining the count-first declaration order | objdiff 99.649470% | insns 562/562 | positional diffs 36 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 4 retain the typed task-entry header at the target pre-loop block | objdiff 93.544304% | insns 79/79 | positional diffs 20 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 5 derive the prevalidated slot loop as a do-while scan | objdiff 95.000000% | insns 78/79 | positional diffs 50 | regressions 0
libs/RevoEX/src/nwc24/NWC24Download | NWC24IterateDlTask | 6 spell out each nullable header selection before slot validation | objdiff 93.544304% | insns 79/79 | positional diffs 20 | regressions 0

View File

@@ -0,0 +1,564 @@
# Matching round 2
Baseline: 7a6efe8a. Final code: 6eb8458d. No unit was changed to Matching.
| Unit | Instruction-exact functions | Fuzzy % | Exact code bytes | Exact data bytes |
|---|---:|---:|---:|---:|
| libs/RVL_SDK/src/fa/pf_dir | 34 -> 34/38 | 98.878790 -> 99.262856 | 11428 -> 11428/18976 | 8 -> 40/40 |
| libs/RevoEX/src/nwc24/NWC24Download | 16 -> 17/30 | 95.993600 -> 97.146930 | 3220 -> 3640/12496 | 80 -> 80/80 |
| src/keyboard/tiCellPhone | 79 -> 83/86 | 97.737650 -> 99.774020 | 10900 -> 12824/19028 | 4 -> 3860/3860 |
pf_dir gained exact data and improved fuzzy code, but its instruction-exact count remains 34/38. All three units have 100% data. Twenty functions remain below 100%.
## Remaining functions
PFDIR_GetSDD | 99.710144% | 69/69 instructions | ordering of two induction-pointer advances (2 instruction differences)
PFDIR_p_mkdir | 99.649470% | 562/562 instructions | register allocation and order of dot-entry constants (36 differences)
PFDIR_p_rename | 97.808000% | 628/625 instructions | current-directory traversal addressing and short-name return/rollback branches; 3 extra instructions
PFDIR_p_move | 96.973060% | 636/631 instructions | ancestry checks and long-name arithmetic/control flow; 5 extra instructions
NWC24InitDlTask | 98.923615% | 144/144 instructions | register allocation only (31 differences)
NWC24SetDlInterval | 99.897960% | 147/147 instructions | final task-ID register allocation only (3 differences)
NWC24IterateDlTask | 95.000000% | 78/79 instructions | loop-entry branch and increment scheduling; 1 instruction missing
NWC24IterateDlTaskEx | 97.931040% | 145/145 instructions | comparison operands, flag-store scheduling and registers
NWC24UpdateDlTask | 94.173910% | 247/253 instructions | retry/validation branches and saved-register frame; 6 instructions missing
NWC24AddDlTask | 97.552444% | 146/143 instructions | inlined initialization and validation branches; 3 extra instructions
NWC24GetDlTask | 99.728264% | 92/92 instructions | retained destination/task-ID registers only (5 differences)
NWC24PurgeOldestDlTask | 85.829544% | 171/176 instructions | iterator initialization, menu-task skip and deletion/error blocks; 5 instructions missing
NWC24ManageDlTaskListForMenu | 94.736840% | 151/152 instructions | read/delete result blocks and register lifetimes; 1 instruction missing
NWC24ExtendDlTaskList | 99.854010% | 137/137 instructions | final reload-result register only (4 differences)
NWC24iCheckDlHeaderConsistency | 98.773580% | 212/212 instructions | three prologue moves scheduled in a different order
NWC24iCreateDlTaskList | 99.624060% | 133/133 instructions | header-pointer register allocation only (10 differences)
AddTaskInternal | 93.578550% | 397/401 instructions | URL checks and free-slot/purge/update loop; 4 instructions missing
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 99.670090% | 682/682 instructions | register allocation only (37 differences)
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 99.819820% | 333/333 instructions | register allocation only (11 differences)
init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 98.526120% | 536/536 instructions | register allocation only (155 differences)
## Attempt audit
Successful trials only; failed compiler trials are excluded. Distinct bodies were counted from the saved source for each logged trial after normalizing whitespace. The attempt log records each result.
PFDIR_GetSDD | 7 distinct successful source bodies
PFDIR_p_rename | 3 distinct successful source bodies
PFDIR_p_move | 3 distinct successful source bodies
PFDIR_p_mkdir | 10 distinct successful source bodies
NWC24SetDlInterval | 3 distinct successful source bodies
NWC24ExtendDlTaskList | 3 distinct successful source bodies
NWC24GetDlTask | 3 distinct successful source bodies
NWC24iCreateDlTaskList | 3 distinct successful source bodies
NWC24iCheckDlHeaderConsistency | 3 distinct successful source bodies
NWC24DeleteDlTask | 3 distinct successful source bodies
NWC24AddDlTask | 3 distinct successful source bodies
NWC24InitDlTask | 3 distinct successful source bodies
NWC24ManageDlTaskListForMenu | 3 distinct successful source bodies
AddTaskInternal | 3 distinct successful source bodies
NWC24UpdateDlTask | 3 distinct successful source bodies
NWC24IterateDlTaskEx | 3 distinct successful source bodies
NWC24PurgeOldestDlTask | 3 distinct successful source bodies
NWC24IterateDlTask | 6 distinct successful source bodies
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | 6 distinct successful source bodies
init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | 3 distinct successful source bodies
doNumericWithDotMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 3 distinct successful source bodies
doNumericMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 3 distinct successful source bodies
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | 10 distinct successful source bodies
changeInputMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFQ59textinput8keyboard13cellphonetype4Base9InputMode | 4 distinct successful source bodies
setSignWindowButton__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb | 3 distinct successful source bodies
## Files and commits
Changed: libs/RVL_SDK/src/fa/pf_dir.c; libs/RevoEX/src/nwc24/NWC24Download.c; src/keyboard/tiCellPhone.cpp; include/keyboard/tiCellPhone.h; include/keyboard/tiCellPhoneLayout.h; include/keyboard/tiKeyboard.h; tools/decomp-assist/sol-high-round2-attempts.md; this report.
6eb8458d complete keyboard data and refine remaining bodies
1669eba5 match keyboard vtables and command constants
18c13528 match keyboard pane literals and animation tables
c7b37722 refine download iterator control flow
9febc706 match download deletion and directory data
Header declaration ordering changes are guarded by TI_CELLPHONE_MATCH_LAYOUT, defined only in tiCellPhone.cpp. Every original conditional branch of the moved layout declaration is retained.
Command 32 writes the convert-space query result in tiInputForm.cpp:1104 before use. This is an output parameter.
Uncertainty: no known data mismatch remains. Equal instruction counts in the three keyboard bodies still leave register allocation differences; exact source forms are unresolved.
## Every gate block
### sol-high-round2-before-gate.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 3220/12496 data 80/80 functions 16/30 fuzzy 95.9936 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 16/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 95.9936
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 96.541664
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 83.96203
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTaskEx 90.68965
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 90.992096
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24DeleteDlTask 98.04762
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 84.3125
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 94.335526
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCreateDlTaskList 99.62406
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 3220/12496 data 80 functions 16 fuzzy 95.9936
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 8/40 functions 34/38 fuzzy 98.8788 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 92.85714
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 98.87879
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 96.8879
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.376
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
[src/keyboard/tiCellPhone] pool: IDENTICAL
[src/keyboard/tiCellPhone] objdiff: code 10900/19028 data 4/3860 functions 79/86 fuzzy 97.7377 linked code 0
[src/keyboard/tiCellPhone] instruction-exact functions: 79/86
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
[src/keyboard/tiCellPhone] section .data size 2416 match 56.210873
[src/keyboard/tiCellPhone] section .rodata size 1320 match 99.69697
[src/keyboard/tiCellPhone] section .sdata size 112 match None
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 55.555557
[src/keyboard/tiCellPhone] section .text size 19028 match 97.73765
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 96.8959
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 92.228226
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 96.468285
[src/keyboard/tiCellPhone] below 100: changeInputMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFQ59textinput8keyboard13cellphonetype4Base9InputMode 90.062805
[src/keyboard/tiCellPhone] below 100: doNumericMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb 93.92308
[src/keyboard/tiCellPhone] below 100: doNumericWithDotMode__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb 95.0
[src/keyboard/tiCellPhone] below 100: setSignWindowButton__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFb 87.07143
[src/keyboard/tiCellPhone] baseline: code 10900/19028 data 4 functions 79 fuzzy 97.7377
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.50505
global fuzzy_match_percent: 97.03687 -> 97.03687
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 89.93258
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-pool-gate.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 40/40 functions 34/38 fuzzy 98.8788 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 98.87879
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 96.8879
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.376
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.50505
global fuzzy_match_percent: 97.03687 -> 97.03687
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 89.93433
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-first-full.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 40/40 functions 34/38 fuzzy 98.8788 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 98.87879
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 96.8879
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.376
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 3640/12496 data 80/80 functions 17/30 fuzzy 96.1690 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 17/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 96.169014
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 83.96203
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTaskEx 90.68965
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 90.992096
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 84.3125
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 94.335526
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCreateDlTaskList 99.62406
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 3220/12496 data 80 functions 16 fuzzy 95.9936
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.51907
global fuzzy_match_percent: 97.03687 -> 97.03761
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 89.93433
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-nwc-full.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 3640/12496 data 80/80 functions 17/30 fuzzy 97.1373 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 17/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 97.13732
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 94.620255
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTaskEx 97.93104
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 94.17391
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 85.829544
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 94.73684
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCreateDlTaskList 99.62406
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 3220/12496 data 80 functions 16 fuzzy 95.9936
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.55567
global fuzzy_match_percent: 97.03687 -> 97.04997
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 90.00635
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-keyboard-full.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 40/40 functions 34/38 fuzzy 99.0601 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 99.060074
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 97.93772
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.808
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
[src/keyboard/tiCellPhone] pool: IDENTICAL
[src/keyboard/tiCellPhone] objdiff: code 12824/19028 data 1324/3860 functions 83/86 fuzzy 99.1997 linked code 0
[src/keyboard/tiCellPhone] instruction-exact functions: 83/86
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
[src/keyboard/tiCellPhone] section .data size 2416 match 56.210873
[src/keyboard/tiCellPhone] section .rodata size 1320 match 100.0
[src/keyboard/tiCellPhone] section .sdata size 112 match None
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 55.555557
[src/keyboard/tiCellPhone] section .text size 19028 match 99.19971
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 96.8959
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 97.297295
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612
[src/keyboard/tiCellPhone] baseline: code 10900/19028 data 4 functions 79 fuzzy 97.7377
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.58331
global fuzzy_match_percent: 97.03687 -> 97.05209
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 90.00635
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-resume-gate.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 40/40 functions 34/38 fuzzy 99.0601 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 99.060074
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 97.93772
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.808
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 3640/12496 data 80/80 functions 17/30 fuzzy 97.1373 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 17/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 97.13732
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 94.620255
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTaskEx 97.93104
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 94.17391
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 85.829544
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 94.73684
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCreateDlTaskList 99.62406
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 3220/12496 data 80 functions 16 fuzzy 95.9936
[src/keyboard/tiCellPhone] pool: IDENTICAL
[src/keyboard/tiCellPhone] objdiff: code 12824/19028 data 1332/3860 functions 83/86 fuzzy 99.1997 linked code 0
[src/keyboard/tiCellPhone] instruction-exact functions: 83/86
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
[src/keyboard/tiCellPhone] section .data size 2416 match 56.49574
[src/keyboard/tiCellPhone] section .rodata size 1320 match 100.0
[src/keyboard/tiCellPhone] section .sdata size 112 match None
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 100.0
[src/keyboard/tiCellPhone] section .text size 19028 match 99.19971
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 96.8959
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 97.297295
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612
[src/keyboard/tiCellPhone] baseline: code 10900/19028 data 4 functions 79 fuzzy 97.7377
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.58331
global fuzzy_match_percent: 97.03687 -> 97.05209
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 90.00679
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-data-full.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiCellPhone] pool: IDENTICAL
[src/keyboard/tiCellPhone] objdiff: code 12824/19028 data 3748/3860 functions 83/86 fuzzy 99.5974 linked code 0
[src/keyboard/tiCellPhone] instruction-exact functions: 83/86
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
[src/keyboard/tiCellPhone] section .data size 2416 match 100.0
[src/keyboard/tiCellPhone] section .rodata size 1320 match 100.0
[src/keyboard/tiCellPhone] section .sdata size 112 match None
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 100.0
[src/keyboard/tiCellPhone] section .text size 19028 match 99.597435
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 97.297295
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612
[src/keyboard/tiCellPhone] baseline: code 10900/19028 data 4 functions 79 fuzzy 97.7377
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.58331
global fuzzy_match_percent: 97.03687 -> 97.05460
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 90.13861
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-final-full.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 40/40 functions 34/38 fuzzy 99.2629 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 99.262856
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 99.64947
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.808
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 3640/12496 data 80/80 functions 17/30 fuzzy 97.1373 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 17/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 97.13732
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 94.620255
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTaskEx 97.93104
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 94.17391
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 85.829544
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 94.73684
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCreateDlTaskList 99.62406
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 3220/12496 data 80 functions 16 fuzzy 95.9936
[src/keyboard/tiCellPhone] pool: IDENTICAL
[src/keyboard/tiCellPhone] objdiff: code 12824/19028 data 3748/3860 functions 83/86 fuzzy 99.7740 linked code 0
[src/keyboard/tiCellPhone] instruction-exact functions: 83/86
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
[src/keyboard/tiCellPhone] section .data size 2416 match 100.0
[src/keyboard/tiCellPhone] section .rodata size 1320 match 100.0
[src/keyboard/tiCellPhone] section .sdata size 112 match None
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 100.0
[src/keyboard/tiCellPhone] section .text size 19028 match 99.77402
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.81982
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612
[src/keyboard/tiCellPhone] baseline: code 10900/19028 data 4 functions 79 fuzzy 97.7377
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.58331
global fuzzy_match_percent: 97.03687 -> 97.05702
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 90.13861
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-final-data-full.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 40/40 functions 34/38 fuzzy 99.2629 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 99.262856
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 99.64947
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.808
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 3640/12496 data 80/80 functions 17/30 fuzzy 97.1373 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 17/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 97.13732
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 94.620255
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTaskEx 97.93104
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 94.17391
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 85.829544
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 94.73684
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCreateDlTaskList 99.62406
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 3220/12496 data 80 functions 16 fuzzy 95.9936
[src/keyboard/tiCellPhone] pool: IDENTICAL
[src/keyboard/tiCellPhone] objdiff: code 12824/19028 data 3860/3860 functions 83/86 fuzzy 99.7740 linked code 0
[src/keyboard/tiCellPhone] instruction-exact functions: 83/86
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
[src/keyboard/tiCellPhone] section .data size 2416 match 100.0
[src/keyboard/tiCellPhone] section .rodata size 1320 match 100.0
[src/keyboard/tiCellPhone] section .sdata size 112 match 100.0
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 100.0
[src/keyboard/tiCellPhone] section .text size 19028 match 99.77402
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.81982
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612
[src/keyboard/tiCellPhone] baseline: code 10900/19028 data 4 functions 79 fuzzy 97.7377
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.58331
global fuzzy_match_percent: 97.03687 -> 97.05702
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 90.14473
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
### sol-high-round2-final-gate.txt
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 11428/18976 data 40/40 functions 34/38 fuzzy 99.2629 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 34/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 99.262856
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_GetSDD 99.710144
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_mkdir 99.64947
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_rename 97.808
[libs/RVL_SDK/src/fa/pf_dir] below 100: PFDIR_p_move 96.97306
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11428/18976 data 8 functions 34 fuzzy 98.8788
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 3640/12496 data 80/80 functions 17/30 fuzzy 97.1469 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 17/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 97.14693
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24SetDlInterval 99.89796
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 95.0
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTaskEx 97.93104
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 94.17391
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24AddDlTask 97.552444
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24GetDlTask 99.728264
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24PurgeOldestDlTask 85.829544
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ManageDlTaskListForMenu 94.73684
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24ExtendDlTaskList 99.85401
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCreateDlTaskList 99.62406
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 93.57855
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 3220/12496 data 80 functions 16 fuzzy 95.9936
[src/keyboard/tiCellPhone] pool: IDENTICAL
[src/keyboard/tiCellPhone] objdiff: code 12824/19028 data 3860/3860 functions 83/86 fuzzy 99.7740 linked code 0
[src/keyboard/tiCellPhone] instruction-exact functions: 83/86
[src/keyboard/tiCellPhone] section .ctors size 4 match 100.0
[src/keyboard/tiCellPhone] section .data size 2416 match 100.0
[src/keyboard/tiCellPhone] section .rodata size 1320 match 100.0
[src/keyboard/tiCellPhone] section .sdata size 112 match 100.0
[src/keyboard/tiCellPhone] section .sdata2 size 8 match 100.0
[src/keyboard/tiCellPhone] section .text size 19028 match 99.77402
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.81982
[src/keyboard/tiCellPhone] below 100: init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv 98.52612
[src/keyboard/tiCellPhone] baseline: code 10900/19028 data 4 functions 79 fuzzy 97.7377
regressions vs baseline: 0
global matched_code_percent: 83.50505 -> 83.58331
global fuzzy_match_percent: 97.03687 -> 97.05706
global complete_code_percent: 58.20100 -> 58.20100
global matched_data_percent: 89.93258 -> 90.14473
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```