Compare commits
2 Commits
agent/rea/
...
rest1-clea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51c3696999 | ||
|
|
e361282c9e |
20
.github/workflows/readme-progress.yml
vendored
20
.github/workflows/readme-progress.yml
vendored
@@ -2,8 +2,8 @@ name: README progress
|
||||
|
||||
# runs on the self-hosted runner on cole's server so it doesn't use hosted minutes.
|
||||
# only push/schedule/manual triggers, never pull_request, so fork PRs can't reach this machine.
|
||||
# it never commits to main: it rebuilds, publishes the numbers to the job summary, and force-pushes
|
||||
# the README badge JSON as a single commit on the orphan progress-data branch.
|
||||
# README progress is written inside each landing commit by the orchestrator, so this job never commits;
|
||||
# it only rebuilds and publishes the current numbers to the job summary.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
@@ -17,7 +17,7 @@ concurrency:
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
progress:
|
||||
@@ -55,17 +55,3 @@ jobs:
|
||||
python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
|
||||
sed -n '/progress:start/,/progress:end/p' README.md >> "$GITHUB_STEP_SUMMARY"
|
||||
git checkout -- README.md
|
||||
|
||||
- name: Publish badges
|
||||
if: github.ref == 'refs/heads/main'
|
||||
run: |
|
||||
out="$RUNNER_TEMP/progress-data"
|
||||
rm -rf "$out"
|
||||
python3 tools/progress_badges.py build/43U/report.json "$out"
|
||||
cd "$out"
|
||||
git init -q -b progress-data
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add .
|
||||
git commit -q -m "progress for $GITHUB_SHA"
|
||||
git push -q -f "https://x-access-token:${{ github.token }}@github.com/$GITHUB_REPOSITORY.git" HEAD:refs/heads/progress-data
|
||||
|
||||
37
README.md
37
README.md
@@ -7,23 +7,23 @@
|
||||
|
||||
<!--- Github Actions Badge -->
|
||||
|
||||
[Build Status]: https://github.com/coah80/wii-ipl/actions/workflows/readme-progress.yml/badge.svg?branch=main
|
||||
[actions]: https://github.com/coah80/wii-ipl/actions/workflows/readme-progress.yml
|
||||
[Build Status]: https://github.com/coah80/wii-ipl/actions/workflows/build.yml/badge.svg
|
||||
[actions]: https://github.com/coah80/wii-ipl/actions/workflows/build.yml
|
||||
|
||||
<!--- Discord Badge -->
|
||||
|
||||
[Discord Badge]: https://img.shields.io/discord/727908905392275526?color=%237289DA&logo=discord&logoColor=%23FFFFFF
|
||||
[discord]: https://discord.gg/hKx3FJJgrV
|
||||
|
||||
<!-- Progress badges: JSON on the progress-data branch, refreshed by the README progress workflow on every push to main -->
|
||||
<!-- Progress links -->
|
||||
|
||||
[progress]: https://github.com/coah80/wii-ipl/actions/workflows/readme-progress.yml
|
||||
[DecompiledBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Fdecompiled.json
|
||||
[MatchedBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Fmatched.json
|
||||
[LinkedBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Flinked.json
|
||||
[DataBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Fdata.json
|
||||
[FunctionsBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Ffunctions.json
|
||||
[UnitsBadge]: https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcoah80%2Fwii-ipl%2Fprogress-data%2Funits.json
|
||||
[V43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U
|
||||
|
||||
<!--- Version 4.3U progress Badge -->
|
||||
|
||||
[DecompBadgeV43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U.svg?&measure=code&label=Decompiled&mode=shield&labelColor=%237c7c7c&color=%2333b8ff&style=plastic
|
||||
[LinkBadgeV43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U.svg?&measure=complete_code&label=Linked&mode=shield&labelColor=%237c7c7c&color=%2333b8ff&style=plastic
|
||||
[FuncBadgeV43U]: https://decomp.dev/koopthekoopa/wii-ipl/43U.svg?&measure=functions&label=Functions&mode=shield&labelColor=%237c7c7c&color=%2333b8ff&style=plastic
|
||||
|
||||
<!--- Header -->
|
||||
|
||||
@@ -43,17 +43,28 @@ Live decomp status
|
||||
|
||||
[![Build status]][actions]
|
||||
|
||||
Every push to `main` rebuilds 4.3U, checks the DOL hash, and refreshes the progress badges below. Open the latest [README progress run][actions] for the full objdiff summary.
|
||||
Open the latest successful [Build workflow run][actions] and check its summary for the current objdiff metrics. It includes perfect-match/decompiled, fuzzy-match, fully linked, data, function, unit, and category breakdowns. The run also publishes the 43U report artifact and generated decomp-status report.
|
||||
|
||||
Supported versions:
|
||||
- `43U` - Version **4.3U** (USA)
|
||||
|
||||
Progress
|
||||
========
|
||||
[![DecompiledBadge]][progress] [![MatchedBadge]][progress] [![LinkedBadge]][progress] [![DataBadge]][progress]
|
||||
[![FunctionsBadge]][progress] [![UnitsBadge]][progress]
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.59% | 91.16% | 74.57% | 99.56% |
|
||||
|
||||
units 964/1027 complete, functions 12378/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 -->
|
||||
|
||||
| Version | Progress |
|
||||
|-----------------------|------------------------------------------------------------------------------|
|
||||
| [Wii Menu 4.3U][V43U] | [![FuncBadgeV43U]][V43U] [![DecompBadgeV43U]][V43U] [![LinkBadgeV43U]][V43U] |
|
||||
|
||||
> You can see the full progress and its history by clicking on one of the versions in the table.
|
||||
|
||||
Dependencies
|
||||
============
|
||||
|
||||
@@ -37,9 +37,6 @@ force_active:
|
||||
|
||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||
block_relocations:
|
||||
# Run establishes a fixed stack at 0x81600000, not __pformatter + 0x280.
|
||||
- source: .text:0x8137B468
|
||||
- source: .text:0x8137B46C
|
||||
- source: .data:0x8165E15C
|
||||
- source: .data:0x8165E19C
|
||||
|
||||
|
||||
@@ -95,15 +95,11 @@ AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
|
||||
AOSS_810BE5B8 = .bss:0x810BE5B8; // type:object size:0x280
|
||||
AOSS_810BE838 = .bss:0x810BE838; // type:object size:0x68
|
||||
AOSS_810BE8A0 = .bss:0x810BE8A0; // type:object size:0x400
|
||||
gAtermIpConfig = .bss:0x810BECA0; // type:object size:0x7C4 data:4byte
|
||||
gAtermIfConfig = .bss:0x810BF464; // type:object size:0x15E
|
||||
ATERM_810BECA0 = .bss:0x810BECA0; // type:object size:0x924 data:4byte
|
||||
ATERM_810BF5C4 = .bss:0x810BF5C4; // type:object size:0x24
|
||||
ATERM_810BF5E8 = .bss:0x810BF5E8; // type:object size:0x258
|
||||
gAtermConfigurationResult = .bss:0x810BF840; // type:object size:0xE8
|
||||
gAtermAssociationRequest = .bss:0x810BF928; // type:object size:0x10
|
||||
gAtermPacketBuffer = .bss:0x810BF938; // type:object size:0x800
|
||||
gAtermDecodedResponse = .bss:0x810C0138; // type:object size:0x800 data:2byte
|
||||
gAtermSession = .bss:0x810C0938; // type:object size:0x20
|
||||
ATERM_810BF840 = .bss:0x810BF840; // type:object size:0x900
|
||||
ATERM_810C0140 = .bss:0x810C0140; // type:object size:0x818 data:2byte
|
||||
AtermThread = .bss:0x810C0958; // type:object size:0x318 scope:local align:32
|
||||
Voices = .bss:0x810C0C80; // type:object size:0x1800 data:4byte
|
||||
sZeroMem = .bss:0x810C2480; // type:object size:0x100 data:byte
|
||||
@@ -118,9 +114,7 @@ ziStringColorRightDestructorRecord = .bss:0x810C65CC; // type:object size:0xC da
|
||||
underlateColorDestructorRecord = .bss:0x810C65D8; // type:object size:0xC data:4byte
|
||||
unInputedWCharColorSpaceDestructorRecord = .bss:0x810C65E4; // type:object size:0xC data:4byte
|
||||
ElementBuffer__Q39textinput8tistring6WithZi = .bss:0x810C65F0; // type:object size:0x200 data:2byte
|
||||
CandidatesBuffer__Q39textinput8tistring6WithZi = .bss:0x810C67F0; // type:object size:0x200 data:2byte
|
||||
ElementWorkBuffer__Q39textinput8tistring6WithZi = .bss:0x810C69F0; // type:object size:0x200 data:2byte
|
||||
PredictionBuffer__Q39textinput8tistring6WithZi = .bss:0x810C6BF0; // type:object size:0x200 data:2byte
|
||||
CandidatesBuffer__Q39textinput8tistring6WithZi = .bss:0x810C67F0; // type:object size:0x600 data:2byte
|
||||
CandidatedWord__Q39textinput8tistring6WithZi = .bss:0x810C6DF0; // type:object size:0x1400 data:2byte
|
||||
LatestWord__Q39textinput8tistring6WithZi = .bss:0x810C81F0; // type:object size:0x80 data:2byte
|
||||
snWidthTable__Q29textinput10textdrawer = .bss:0x810C8270; // type:object size:0x580 data:4byte
|
||||
|
||||
20
configure.py
20
configure.py
@@ -648,7 +648,7 @@ config.libs = [
|
||||
Object(Matching, "system/iplDialogWindow.cpp"),
|
||||
Object(Matching, "system/iplHomeButtonMenu.cpp"),
|
||||
Object(Matching, "system/iplNandSDWorker.cpp"),
|
||||
Object(Matching, "system/iplKeyboard.cpp"),
|
||||
Object(Equivalent, "system/iplKeyboard.cpp"),
|
||||
Object(Matching, "system/iplErrorHandler.cpp"),
|
||||
Object(Matching, "system/iplResetHandler.cpp"),
|
||||
Object(Matching, "system/iplWarningHandler.cpp"),
|
||||
@@ -879,7 +879,7 @@ config.libs = [
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline on"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
]
|
||||
),
|
||||
IPLSection("settingSelect", [
|
||||
@@ -908,7 +908,7 @@ config.libs = [
|
||||
),
|
||||
# it decides to do fast optimization for this one
|
||||
IPLSection("keyboard", [
|
||||
Object(Matching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiPcKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiCandidateBox.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -982,7 +982,7 @@ config.libs = [
|
||||
),
|
||||
ZI8Lib("zi8clib", [
|
||||
Object(Matching, "clib/zaddress.c"),
|
||||
Object(Matching, "clib/zconvert.c"),
|
||||
Object(NonMatching, "clib/zconvert.c"),
|
||||
Object(NonMatching, "clib/zi81key.c"),
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi8alts.c"),
|
||||
@@ -997,7 +997,7 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8is.c"),
|
||||
Object(NonMatching, "clib/zi8match.c"),
|
||||
Object(Matching, "clib/zi8misc.c"),
|
||||
Object(Matching, "clib/zi8pud2.c"),
|
||||
Object(NonMatching, "clib/zi8pud2.c"),
|
||||
Object(Matching, "clib/Zi8punct.c"),
|
||||
Object(Matching, "clib/zi8space.c"),
|
||||
Object(NonMatching, "clib/zi8uwd.c"),
|
||||
@@ -1081,9 +1081,9 @@ config.libs = [
|
||||
Object(Matching, "nwc24/NWC24Parser.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgCommit.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgRead.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgSubject.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
||||
Object(Matching, "nwc24/NWC24Schedule.c"),
|
||||
Object(Matching, "nwc24/NWC24DateParser.c"),
|
||||
Object(NonMatching, "nwc24/NWC24DateParser.c"),
|
||||
Object(Matching, "nwc24/NWC24FriendList.c"),
|
||||
Object(Matching, "nwc24/NWC24SecretFList.c"),
|
||||
Object(Matching, "nwc24/NWC24UserId.c"),
|
||||
@@ -1691,7 +1691,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pdm_bpb.c"),
|
||||
Object(Matching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_partition.c"),
|
||||
Object(Matching, "fa/pf_cache.c"),
|
||||
Object(NonMatching, "fa/pf_cache.c"),
|
||||
Object(Matching, "fa/pf_cluster.c"),
|
||||
Object(Matching, "fa/pf_dir.c"),
|
||||
Object(Matching, "fa/pf_entry.c"),
|
||||
@@ -1826,7 +1826,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pfs_unmount.c"),
|
||||
Object(Matching, "fa/pf_stub_unicode.c"),
|
||||
|
||||
Object(Matching, "fa/api/FAAttach.c"),
|
||||
Object(NonMatching, "fa/api/FAAttach.c"),
|
||||
Object(Matching, "fa/api/FABuffering.c"),
|
||||
Object(Matching, "fa/api/FACreate.c"),
|
||||
Object(Matching, "fa/api/FACreatedir.c"),
|
||||
@@ -1908,7 +1908,7 @@ config.libs = [
|
||||
[
|
||||
Object(Matching, "core/eggAllocator.cpp"),
|
||||
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioExpMgr.cpp"),
|
||||
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioFxMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioHeapMgr.cpp"),
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct BS2UpdateHeader {
|
||||
|
||||
typedef struct BS2UpdateEntry {
|
||||
// Update Meta Data
|
||||
vu32 type; // 0x00
|
||||
u32 type; // 0x00
|
||||
u32 attr; // 0x04
|
||||
u32 size; // 0x08
|
||||
u32 depend; // 0x0C
|
||||
|
||||
@@ -142,6 +142,9 @@ namespace textinput {
|
||||
|
||||
// TODO enum?
|
||||
int getInputType() const;
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void resetHoldingButton();
|
||||
#endif
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_IMPLEMENTATION)
|
||||
|
||||
@@ -69,9 +69,6 @@
|
||||
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
|
||||
#if defined(TI_CELLPHONE_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void resetHoldingButton();
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
@@ -98,6 +95,7 @@
|
||||
virtual void changeSpaceKeyTop(const PaneNameToCharCode* keys);
|
||||
void setUpperCaseJP(bool enabled);
|
||||
void setLangKeyActive(bool enabled);
|
||||
void resetHoldingButton();
|
||||
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
|
||||
@@ -74,16 +74,8 @@ namespace textinput {
|
||||
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, void* data) {} // 0x0C
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo);
|
||||
#else
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo) { muLatestEventCtrlNo = ctrlNo; } // 0x10
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual int getLatestEventCtrlNo();
|
||||
#else
|
||||
virtual int getLatestEventCtrlNo() { return muLatestEventCtrlNo; } // 0x14
|
||||
#endif
|
||||
|
||||
protected:
|
||||
int muLatestEventCtrlNo; // 0x04
|
||||
@@ -117,11 +109,7 @@ namespace textinput {
|
||||
: GUIInterface(), mbInitialize(false), mDraggingButton(0xFFFF), mID(id), mbTriggerTarget(false), mpManager(NULL), mpListener(NULL) {
|
||||
init();
|
||||
}
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual ~GUIComponent();
|
||||
#else
|
||||
virtual ~GUIComponent() {} // 0x08
|
||||
#endif
|
||||
|
||||
virtual u32 getID() { return mID; } // 0x20
|
||||
|
||||
@@ -158,11 +146,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
virtual bool isTriggerTarget() { return mbTriggerTarget; } // 0x48
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setTriggerTarget(bool bEnable);
|
||||
#else
|
||||
virtual void setTriggerTarget(bool bEnable) { mbTriggerTarget = bEnable; } // 0x4C
|
||||
#endif
|
||||
|
||||
void setParentManager(GUIManager* manager) { mpManager = manager; }
|
||||
GUIManager* getParentManager() { return mpManager; }
|
||||
|
||||
@@ -47,11 +47,7 @@ namespace textinput {
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void update();
|
||||
#else
|
||||
virtual void update() {}
|
||||
#endif
|
||||
#else
|
||||
virtual Language getLanguage() const;
|
||||
virtual void update();
|
||||
|
||||
@@ -64,11 +64,7 @@ namespace textinput {
|
||||
virtual void setWCString(const wchar_t* string);
|
||||
|
||||
virtual void setLanguage(Language language);
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual Language getLanguage() const;
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
Language getLanguageForMemo() const { return meLanguage; }
|
||||
#endif
|
||||
@@ -133,18 +129,10 @@ namespace textinput {
|
||||
virtual const InputForm* getInputForm() const { return mpInputForm; }
|
||||
|
||||
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard() { return mpHWKeyboard; }
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const;
|
||||
#else
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const { return mpHWKeyboard; }
|
||||
#endif
|
||||
|
||||
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard() { return mpPCKeyboard; }
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const;
|
||||
#else
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const { return mpPCKeyboard; }
|
||||
#endif
|
||||
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
@@ -161,11 +149,7 @@ namespace textinput {
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const;
|
||||
#else
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
#endif
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
|
||||
@@ -36,11 +36,7 @@ namespace textinput {
|
||||
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) = 0; // 0x18
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setEventObserver(EventObserver *event);
|
||||
#else
|
||||
virtual void setEventObserver(EventObserver *event) { mpEventObserver = event; } // 0x1C
|
||||
#endif
|
||||
|
||||
protected:
|
||||
EventObserver* mpEventObserver; // 0x08
|
||||
@@ -101,19 +97,25 @@ namespace textinput {
|
||||
virtual void calc(); // 0x0C
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void onAnmEvent(AnmPaneEvent);
|
||||
virtual void onAnmEvent(AnmPaneEvent) {}
|
||||
#else
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent);
|
||||
#endif // 0x10
|
||||
|
||||
virtual void changeAnimation(u32 id); // 0x14
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isInAnimation();
|
||||
virtual bool isInAnimation() { return mpCurrentAnim != NULL; }
|
||||
#else
|
||||
virtual bool isInAnimation();
|
||||
#endif // 0x18
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual Anim* searchAnimation(u32 id);
|
||||
virtual Anim* searchAnimation(u32 id) {
|
||||
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
|
||||
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
|
||||
if (animation->muID == id) return animation;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
virtual Anim* searchAnimation(u32 id);
|
||||
#endif // 0x1C
|
||||
@@ -245,22 +247,14 @@ namespace textinput {
|
||||
virtual bool updateInput(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x20
|
||||
virtual bool updateInput(input::HKBManager& hkbManager); // 0x24
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual TiLayout* getLayout();
|
||||
#else
|
||||
virtual TiLayout* getLayout() { return mpLayout; } // 0x28
|
||||
#endif
|
||||
|
||||
virtual nw4r::lyt::Pane* getPane(const char* paneName); // 0x2C
|
||||
virtual const nw4r::lyt::Pane* getPane(const char* paneName) const; // 0x30
|
||||
|
||||
virtual u32 getFlightDuration(int point, const char* paneName); // 0x34
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setAnimOn(bool flag);
|
||||
#else
|
||||
virtual void setAnimOn(bool flag) { mbAnimOn = flag; } // 0x38
|
||||
#endif
|
||||
|
||||
virtual void drawPane(const char* paneName); // 0x3C
|
||||
|
||||
@@ -288,16 +282,8 @@ namespace textinput {
|
||||
virtual AnmPane* searchAnmPane(const char* paneName); // 0x60
|
||||
virtual AnmPane* searchAnmPane(wchar_t ch); // 0x64
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual nw4r::ut::List& getAnmPaneList();
|
||||
#else
|
||||
virtual nw4r::ut::List& getAnmPaneList() { return mAnmPanes; } // 0x68
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual gui::PaneManager* getPaneManager();
|
||||
#else
|
||||
virtual gui::PaneManager* getPaneManager() { return mpPaneManager; } // 0x6C
|
||||
#endif
|
||||
|
||||
virtual void AdjustPaneMtx(Mtx& mtx, const nw4r::lyt::DrawInfo& drawInfo, const nw4r::math::MTX34& mGlobalMtx); // 0x70
|
||||
|
||||
|
||||
@@ -191,11 +191,7 @@ namespace textinput {
|
||||
#endif
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void init();
|
||||
#else
|
||||
virtual inline void init();
|
||||
#endif
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual int getType();
|
||||
@@ -227,9 +223,6 @@ namespace textinput {
|
||||
virtual void updateFixMode();
|
||||
|
||||
protected:
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
inline void initializeKeyState();
|
||||
#endif
|
||||
State mState;
|
||||
const LanguageData* mpInitialLanguageData;
|
||||
KeyState mKeyState;
|
||||
@@ -308,8 +301,6 @@ namespace textinput {
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mpKeyboardEventHandler(NULL),
|
||||
mShiftButton(1, this, this), mCapsButton(0, this, this), mModePanel(2, this, this) {}
|
||||
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName);
|
||||
#endif
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
@@ -361,15 +352,6 @@ namespace textinput {
|
||||
UIModePanel mModePanel;
|
||||
};
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: LayoutByNW4R(manager, accessor, observer, layoutName) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#endif
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer), mAnimation(0) {}
|
||||
|
||||
@@ -14,17 +14,9 @@ namespace textinput {
|
||||
Base(Manager* manager) : mQwerty(true), meLanguage(USA), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
#else
|
||||
virtual void create(MEMAllocator* allocator) { mpAllocator = allocator; }
|
||||
#endif
|
||||
virtual void init() {}
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isQwerty() const;
|
||||
#else
|
||||
virtual bool isQwerty() const { return mQwerty; }
|
||||
#endif
|
||||
virtual void setQwerty(bool qwerty);
|
||||
virtual void setLanguage(Language language) { meLanguage = language; }
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
|
||||
@@ -39,9 +39,7 @@ public:
|
||||
};
|
||||
|
||||
static u16 ElementBuffer[0x100];
|
||||
static u16 CandidatesBuffer[0x100];
|
||||
static u16 ElementWorkBuffer[0x100];
|
||||
static u16 PredictionBuffer[0x100];
|
||||
static u16 CandidatesBuffer[0x300];
|
||||
static u16 CandidatedWord[0xa00];
|
||||
static u16 LatestWord[0x40];
|
||||
|
||||
|
||||
@@ -163,9 +163,6 @@ namespace ipl {
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
f32 get() const;
|
||||
#else
|
||||
f32 get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
@@ -184,7 +181,6 @@ namespace ipl {
|
||||
|
||||
return r;
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 mStart;
|
||||
|
||||
@@ -103,7 +103,7 @@ namespace ipl {
|
||||
y = r.y;
|
||||
z = 0.0f;
|
||||
}
|
||||
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(IPL_SD_CHANNEL_SELECT_CPP) || defined(IPL_GC_WINDOW_CPP) || defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(IPL_SD_CHANNEL_SELECT_CPP) || defined(IPL_GC_WINDOW_CPP)
|
||||
VEC3(f32 fx, f32 fy, f32 fz);
|
||||
#else
|
||||
VEC3(f32 fx, f32 fy, f32 fz) {
|
||||
|
||||
@@ -141,9 +141,6 @@ namespace ipl {
|
||||
void init(nw4r::lyt::Pane* pane);
|
||||
void set(u64 fdId);
|
||||
void reset();
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
nigaoe::Object* getPortrait() const { return mpNigaoe; }
|
||||
#endif
|
||||
|
||||
static void create_callback(nigaoe::Object* object, void* work);
|
||||
|
||||
|
||||
@@ -31,12 +31,8 @@ namespace ipl {
|
||||
|
||||
virtual void calc();
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual void initCalcNormal();
|
||||
#else
|
||||
virtual void initCalcNormal() {
|
||||
} // 0x4C
|
||||
#endif
|
||||
virtual void initCalcFadeout() {
|
||||
} // 0x50
|
||||
|
||||
@@ -53,12 +49,8 @@ namespace ipl {
|
||||
return FADER_SCN_NEXT;
|
||||
} // 0x60
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual void calcCommonAfter();
|
||||
#else
|
||||
virtual void calcCommonAfter() {
|
||||
} // 0x64
|
||||
#endif
|
||||
|
||||
int getSceneFadeState() {
|
||||
return mScnFadeState;
|
||||
|
||||
@@ -62,11 +62,7 @@ namespace ipl {
|
||||
virtual ~Base();
|
||||
|
||||
/** @brief If the scene is ready */
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual BOOL isReady() const;
|
||||
#else
|
||||
virtual BOOL isReady() const { return FALSE; }
|
||||
#endif
|
||||
|
||||
/** @brief If the user can power off/reset the system */
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
@@ -77,11 +73,7 @@ namespace ipl {
|
||||
/** @brief The scene running code when powering off/resetting the system */
|
||||
virtual void startResetting() {}
|
||||
/** @brief If the scene has finished its powering off/resetting task */
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual BOOL isResetProcessDone();
|
||||
#else
|
||||
virtual BOOL isResetProcessDone() { return TRUE; }
|
||||
#endif
|
||||
|
||||
/** @brief Prepare to create scene */
|
||||
virtual void prepare() {}
|
||||
@@ -94,17 +86,10 @@ namespace ipl {
|
||||
/** @brief Destroy the scene and clear from memory */
|
||||
virtual void destroy() {}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual Base* getParent();
|
||||
virtual Base* getChild();
|
||||
virtual Base* getNext();
|
||||
virtual Base* getPrev();
|
||||
#else
|
||||
virtual Base* getParent() { return (Base*)mpParent; }
|
||||
virtual Base* getChild() { return (Base*)mpChild; }
|
||||
virtual Base* getNext() { return (Base*)mpNext; }
|
||||
virtual Base* getPrev() { return (Base*)mpPrev; }
|
||||
#endif
|
||||
|
||||
/** @brief Check if scene has been created.*/
|
||||
bool isSceneCreated() const { return (mScnState & SCN_STATE_CREATED); }
|
||||
|
||||
@@ -65,13 +65,8 @@ namespace ipl {
|
||||
/** @brief Writes the file contents. */
|
||||
virtual void write(); // 0x10
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual bool isFinished();
|
||||
virtual int checkData();
|
||||
#else
|
||||
virtual bool isFinished() { return mbDoneTask; } // 0x14
|
||||
virtual int checkData() { return mResult; } // 0x18
|
||||
#endif
|
||||
virtual bool isFatalError(); // 0x1C
|
||||
|
||||
u8* getBuffer() const { return mpBuffer; }
|
||||
|
||||
@@ -51,17 +51,12 @@ namespace ipl {
|
||||
mArg.mOrthoScale = scale;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
static void setOrthoTrans(const math::VEC3& translate);
|
||||
static void setOrthoScale(const math::VEC2& scale);
|
||||
#else
|
||||
static void setOrthoTrans(const math::VEC3& translate) { mArg.mOrthoTrans = translate; }
|
||||
|
||||
static void setOrthoScale(const math::VEC2& scale) NO_INLINE {
|
||||
mArg.mOrthoScale.x = scale.x;
|
||||
mArg.mOrthoScale.y = scale.y;
|
||||
}
|
||||
#endif
|
||||
|
||||
private:
|
||||
static Arg mArg;
|
||||
|
||||
@@ -21,12 +21,6 @@ namespace EGG {
|
||||
|
||||
virtual void initialize(IAudioMgr::Arg* arg);
|
||||
};
|
||||
|
||||
class ExpAudioMgr : public SimpleAudioMgr, public AudioFxMgr {
|
||||
public:
|
||||
ExpAudioMgr();
|
||||
virtual ~ExpAudioMgr();
|
||||
};
|
||||
} // namespace EGG
|
||||
|
||||
#endif // EGG_AUDIO_EXP_MGR_H
|
||||
|
||||
@@ -29,10 +29,4 @@ namespace EGG {
|
||||
|
||||
mHeap.SaveState();
|
||||
}
|
||||
|
||||
ExpAudioMgr::ExpAudioMgr() {
|
||||
}
|
||||
|
||||
ExpAudioMgr::~ExpAudioMgr() {
|
||||
}
|
||||
} // namespace EGG
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace nw4r {
|
||||
namespace ut {
|
||||
class Rect {
|
||||
public:
|
||||
#if defined(IPL_SOUND_RECT_OUT_OF_LINE) || defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
#ifdef IPL_SOUND_RECT_OUT_OF_LINE
|
||||
Rect();
|
||||
#else
|
||||
Rect() : left(), top(), right(), bottom() {}
|
||||
@@ -20,7 +20,7 @@ namespace nw4r {
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
#endif
|
||||
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP) && !defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP) || defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -28,36 +28,36 @@ static s32 scalingClampU8(s32 value) {
|
||||
void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
|
||||
s32 tmp[64];
|
||||
s32* dst;
|
||||
s32 d;
|
||||
s32 t;
|
||||
s32 done;
|
||||
s32 iter;
|
||||
s32 i;
|
||||
s32 y;
|
||||
s32 e;
|
||||
s32 b2;
|
||||
s32 b1;
|
||||
s32 b3;
|
||||
s32 b4;
|
||||
s32 b5;
|
||||
s32 b6;
|
||||
s32 b7;
|
||||
s32 n;
|
||||
s32 v;
|
||||
s32 m;
|
||||
s32 a;
|
||||
s32 done;
|
||||
s32 d;
|
||||
s32 z;
|
||||
s32 v;
|
||||
s32 o;
|
||||
s32 p;
|
||||
s32 p_part;
|
||||
s32 m_part;
|
||||
s32 t;
|
||||
s32 u;
|
||||
s32 r;
|
||||
s32 o;
|
||||
s32 x;
|
||||
s32 n;
|
||||
s32 y;
|
||||
s32 x_factor;
|
||||
s32 z_factor;
|
||||
s32 iter;
|
||||
s32 m_part;
|
||||
s32 q;
|
||||
s32 w;
|
||||
s32 e;
|
||||
s32 b3;
|
||||
s32 x;
|
||||
s32 b1;
|
||||
|
||||
r = (zigzag >> 4) * 8;
|
||||
dst = tmp;
|
||||
@@ -93,19 +93,17 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
} else {
|
||||
s32 oddLowSum;
|
||||
s32 oddHighSum;
|
||||
s32 oddLowDifference;
|
||||
s32 oddHighDifference;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
oddLowDifference = b5 - b3;
|
||||
b5 = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
oddHighDifference = b1 - b7;
|
||||
b1 = b1 - b7;
|
||||
u = b6 + b2;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = oddLowDifference + oddHighDifference;
|
||||
z_factor = b5 + b1;
|
||||
dcValue = block[0];
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
@@ -115,14 +113,14 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
z = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = oddHighDifference * 0x14E >> 8;
|
||||
m_part = b1 * 0x14E >> 8;
|
||||
e = a - t;
|
||||
m = m_part - z;
|
||||
oddLowSum += m;
|
||||
n = oddHighSum + oddLowSum;
|
||||
o = x + m;
|
||||
dst[0] = w + n;
|
||||
p_part = oddLowDifference * 0x8B;
|
||||
p_part = b5 * 0x8B;
|
||||
dst[7] = w - n;
|
||||
p_part >>= 8;
|
||||
dst[1] = v + o;
|
||||
@@ -227,7 +225,7 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
|
||||
s32 tmp[64];
|
||||
s32* dst;
|
||||
s32 a;
|
||||
s32 done;
|
||||
s32 iter;
|
||||
s32 d;
|
||||
s32 b1;
|
||||
@@ -239,14 +237,14 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
s32 b7;
|
||||
s32 v;
|
||||
s32 r;
|
||||
s32 done;
|
||||
s32 a;
|
||||
s32 i;
|
||||
s32 m;
|
||||
s32 n;
|
||||
s32 o;
|
||||
s32 x;
|
||||
s32 q;
|
||||
s32 e;
|
||||
s32 y;
|
||||
s32 u;
|
||||
s32 w;
|
||||
s32 p;
|
||||
@@ -256,7 +254,7 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
s32 z_factor;
|
||||
s32 m_part;
|
||||
s32 p_part;
|
||||
s32 y;
|
||||
s32 e;
|
||||
|
||||
if (zigzag == 0x11) {
|
||||
s32 val;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData* pInfo);
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, u8* entry);
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry);
|
||||
static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry);
|
||||
static s32 TMCJPEGDEC_ThumbnailCheck(TMCCJPEGDecInitParam* param, TMCCJPEGDecExifInfo* info, u32 totalSize);
|
||||
|
||||
@@ -280,7 +280,7 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
for (index = 0; index < count; index++) {
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, (u8*)entries);
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, entries);
|
||||
entries += 12;
|
||||
}
|
||||
remaining -= entriesSize;
|
||||
@@ -331,19 +331,19 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
for (index = 0; index < count; index++) {
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, (u8*)entries);
|
||||
TMCJPEGDEC_IFD0_tag_parse(pInfo, byteOrder, entries);
|
||||
entries += 12;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, u8* entry) {
|
||||
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
|
||||
s32 tag;
|
||||
u32 type;
|
||||
u16 type;
|
||||
|
||||
tag = readExifU16(entry, byteOrder);
|
||||
type = readExifU16(entry + 2, byteOrder);
|
||||
tag = readU16(entry, byteOrder);
|
||||
type = readU16(entry + 2, byteOrder);
|
||||
|
||||
switch (tag) {
|
||||
case 0x0103:
|
||||
@@ -366,7 +366,7 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
return;
|
||||
}
|
||||
pInfo->xResNum = readU32(p, byteOrder);
|
||||
p = pInfo->thumbnailData + (offset + 4);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
@@ -386,7 +386,7 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
return;
|
||||
}
|
||||
pInfo->yResNum = readU32(p, byteOrder);
|
||||
p = pInfo->thumbnailData + (offset + 4);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
@@ -501,10 +501,6 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x8769:
|
||||
case 0x9000:
|
||||
case 0x9101:
|
||||
case 0x011C:
|
||||
case 0xA000:
|
||||
case 0xA001:
|
||||
case 0xA002:
|
||||
case 0xA003: {
|
||||
break;
|
||||
}
|
||||
@@ -520,7 +516,7 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
return;
|
||||
}
|
||||
pInfo->xResNumIfd1 = readU32(p, byteOrder);
|
||||
p = pInfo->thumbnailData + (offset + 4);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
@@ -542,7 +538,7 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
return;
|
||||
}
|
||||
pInfo->planarConfigIfd1 = readU32(p, byteOrder);
|
||||
p = pInfo->thumbnailData + (offset + 4);
|
||||
p = (const u8*)(pInfo->thumbnailData + offset + 4);
|
||||
if (pInfo->thumbnailData > p) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -167,28 +167,28 @@ s32 TMCJPEGDEC_set_converterRGB565(TMCCJPEGDecWork* work) {
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGB565(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s32 cbValue;
|
||||
s32 blue;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 lumaSkip;
|
||||
u32 tileWidth;
|
||||
s32 crValue;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 chromaSkip;
|
||||
u8* cb;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
s32 chromaSkip;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u8 value;
|
||||
u32 tileWidth;
|
||||
s32 greenOffset;
|
||||
s32 redOffset;
|
||||
s32 red;
|
||||
s32 tileRow;
|
||||
s32 blueOffset;
|
||||
u8 value;
|
||||
s32 red;
|
||||
s32 greenOffset;
|
||||
s32 green;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -284,9 +284,7 @@ static void TMCJPEGDEC_converterYUV411toRGB565edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 yEnd = y + height;
|
||||
s32 lumaSkip = 32 - width;
|
||||
s32 chromaSkip = lumaSkip >> 2;
|
||||
s32 redOffset;
|
||||
s32 blueOffset;
|
||||
s32 greenOffset;
|
||||
s32 redOffset, greenOffset, blueOffset;
|
||||
ASSERTLINE((x & 3) == 0, __LINE__);
|
||||
for (; y < yEnd; y++) {
|
||||
s32 tileRow = (y >> 2) * tileWidth;
|
||||
@@ -324,11 +322,11 @@ static void TMCJPEGDEC_converterYUV422toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 chromaSkip;
|
||||
s32 width;
|
||||
s32 blue;
|
||||
u16* output;
|
||||
s32 lumaSkip;
|
||||
s32 red;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s32 redOffset;
|
||||
u16* output;
|
||||
u32 tileWidth;
|
||||
u8* texture;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 crValue;
|
||||
@@ -340,7 +338,7 @@ static void TMCJPEGDEC_converterYUV422toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 cbValue;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
s32 redOffset;
|
||||
s32 greenOffset;
|
||||
s32 blueOffset;
|
||||
s32 green;
|
||||
@@ -477,22 +475,22 @@ static void TMCJPEGDEC_converterYUV420toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 width;
|
||||
s32 redOffset;
|
||||
s32 green;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
u32 tileWidth;
|
||||
u8* texture;
|
||||
s32 chromaSkip;
|
||||
s32 height;
|
||||
u8* texture;
|
||||
s32 yEnd;
|
||||
u8* luminance;
|
||||
s32 crValue;
|
||||
s32 value;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
s32 cbValue;
|
||||
s32 column;
|
||||
u8* cr;
|
||||
s32 greenOffset;
|
||||
s32 tileRow;
|
||||
s32 cbValue;
|
||||
s32 lumaSkip;
|
||||
s32 blueOffset;
|
||||
s32 red;
|
||||
TMCCJPEGDecState* state;
|
||||
@@ -565,23 +563,26 @@ static void TMCJPEGDEC_converterYUV420toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV420toRGB565edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
u16* output;
|
||||
s32 yEnd;
|
||||
s8 crValue;
|
||||
s32 tileRow;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
s32 width;
|
||||
s8* cb;
|
||||
s8 crValue;
|
||||
s32 width;
|
||||
s8* cr;
|
||||
s8 cbValue;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s8 cbValue;
|
||||
s32 yEnd;
|
||||
s32 red;
|
||||
s32 blue;
|
||||
u32 tileWidth;
|
||||
s32 height;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 green;
|
||||
s32 lumaSkip;
|
||||
u32 tileWidth;
|
||||
s32 chromaSkip;
|
||||
s32 redOffset;
|
||||
s32 greenOffset;
|
||||
s32 blueOffset;
|
||||
@@ -618,18 +619,16 @@ static void TMCJPEGDEC_converterYUV420toRGB565edge(TMCCJPEGDecWork* work, s32 x,
|
||||
greenOffset = -(cbValue * 88 + crValue * 183) >> 8;
|
||||
blueOffset = (cbValue * 454) >> 8;
|
||||
}
|
||||
{
|
||||
s32 value = *luminance++;
|
||||
s32 red = value + redOffset;
|
||||
s32 blue = value + blueOffset;
|
||||
s32 green = value + greenOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
}
|
||||
output[(column & 3) + (((column >> 2) + tileRow) << 4)] = ((blue & 0xF8) >> 3) + ((red & 0xF8) << 8) + ((green & 0xFC) << 3);
|
||||
blue = *luminance++;
|
||||
red = blue + redOffset;
|
||||
green = blue + greenOffset;
|
||||
blue = blue + blueOffset;
|
||||
if ((blue | red | green) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
}
|
||||
output[(column & 3) + (((column >> 2) + tileRow) << 4)] = ((blue & 0xF8) >> 3) + ((red & 0xF8) << 8) + ((green & 0xFC) << 3);
|
||||
}
|
||||
luminance += lumaSkip;
|
||||
if (y & 1) {
|
||||
@@ -817,11 +816,15 @@ static void TMCJPEGDEC_converterYUV444toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 value;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 cbValue;
|
||||
s32 yEnd;
|
||||
u32 tileWidth;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
s32 red;
|
||||
s32 height;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
@@ -841,19 +844,17 @@ static void TMCJPEGDEC_converterYUV444toRGB565(TMCCJPEGDecWork* work, s32 x, s32
|
||||
for (column = x; column < xEnd; column++) {
|
||||
cbValue = (s8)*cb++;
|
||||
crValue = (s8)*cr++;
|
||||
{
|
||||
s32 value = *luminance++;
|
||||
s32 green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||
s32 red = value + ((crValue * 359) >> 8);
|
||||
s32 blue = value + ((cbValue * 454) >> 8);
|
||||
if ((red | green | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
}
|
||||
output[(column & 3) + (((column >> 2) + tileRow) << 4)] =
|
||||
((blue & 0xF8) >> 3) + (((red & 0xF8) << 8) + ((green & 0xFC) << 3));
|
||||
value = *luminance++;
|
||||
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
|
||||
red = value + ((crValue * 359) >> 8);
|
||||
blue = value + ((cbValue * 454) >> 8);
|
||||
if ((blue | green | red) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
red = red > 255 ? 255 : red < 0 ? 0 : red;
|
||||
}
|
||||
output[(column & 3) + (((column >> 2) + tileRow) << 4)] =
|
||||
((blue & 0xF8) >> 3) + ((red & 0xF8) << 8) + ((green & 0xFC) << 3);
|
||||
}
|
||||
luminance += rowSkip;
|
||||
cb += rowSkip;
|
||||
|
||||
@@ -179,7 +179,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 blueOffset;
|
||||
s32 greenOffset;
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s8 crValue;
|
||||
@@ -188,7 +188,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 cbValue;
|
||||
u8 value;
|
||||
s32 row;
|
||||
u16* output;
|
||||
s32 greenOffset;
|
||||
s32 redOffset;
|
||||
s32 blue;
|
||||
|
||||
@@ -285,9 +285,9 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 chromaSkip;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s32 xEnd;
|
||||
u8* texture;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* luminance;
|
||||
@@ -296,15 +296,15 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 height;
|
||||
u8* cr;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 lumaSkip;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 redOffset;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s8 crValue;
|
||||
s32 redOffset;
|
||||
s32 greenOffset;
|
||||
s32 blueOffset;
|
||||
s32 chromaSkip;
|
||||
s32 blue;
|
||||
s32 red;
|
||||
s32 green;
|
||||
@@ -366,11 +366,11 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
|
||||
static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
u16* output;
|
||||
s32 cbValue;
|
||||
s32 tileRow;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 lumaSkip;
|
||||
s32 cbValue;
|
||||
s32 tileWidth;
|
||||
TMCCJPEGDecState* state;
|
||||
u16* output;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
@@ -381,8 +381,8 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 redOffset;
|
||||
s32 tileRow;
|
||||
s32 greenOffset;
|
||||
s32 blueOffset;
|
||||
s32 value;
|
||||
@@ -441,21 +441,21 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
s32 blue;
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s32 xEnd;
|
||||
u8* cr;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* texture;
|
||||
s32 tileWidth;
|
||||
u8* luminance;
|
||||
s32 width;
|
||||
s32 height;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
u8* texture;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 chromaSkip;
|
||||
s32 yEnd;
|
||||
s32 tileWidth;
|
||||
s32 tileRow;
|
||||
s32 cbValue;
|
||||
s32 crValue;
|
||||
s32 redOffset;
|
||||
@@ -463,8 +463,8 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 blueOffset;
|
||||
s32 value;
|
||||
s32 red;
|
||||
s32 lumaSkip;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = &work->convBuf[132];
|
||||
@@ -517,27 +517,27 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
}
|
||||
|
||||
static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
s32 chromaSkip;
|
||||
s8 crValue;
|
||||
s32 lumaSkip;
|
||||
u16* output;
|
||||
TMCCJPEGDecState* state;
|
||||
s32 tileRow;
|
||||
s8 crValue;
|
||||
s32 chromaSkip;
|
||||
u8* luminance;
|
||||
TMCCJPEGDecState* state;
|
||||
u8* texture;
|
||||
s32 width;
|
||||
s32 height;
|
||||
s32 green;
|
||||
s32 blue;
|
||||
u8* luminance;
|
||||
u8* cb;
|
||||
u8* cr;
|
||||
s32 lumaSkip;
|
||||
s32 yEnd;
|
||||
s32 xEnd;
|
||||
s32 value;
|
||||
s32 column;
|
||||
s32 xEnd;
|
||||
s32 yEnd;
|
||||
u8* cr;
|
||||
s32 greenOffset;
|
||||
s32 tileWidth;
|
||||
s32 redOffset;
|
||||
s32 greenOffset;
|
||||
u8* texture;
|
||||
u8* cb;
|
||||
u16* output;
|
||||
s32 blueOffset;
|
||||
s32 red;
|
||||
s32 cbValue;
|
||||
@@ -641,9 +641,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 xEnd = x + width;
|
||||
s32 lumaSkip = 16 - width;
|
||||
s32 chromaSkip = lumaSkip >> 1;
|
||||
s32 redOffset;
|
||||
s32 blueOffset;
|
||||
s32 greenOffset;
|
||||
s32 redOffset, greenOffset, blueOffset;
|
||||
ASSERTLINE((x & 1) == 0, __LINE__);
|
||||
for (; y < yEnd; y++) {
|
||||
u16* output = (u16*)(texture + ((y & 3) << 3));
|
||||
@@ -658,10 +656,10 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
blueOffset = (cbValue * 454) >> 8;
|
||||
}
|
||||
{
|
||||
s32 red = *luminance++;
|
||||
s32 green = red + greenOffset;
|
||||
s32 blue = red + blueOffset;
|
||||
red = red + redOffset;
|
||||
s32 value = *luminance++;
|
||||
s32 green = value + greenOffset;
|
||||
s32 red = value + redOffset;
|
||||
s32 blue = value + blueOffset;
|
||||
if ((green | red | blue) >> 8) {
|
||||
blue = blue > 255 ? 255 : blue < 0 ? 0 : blue;
|
||||
green = green > 255 ? 255 : green < 0 ? 0 : green;
|
||||
@@ -770,7 +768,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
|
||||
|
||||
static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
|
||||
u16* output;
|
||||
s32 tileRow;
|
||||
s32 lumaSkip;
|
||||
s32 blue;
|
||||
u8* texture;
|
||||
u8* luminance;
|
||||
@@ -785,14 +783,14 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
|
||||
s32 greenOffset;
|
||||
s32 yEnd;
|
||||
s32 cbValue;
|
||||
s32 tileWidth;
|
||||
s32 tileRow;
|
||||
s32 blueOffset;
|
||||
s32 red;
|
||||
s8 crValue;
|
||||
u8 value;
|
||||
s32 green;
|
||||
s32 redOffset;
|
||||
s32 lumaSkip;
|
||||
s32 tileWidth;
|
||||
|
||||
luminance = work->convBuf + 4;
|
||||
cb = work->convBuf + 132;
|
||||
|
||||
@@ -1,20 +1,5 @@
|
||||
#include <zi8clib/zitypes.h>
|
||||
|
||||
typedef struct {
|
||||
ziU8 countOnly;
|
||||
ziU8 maxWordLength;
|
||||
ziU8 lookupMode;
|
||||
ziU8 suffixOnly;
|
||||
ziU8 controls[8];
|
||||
ziU32 maxCount;
|
||||
ziU16 capacity;
|
||||
ziU8 minWordLength;
|
||||
ziU8 flags;
|
||||
ziU16 candidateCapacity;
|
||||
ziU8 checkOnly;
|
||||
ziU8 reserved;
|
||||
} ZiCandidateOptions;
|
||||
|
||||
const ziWChar Zi8PunctTable[40] = {
|
||||
0xFF0C, 0x3002, 0x3001, 0xFF1A, 0xFF1F, 0xFF01, 0x3005, 0x2026,
|
||||
0x2015, 0xFF1B, 0xFF0E, 0x30FB, 0x201C, 0x201D, 0xFF08, 0xFF09,
|
||||
@@ -23,8 +8,8 @@ const ziWChar Zi8PunctTable[40] = {
|
||||
0xFFE1, 0x20AC, 0x203B, 0xFF20, 0x0000,
|
||||
};
|
||||
|
||||
ziU32 Zi8Punctuation(ziGetParam* param, ziPtr options ZI_NEED_WORK) {
|
||||
ziS32 limit = ((ZiCandidateOptions*)options)->capacity - 1;
|
||||
ziS32 Zi8Punctuation(ziGetParam* param ZI_NEED_WORK) {
|
||||
ziS32 limit = ((ziU16*)__zi8_work_data)[8] - 1;
|
||||
ziS32 count = 0;
|
||||
ziU8 i = 0;
|
||||
ziU16 fc = param->firstCandidate;
|
||||
@@ -36,7 +21,7 @@ ziU32 Zi8Punctuation(ziGetParam* param, ziPtr options ZI_NEED_WORK) {
|
||||
}
|
||||
if (fc == 0) {
|
||||
count++;
|
||||
if (((ZiCandidateOptions*)options)->countOnly == 0) {
|
||||
if (ZI_WORK->getcPhase == 0) {
|
||||
param->candidates[i++] = Zi8PunctTable[j];
|
||||
if ((param->context & 0x10) != 0) {
|
||||
param->candidates[i++] = 0x20;
|
||||
@@ -48,7 +33,7 @@ ziU32 Zi8Punctuation(ziGetParam* param, ziPtr options ZI_NEED_WORK) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (count >= (ziS32)((ZiCandidateOptions*)options)->maxCount) {
|
||||
if (count >= (ziS32)ZI_WORK->targetCount) {
|
||||
return count;
|
||||
}
|
||||
}
|
||||
@@ -57,7 +42,7 @@ ziU32 Zi8Punctuation(ziGetParam* param, ziPtr options ZI_NEED_WORK) {
|
||||
}
|
||||
j++;
|
||||
}
|
||||
if (((ZiCandidateOptions*)options)->countOnly == 0) {
|
||||
if (ZI_WORK->getcPhase == 0) {
|
||||
param->letters = count;
|
||||
}
|
||||
return count;
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
#include <zi8clib/zitypes.h>
|
||||
#undef ZI_NEED_WORK
|
||||
#define ZI_NEED_WORK , struct __zi8_work_data_s* __zi8_work_data
|
||||
#undef ZI_WORK
|
||||
#define ZI_WORK __zi8_work_data
|
||||
#include <zi8clib/zconvert.h>
|
||||
#include <zi8clib/zierror.h>
|
||||
|
||||
@@ -28,7 +23,7 @@ typedef struct ziConversionTable {
|
||||
} ziConversionTable;
|
||||
const ziConversionTables Zi8CvrtTables = {0};
|
||||
ziU16 Zi8GetTableCount(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU32 Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziWChar Zi8ConvertUC2UserKey(ziChar, ziU8 ZI_NEED_WORK);
|
||||
|
||||
ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
@@ -42,7 +37,7 @@ ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return 0;
|
||||
}
|
||||
if (Zi8GetTableCount(language, 6, __zi8_work_data) != 0) {
|
||||
table = (ziU8*)Zi8GetTableAddress(language, 6, __zi8_work_data);
|
||||
table = Zi8GetTableAddress(language, 6, __zi8_work_data);
|
||||
if (table == 0) {
|
||||
Zi8LogError(0x6A4, __zi8_work_data);
|
||||
return 0;
|
||||
@@ -82,7 +77,7 @@ ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return 0;
|
||||
}
|
||||
if (Zi8GetTableCount(language, 7, __zi8_work_data) != 0) {
|
||||
table = (ziConversionTable*)Zi8GetTableAddress(language, 7, __zi8_work_data);
|
||||
table = Zi8GetTableAddress(language, 7, __zi8_work_data);
|
||||
if (table == 0) {
|
||||
Zi8LogError(0x6AE, __zi8_work_data);
|
||||
return 0;
|
||||
@@ -142,7 +137,7 @@ ziWChar Zi8ConvertUC2Key(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
if (ZI_WORK->userKeys[language] != 0)
|
||||
return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
|
||||
if (Zi8GetTableCount(language, 8, __zi8_work_data) != 0) {
|
||||
table = (ziConversionTable*)Zi8GetTableAddress(language, 8, __zi8_work_data);
|
||||
table = Zi8GetTableAddress(language, 8, __zi8_work_data);
|
||||
if (table == 0) {
|
||||
Zi8LogError(0x6B8, __zi8_work_data);
|
||||
return 0;
|
||||
|
||||
@@ -15,6 +15,28 @@ typedef struct {
|
||||
|
||||
typedef struct { ziU8 keyLow; ziU8 keyHigh; ziU8 code; ziU8 flags; } Zi8AltSoundRecord;
|
||||
|
||||
|
||||
|
||||
typedef struct {
|
||||
ziU8 language;
|
||||
ziU8 getMode;
|
||||
ziU8 subLanguage;
|
||||
ziU8 context;
|
||||
ziU8 getOptions;
|
||||
ziWChar* elements;
|
||||
ziU8 elementCount;
|
||||
ziWChar* currentWord;
|
||||
ziU8 wordCharCount;
|
||||
ziWChar* candidates;
|
||||
ziU8 maxCandidates;
|
||||
ziU16 firstCandidate;
|
||||
ziU8 wordCandidates;
|
||||
ziU8 count;
|
||||
ziU8 letters;
|
||||
ziU8* scratch;
|
||||
ziPtr workspace;
|
||||
} Zi8OneKeyParam;
|
||||
|
||||
typedef struct {
|
||||
ziU8 countOnly;
|
||||
ziU8 maxSpellingLength;
|
||||
@@ -181,15 +203,15 @@ const ziWChar zi8PYfinalSpelling[64][4] = {
|
||||
|
||||
const unsigned long long Zi8SOpinyinArray = 0x0303010705000000ULL;
|
||||
|
||||
extern ziU16 Zi8Ord2Ord(ziU16, ziPtr);
|
||||
extern Zi8UInt Zi8Ord2Ord(ziU16, ziPtr);
|
||||
extern ziU8 Zi8LangSupported(ziU8, ziPtr);
|
||||
extern ziU16 Zi8GetTableCount(ziU8,ziU8,ziPtr);
|
||||
extern ziU32 Zi8GetTableAddress(ziU8,ziU8,ziPtr);
|
||||
extern void Zi8Memset(ziU8*,ziU32,ziS32);
|
||||
extern ziU8 _Zi8GetCandidates(ziGetParam*,ziPtr);
|
||||
extern void Zi8InitDupWordBuf(ziPtr);
|
||||
extern ziU32 Zi8GetPInfo(ziU32,ziWChar *,ziU8,ziPtr);
|
||||
extern ziU32 Zi8GetZInfo(ziU32,ziWChar *,ziU8,ziPtr);
|
||||
extern Zi8UInt Zi8GetTableAddress(ziU8,ziU8,ziPtr);
|
||||
extern void Zi8Memset();
|
||||
extern int _Zi8GetCandidates();
|
||||
extern void Zi8InitDupWordBuf();
|
||||
extern ziU16 Zi8GetPInfo(ziU16,ziWChar *,ziU8,ziPtr);
|
||||
extern ziU16 Zi8GetZInfo(ziU16,ziWChar *,ziU8,ziPtr);
|
||||
extern ziBool Zi8IsDupWordW(ziWChar *,ziU8,ziPtr);
|
||||
extern ziU8 Zi8GetFormatVersion(ziU8,ziPtr);
|
||||
extern ziU16 Zi8Uni2Ord(ziWChar,ziPtr);
|
||||
@@ -197,10 +219,10 @@ extern ziU16 Zi8GetPCode(ziU8 *,ziU8 *);
|
||||
extern ziU8 Zi8MatchOEMdata(ziWChar *,ziU8,ziU8,ziWChar *,ziU16,ziU8,ziU8,ziPtr);
|
||||
extern ziU8 Zi8MatchPUDdata(ziWChar *,ziU8,ziU8,ziWChar *,ziU16,ziU8,ziU8,ziPtr);
|
||||
extern ziWChar Zi8Ord2Uni(ziU16,ziPtr);
|
||||
extern ziU32 Zi8GetZHuwdPtr(ziU32*,ziU16*,ziPtr);
|
||||
extern ziU8 Zi8GetPyPhonetic(ziWChar*,ziU8,ziU16*,ziU16*,ziU8*,ziU16*,ziU16*,ziPtr);
|
||||
extern ziU8 Zi8GetBpmfPhonetic(ziWChar*,ziU8,ziU16*,ziU16*,ziU16*,ziU16*,ziPtr);
|
||||
extern ziU8 _Zi8CheckCandidates(ziGetParam*,ziPtr);
|
||||
extern Zi8UInt Zi8GetZHuwdPtr(ziU8 **,ziU16 *,ziPtr);
|
||||
extern int Zi8GetPyPhonetic();
|
||||
extern ziU8 Zi8GetBpmfPhonetic();
|
||||
extern int _Zi8CheckCandidates();
|
||||
|
||||
Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
{
|
||||
@@ -289,21 +311,21 @@ Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
return length;
|
||||
}
|
||||
|
||||
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,ziU16 key,ziU8 requireFull,ziU8 usePinyin,ziU8 tone)
|
||||
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,ziU8 tone)
|
||||
{
|
||||
ziU16 spelling[16];
|
||||
Zi8UInt spellingLength;
|
||||
|
||||
if (key == 0) {
|
||||
if ((key & 0xffff) == 0) {
|
||||
return 0;
|
||||
}
|
||||
if ((inputLength & 0xff) == 0) {
|
||||
return 1;
|
||||
}
|
||||
if (usePinyin != 0) {
|
||||
spellingLength = Zi8SpellingPY(spelling,key,tone & 0xff);
|
||||
spellingLength = Zi8SpellingPY(spelling,key & 0xffff,tone & 0xff);
|
||||
} else {
|
||||
spellingLength = Zi8SpellingZY(spelling,key,tone & 0xff);
|
||||
spellingLength = Zi8SpellingZY(spelling,key & 0xffff,tone & 0xff);
|
||||
}
|
||||
if ((requireFull != 0) && ((inputLength & 0xff) != (spellingLength & 0xff))) {
|
||||
return 0;
|
||||
@@ -440,15 +462,15 @@ BACKWARD_SEARCH:
|
||||
goto BINARY_SEARCH;
|
||||
}
|
||||
}
|
||||
static Zi8UInt Zi8SetFindCand(ziU8 *foundCandidates,ziU16 ordinal,ziPtr work)
|
||||
static Zi8UInt Zi8SetFindCand(ziU8 *foundCandidates,Zi8UInt ordinal,ziPtr work)
|
||||
{
|
||||
Zi8UInt result;
|
||||
|
||||
ordinal = Zi8Ord2Ord(ordinal,work);
|
||||
result = (ziU8)((1 << ((int)ordinal % 8)) &
|
||||
foundCandidates[(int)ordinal / 8]);
|
||||
foundCandidates[(int)ordinal / 8] |=
|
||||
1 << ((int)ordinal % 8);
|
||||
result = (ziU8)((1 << ((int)(ordinal & 0xffff) % 8)) &
|
||||
foundCandidates[(int)(ordinal & 0xffff) / 8]);
|
||||
foundCandidates[(int)(ordinal & 0xffff) / 8] |=
|
||||
1 << ((int)(ordinal & 0xffff) % 8);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -484,7 +506,7 @@ LAB_return_false:
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8Get1KeyPressSpelling(ziGetParam *params,Zi8OneKeyOptions *options,Zi8OneKeyWork *work)
|
||||
Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options,Zi8OneKeyWork *work)
|
||||
{
|
||||
ziU8 candidateCount;
|
||||
ziBool exactLength;
|
||||
@@ -509,18 +531,18 @@ ziU32 Zi8Get1KeyPressSpelling(ziGetParam *params,Zi8OneKeyOptions *options,Zi8On
|
||||
ziU16 *output;
|
||||
ziU8 *savedSearchOrder;
|
||||
ziU16 spellingBuffer[8];
|
||||
ziGetParam searchParams;
|
||||
Zi8OneKeyParam searchParams;
|
||||
|
||||
candidateCount = 0;
|
||||
totalCandidates = 0;
|
||||
optionsMask = params->getOptions;
|
||||
params->count = 0;
|
||||
params->letters = 0;
|
||||
params->completion = 0;
|
||||
optionsMask = optionsMask & ~0x10;
|
||||
optionsMask = optionsMask & ~0x20;
|
||||
optionsMask = optionsMask & ~0x40;
|
||||
if (options->maxSpellingLength == '\0') {
|
||||
params->letters = 0;
|
||||
params->count = 0;
|
||||
Zi8LogError(100,work);
|
||||
return 0;
|
||||
}
|
||||
@@ -798,7 +820,7 @@ ziU32 Zi8Get1KeyPressSpelling(ziGetParam *params,Zi8OneKeyOptions *options,Zi8On
|
||||
savedSearchCount = work->searchOrderCount;
|
||||
convertedInput = false;
|
||||
savedSearchFlags = work->searchFlags;
|
||||
Zi8Memset((ziU8*)&searchParams,0,0x2c);
|
||||
Zi8Memset(&searchParams,0,0x2c);
|
||||
searchParams.getMode = 0;
|
||||
searchParams.subLanguage = 0x80;
|
||||
searchParams.context = 1;
|
||||
@@ -896,7 +918,7 @@ ziU32 Zi8Get1KeyPressSpelling(ziGetParam *params,Zi8OneKeyOptions *options,Zi8On
|
||||
work->searchFlags = savedSearchFlags;
|
||||
work->searchOrder = savedSearchOrder;
|
||||
work->searchOrderCount = savedSearchCount;
|
||||
params->letters = searchParams.letters;
|
||||
params->count = searchParams.count;
|
||||
work->spellingOnly = 0;
|
||||
if (convertedInput) {
|
||||
if (params->getMode == '\x03') {
|
||||
@@ -915,7 +937,7 @@ ziU32 Zi8Get1KeyPressSpelling(ziGetParam *params,Zi8OneKeyOptions *options,Zi8On
|
||||
}
|
||||
}
|
||||
if ((options->countOnly == '\0') && (params->getMode == '\x03')) {
|
||||
for (tableIndex = 0; tableIndex < params->letters;) {
|
||||
for (tableIndex = 0; tableIndex < params->count;) {
|
||||
while (*output != 0) {
|
||||
if (*output != 0x27) {
|
||||
*output++ |= 0xf300;
|
||||
@@ -1000,12 +1022,12 @@ nextSpelling:
|
||||
}
|
||||
}
|
||||
finishSpelling:
|
||||
params->letters = candidateCount;
|
||||
params->count = candidateCount;
|
||||
Zi8LogError(100,work);
|
||||
return totalCandidates;
|
||||
}
|
||||
|
||||
ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8OneKeyWork *work)
|
||||
int Zi8Get1KeyPressCandidates(Zi8OneKeyParam *params,Zi8OneKeyOptions *options,Zi8OneKeyWork *work)
|
||||
{
|
||||
ziU16 wordBuffer [64];
|
||||
ziU16 spelling [8];
|
||||
@@ -1024,7 +1046,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
ziU8 *phraseEntries;
|
||||
ziU16 *currentWord;
|
||||
ziU8 *entryCursor;
|
||||
ziU32 userEntriesAddress;
|
||||
ziU8 *userEntries;
|
||||
int duplicateIndex;
|
||||
ziU16 alternateCount;
|
||||
ziU16 ordinalCount;
|
||||
@@ -1126,8 +1148,8 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
}
|
||||
languageMask = languageMask << 4;
|
||||
remaining = params->firstCandidate;
|
||||
params->count = 0;
|
||||
params->letters = 0;
|
||||
params->completion = 0;
|
||||
inputLength = params->elementCount;
|
||||
if (inputLength != 0) {
|
||||
while (inputLength != 0) {
|
||||
@@ -1249,7 +1271,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
tableCursor = Zi8GetTableCount(1,9,work);
|
||||
}
|
||||
if (8 < inputLimit) {
|
||||
params->count = 0;
|
||||
params->wordCandidates = 0;
|
||||
goto finishCandidates;
|
||||
}
|
||||
for (index = 0; index < (int)(Zi8UInt)inputLimit; index++) {
|
||||
@@ -1305,7 +1327,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
}
|
||||
if (elementIndex == 0) continue;
|
||||
if (!emitWords) {
|
||||
if (trackDuplicates && (ziU8)Zi8SetFindCand(params->scratch,candidateOrdinal,work) != 0) continue;
|
||||
if (trackDuplicates && Zi8SetFindCand(params->scratch,candidateOrdinal,work) != 0) continue;
|
||||
for (index = 0; index < candidateCount; index++) {
|
||||
if (candidateCharacter == output[index]) break;
|
||||
}
|
||||
@@ -1335,7 +1357,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
output[outputIndex++] = candidateCharacter;
|
||||
}
|
||||
if (candidateCount >= params->maxCandidates || outputIndex > outputLimit) {
|
||||
params->count = candidateCount;
|
||||
params->wordCandidates = candidateCount;
|
||||
goto finishCandidates;
|
||||
}
|
||||
} else {
|
||||
@@ -1374,7 +1396,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
}
|
||||
if (elementIndex == 0) continue;
|
||||
if (!emitWords) {
|
||||
if (trackDuplicates && (ziU8)Zi8SetFindCand(params->scratch,candidateOrdinal,work) != 0) continue;
|
||||
if (trackDuplicates && Zi8SetFindCand(params->scratch,candidateOrdinal,work) != 0) continue;
|
||||
for (index = 0; index < candidateCount; index++) {
|
||||
if (candidateCharacter == output[index]) break;
|
||||
}
|
||||
@@ -1404,7 +1426,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
output[outputIndex++] = candidateCharacter;
|
||||
}
|
||||
if (candidateCount >= params->maxCandidates || outputIndex > outputLimit) {
|
||||
params->count = candidateCount;
|
||||
params->wordCandidates = candidateCount;
|
||||
goto finishCandidates;
|
||||
}
|
||||
} else {
|
||||
@@ -1497,7 +1519,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
}
|
||||
if (elementIndex == 0) goto nextPhrase;
|
||||
if (!emitWords) {
|
||||
if (trackDuplicates && (ziU8)Zi8SetFindCand(params->scratch,phraseCharacter,work) != 0) goto nextPhrase;
|
||||
if (trackDuplicates && Zi8SetFindCand(params->scratch,phraseCharacter,work) != 0) goto nextPhrase;
|
||||
for (index = 0; index < candidateCount; index++) {
|
||||
if (firstOrdinal == output[index]) goto nextPhrase;
|
||||
}
|
||||
@@ -1525,7 +1547,7 @@ ziU32 Zi8Get1KeyPressCandidates(ziGetParam *params,Zi8OneKeyOptions *options,Zi8
|
||||
output[outputIndex++] = firstOrdinal;
|
||||
}
|
||||
if (candidateCount >= params->maxCandidates || outputIndex > outputLimit) {
|
||||
params->count = candidateCount;
|
||||
params->wordCandidates = candidateCount;
|
||||
goto finishCandidates;
|
||||
}
|
||||
} else {
|
||||
@@ -1546,7 +1568,7 @@ nextPhrase:
|
||||
else {
|
||||
finishPhrases:
|
||||
if (params->wordCharCount != '\0') {
|
||||
params->count = candidateCount;
|
||||
params->wordCandidates = candidateCount;
|
||||
}
|
||||
}
|
||||
if ((options->countOnly == '\0') && (tableCursor != 0)) {
|
||||
@@ -1579,7 +1601,7 @@ finishPhrases:
|
||||
}
|
||||
if (elementIndex == 0) goto nextSortedOrdinal;
|
||||
if (!emitWords) {
|
||||
if (trackDuplicates && (ziU8)Zi8SetFindCand(params->scratch,ordinal,work) != 0) goto nextSortedOrdinal;
|
||||
if (trackDuplicates && Zi8SetFindCand(params->scratch,ordinal,work) != 0) goto nextSortedOrdinal;
|
||||
ordinal = Zi8Ord2Uni(ordinal,work);
|
||||
for (index = 0; index < candidateCount; index++) {
|
||||
if (ordinal == output[index]) break;
|
||||
@@ -1607,11 +1629,11 @@ nextSortedOrdinal:
|
||||
;
|
||||
}
|
||||
}
|
||||
if ((options->countOnly == '\0') && (ziU8)Zi8GetZHuwdPtr(&userEntriesAddress,&userCount,work) != 0)
|
||||
if ((options->countOnly == '\0') && Zi8GetZHuwdPtr(&userEntries,&userCount,work) != 0)
|
||||
{
|
||||
for (phraseOrdinal = 0; phraseOrdinal < userCount;) {
|
||||
if ((params->elementCount == '\0') || ((((ziU8*)userEntriesAddress)[1] & 0x80) != 0)) {
|
||||
userOrdinal = (ziU16)(((ziU8*)userEntriesAddress)[1] & 0x7f) << 8 | (ziU16)((ziU8*)userEntriesAddress)[2];
|
||||
if ((params->elementCount == '\0') || ((userEntries[1] & 0x80) != 0)) {
|
||||
userOrdinal = (userEntries[1] & 0x7f) << 8 | (ziU16)userEntries[2];
|
||||
phraseTable = syllableTable + (Zi8UInt)userOrdinal * 0xc;
|
||||
if (((*phraseTable & languageMask) != 0) &&
|
||||
((characterSetTable == 0 || ((characterSet & characterSetTable[(Zi8UInt)userOrdinal]) != 0)))) {
|
||||
@@ -1632,7 +1654,7 @@ nextSortedOrdinal:
|
||||
}
|
||||
if (elementIndex == 0) goto nextUserOrdinal;
|
||||
if (!emitWords) {
|
||||
if (trackDuplicates && (ziU8)Zi8SetFindCand(params->scratch,userOrdinal,work) != 0) goto nextUserOrdinal;
|
||||
if (trackDuplicates && Zi8SetFindCand(params->scratch,userOrdinal,work) != 0) goto nextUserOrdinal;
|
||||
userCharacter = Zi8Ord2Uni(userOrdinal,work);
|
||||
for (duplicateIndex = 0; duplicateIndex < candidateCount; duplicateIndex++) {
|
||||
if (userCharacter == output[duplicateIndex]) break;
|
||||
@@ -1655,7 +1677,7 @@ nextSortedOrdinal:
|
||||
}
|
||||
nextUserOrdinal:
|
||||
phraseOrdinal++;
|
||||
userEntriesAddress = userEntriesAddress + 3;
|
||||
userEntries = userEntries + 3;
|
||||
}
|
||||
}
|
||||
phraseTable = syllableTable;
|
||||
@@ -1688,7 +1710,7 @@ nextUserOrdinal:
|
||||
if (unicodeCharacter == previousCharacter) goto nextOrdinal;
|
||||
previousCharacter = unicodeCharacter;
|
||||
if (!emitWords) {
|
||||
if (trackDuplicates && (ziU8)Zi8SetFindCand(params->scratch,ordinal,work) != 0) goto nextOrdinal;
|
||||
if (trackDuplicates && Zi8SetFindCand(params->scratch,ordinal,work) != 0) goto nextOrdinal;
|
||||
for (index = 0; index < candidateCount; index++) {
|
||||
if (unicodeCharacter == output[index]) break;
|
||||
}
|
||||
@@ -1716,14 +1738,15 @@ nextOrdinal:
|
||||
}
|
||||
finishCandidates:
|
||||
if ((emitWords) && (outputIndex != 0)) {
|
||||
output[outputIndex++] = 0;
|
||||
output[outputIndex] = 0;
|
||||
outputIndex++;
|
||||
}
|
||||
params->letters = candidateCount;
|
||||
params->count = candidateCount;
|
||||
Zi8LogError(100,work);
|
||||
return totalCandidates;
|
||||
}
|
||||
|
||||
ziBool Zi8ZHCheckSpelling(ziWChar *input,ziWChar *spelling,ziU8 inputLength,ziPtr work)
|
||||
Zi8UInt Zi8ZHCheckSpelling(ziU16 *input,ziU16 *spelling,Zi8UInt inputLength,char *work)
|
||||
{
|
||||
int index;
|
||||
ziU8 result;
|
||||
@@ -1738,11 +1761,11 @@ ziBool Zi8ZHCheckSpelling(ziWChar *input,ziWChar *spelling,ziU8 inputLength,ziPt
|
||||
int syllableStart;
|
||||
int syllableLength;
|
||||
Zi8UInt tableOffset;
|
||||
ziWChar candidateBuffer [16];
|
||||
ziU16 phoneticCodes [16];
|
||||
ziU16 phoneticMasks [16];
|
||||
ziU8 candidateBuffer [32];
|
||||
ziU8 phoneticCodes [32];
|
||||
ziU8 phoneticMasks [32];
|
||||
ziU16 convertedSpelling [64];
|
||||
ziGetParam getParam;
|
||||
Zi8OneKeyParam getParam;
|
||||
ziU8 maskLow;
|
||||
ziU8 codeLow;
|
||||
ziU8 maskHigh;
|
||||
@@ -1783,7 +1806,7 @@ ziBool Zi8ZHCheckSpelling(ziWChar *input,ziWChar *spelling,ziU8 inputLength,ziPt
|
||||
}
|
||||
index = 0;
|
||||
syllableStart = index;
|
||||
for (; index < (int)inputLength; index = index + 1) {
|
||||
for (; index < (int)(inputLength & 0xff); index = index + 1) {
|
||||
switch (spelling[index]) {
|
||||
case 0xf331:
|
||||
toneMask = 1;
|
||||
@@ -1854,7 +1877,7 @@ nextInputCharacter:
|
||||
}
|
||||
else {
|
||||
if ((input[index] == 0x27) || (input[index] == 0xf360)) {
|
||||
if (index < (int)inputLength) {
|
||||
if (index < (int)(inputLength & 0xff)) {
|
||||
convertedSpelling[index] = input[index] = spelling[index];
|
||||
}
|
||||
else {
|
||||
@@ -1896,7 +1919,7 @@ nextInputCharacter:
|
||||
getParam.elementCount = (ziU8)index;
|
||||
getParam.currentWord = 0;
|
||||
getParam.wordCharCount = 0;
|
||||
getParam.candidates = candidateBuffer;
|
||||
getParam.candidates = (ziWChar *)candidateBuffer;
|
||||
getParam.maxCandidates = 1;
|
||||
getParam.firstCandidate = 0;
|
||||
if ((ziU8)_Zi8CheckCandidates(&getParam,work) != 0) {
|
||||
|
||||
@@ -351,7 +351,6 @@ int Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr optionData, ziPtr workDa
|
||||
int candidateCount;
|
||||
ziU8 *keyLayout;
|
||||
ziU8 *keyLayoutCursor;
|
||||
ziPtr workspace;
|
||||
ziU16 prefixTableFlags;
|
||||
ziU16 prefixVowelFlags;
|
||||
ziU8 prefixMode;
|
||||
@@ -407,7 +406,6 @@ int Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr optionData, ziPtr workDa
|
||||
contextEnabled = 0;
|
||||
keyLayoutCount = 0;
|
||||
keyLayout = 0;
|
||||
workspace = workData;
|
||||
phoneticInput = 0;
|
||||
phoneticSeparator = 0;
|
||||
if ((((((language == 0x7c) || (language == 0x7d)) || (language == 0x7b)) ||
|
||||
@@ -922,8 +920,9 @@ selectDictionary:
|
||||
if ((((wordLength == 0) && (*punctuationCursor != 0)) && (dictionaryExact != 0)) &&
|
||||
((((ZiAlphaWork*)workData)->singleCharacter != 0 && (parameters->elementCount == 2)))) {
|
||||
*wordCursor = ((ZiAlphaWork*)workData)->singleCharacter;
|
||||
wordCursor[1] = *punctuationCursor;
|
||||
punctuationCursor = punctuationCursor + 1;
|
||||
wordCursor[2] = 0;
|
||||
wordCursor[1] = *punctuationCursor++;
|
||||
wordLength = 2;
|
||||
}
|
||||
if (((apostropheIndex != 0) && (wordLength != 0)) && (elementCount == parameters->elementCount)) {
|
||||
@@ -1006,7 +1005,7 @@ filterVowelCandidate:
|
||||
case 3:
|
||||
case 7:
|
||||
while( ZI8_TRUE ) {
|
||||
wordLength = Zi8MatchUWDdata(elements,elementCount,
|
||||
wordLength = Zi8MatchUWDdata(elements,elementCount & 0xff,
|
||||
parameters->currentWord,parameters->wordCharCount,
|
||||
language,wordCursor,wordCapacity & 0xffff,dictionaryExact,
|
||||
dictionaryStatus[dictionaryKind] & 0xff,workData);
|
||||
@@ -1017,8 +1016,8 @@ filterVowelCandidate:
|
||||
case 4:
|
||||
case 8:
|
||||
if (elementCount != 0) {
|
||||
wordLength = Zi8MatchOEMdata(elements,elementCount,language,wordCursor,
|
||||
wordCapacity,dictionaryExact,
|
||||
wordLength = Zi8MatchOEMdata(elements,elementCount & 0xff,language,wordCursor,
|
||||
wordCapacity & 0xffff,dictionaryExact,
|
||||
dictionaryStatus[dictionaryKind] & 0xff,workData);
|
||||
}
|
||||
break;
|
||||
@@ -1140,7 +1139,7 @@ prepareCandidate:
|
||||
Zi8ChangeWordCase(wordCursor - prefixCount,language,workData);
|
||||
}
|
||||
if ((((ZiAlphaOptions*)optionData)->suffixOnly != '\0') &&
|
||||
((wordLength + prefixCount) > ((ZiAlphaOptions*)optionData)->maxWordLength)) {
|
||||
((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
|
||||
wordLength = ((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
|
||||
wordCursor[wordLength] = 0;
|
||||
}
|
||||
@@ -1195,9 +1194,7 @@ checkKeyLayout:
|
||||
break;
|
||||
}
|
||||
emitCandidate:
|
||||
if (firstCandidate != 0) {
|
||||
--firstCandidate;
|
||||
} else {
|
||||
if (firstCandidate == 0) {
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
|
||||
@@ -1207,17 +1204,20 @@ emitCandidate:
|
||||
((ZiAlphaOptions*)optionData)->longestWord = wordLength + prefixCount;
|
||||
}
|
||||
}
|
||||
if (++candidateCount >= ((ZiAlphaOptions*)optionData)->maxResults) goto finishCandidates;
|
||||
candidateCount = candidateCount + 1;
|
||||
if (((ZiAlphaOptions*)optionData)->maxResults <= candidateCount) goto finishCandidates;
|
||||
} else {
|
||||
if (((ZiAlphaOptions*)optionData)->lookupMode != '\0') {
|
||||
for (index = 0; index <= wordLength; index++) {
|
||||
if (wordCursor[index] != ((ZiAlphaOptions*)optionData)->dictionary[index]) break;
|
||||
for (index = 0;
|
||||
(index <= (int)wordLength &&
|
||||
(wordCursor[index] == ((ZiAlphaOptions*)optionData)->dictionary[index]));
|
||||
index = index + 1) {
|
||||
}
|
||||
if ((((((ZiAlphaWork*)workData)->operation != '\0') || (index >= wordLength))
|
||||
if ((((((ZiAlphaWork*)workData)->operation != '\0') || ((int)wordLength <= index))
|
||||
&& ((((ZiAlphaWork*)workData)->operation == '\0' ||
|
||||
((exactLengthOnly == 0 ||
|
||||
(index >= (int)(ziU16)Zi8WCharCount(((ZiAlphaOptions*)optionData)->dictionary,workData))))))) &&
|
||||
((exactLengthOnly != 0 || (index >= wordLength)))) {
|
||||
((int)(ziU16)Zi8WCharCount(((ZiAlphaOptions*)optionData)->dictionary,workData) <= index)))))) &&
|
||||
((exactLengthOnly != 0 || ((int)wordLength <= index)))) {
|
||||
candidateCount = 1;
|
||||
goto finishCandidates;
|
||||
}
|
||||
@@ -1326,7 +1326,8 @@ emitCandidate:
|
||||
wordCursor = wordCursor + wordLength;
|
||||
wordCapacity = wordCapacity - wordLength;
|
||||
}
|
||||
if (++candidateCount >= (int)(unsigned int)parameters->maxCandidates) {
|
||||
candidateCount = candidateCount + 1;
|
||||
if ((int)(unsigned int)parameters->maxCandidates <= candidateCount) {
|
||||
prefixCount = 0;
|
||||
goto finishCandidates;
|
||||
}
|
||||
@@ -1358,6 +1359,9 @@ emitCandidate:
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
firstCandidate = firstCandidate - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1372,23 +1376,27 @@ finishDictionaryPass:;
|
||||
(((parameters->elementCount == 1 &&
|
||||
(((Zi8GetTableCount(parameters->language,0x1f,workData)) & 0x40) == 0)) &&
|
||||
(*parameters->elements >= 0xeff1)))))) &&
|
||||
((*parameters->elements <= 0xf010 &&
|
||||
((*parameters->elements < 0xf011 &&
|
||||
((Zi8getKeyLayout(parameters->language,*parameters->elements,&punctuationBuffer[0],1,workData)) != '\0')))) {
|
||||
punctuationCandidate = ZI8_TRUE;
|
||||
}
|
||||
if (((candidateCount == 0) && (punctuationCandidate)) && (firstCandidate == 0)) {
|
||||
candidateCount = 1;
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != 0 || (parameters->getOptions & 0xFD) == 0x81) {
|
||||
if ((((ZiAlphaOptions*)optionData)->countOnly == '\0') && ((parameters->getOptions & 0xfd) != 0x81)) {
|
||||
*encodedOutput = 0x3e;
|
||||
encodedOutput[2] = 0;
|
||||
encodedOutput[1] = 0;
|
||||
}
|
||||
else {
|
||||
if (parameters->getMode == 1) {
|
||||
*wordCursor = *elements;
|
||||
} else {
|
||||
*wordCursor = 0x3E;
|
||||
}
|
||||
wordCursor[1] = wordCursor[2] = 0;
|
||||
wordCursor += 2;
|
||||
} else {
|
||||
*encodedOutput = 0x3E;
|
||||
encodedOutput[1] = encodedOutput[2] = 0;
|
||||
else {
|
||||
*wordCursor = 0x3e;
|
||||
}
|
||||
wordCursor[2] = 0;
|
||||
wordCursor[1] = 0;
|
||||
wordCursor = wordCursor + 2;
|
||||
}
|
||||
if (((ZiAlphaOptions*)optionData)->lookupMode == '\0') {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
@@ -1568,17 +1576,17 @@ checkPrefixFields:
|
||||
|
||||
finishCandidates:
|
||||
((ZiAlphaWork*)workData)->usePrefixAsElements = 0;
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
|
||||
parameters->letters = 0;
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly == '\0') {
|
||||
parameters->letters = candidateCount;
|
||||
}
|
||||
else {
|
||||
parameters->letters = candidateCount;
|
||||
parameters->letters = 0;
|
||||
}
|
||||
wordCursor[-prefixCount] = 0;
|
||||
if (((((ZiAlphaOptions*)optionData)->countOnly == '\0') && (((ZiAlphaOptions*)optionData)->lookupMode == '\0')) && (parameters->elementCount != 0)) {
|
||||
elementIndex = parameters->elementCount - 1;
|
||||
if (((primaryVowelRestriction) || (secondaryVowelRestriction)) &&
|
||||
((((ZiAlphaWork*)workData)->prefixEnabled <= 1 ||
|
||||
((((ZiAlphaWork*)workData)->prefixEnabled < 2 ||
|
||||
(parameters->elements[elementIndex] == 0xEFF1)))) {
|
||||
index = 0;
|
||||
while (elementIndex >= 0) {
|
||||
|
||||
@@ -133,16 +133,16 @@ typedef struct {
|
||||
ziU8 phonetics[11];
|
||||
} ZiChineseRecord;
|
||||
|
||||
extern ziU32 Zi8GetTableAddress(ziU8 language, ziU8 table, ziPtr work);
|
||||
extern ziPtr Zi8GetTableAddress(ziU8 language, ziU8 table, ziPtr work);
|
||||
extern ziU16 Zi8GetTableCount(ziU8 language, ziU8 table, ziPtr work);
|
||||
extern ziU8 Zi8IsDupWChar(ziWChar character, ziPtr work);
|
||||
extern ziU8 Zi8IsDupWordW(ziWChar* word, ziU8 length, ziPtr work);
|
||||
extern ziWChar Zi8Ord2Uni(ziU16 ordinal, ziPtr work);
|
||||
extern ziU8 Zi8MatchPhonetic(ziPtr phonetics, ziU8* records,
|
||||
ziPtr indexTable, ziU16 indexCount, ziU32 dictionary,
|
||||
ziU8* record, ziU16* mask, ziU16* match,
|
||||
ziU16* length, ziU8** matchedRecord,
|
||||
ziU8** matchedString, ziU8 wordMode, ziU8 partial,
|
||||
extern ziU8 Zi8MatchPhonetic(ziU8* phonetics, ZiChineseRecord* records,
|
||||
ziPtr indexTable, ziU16 indexCount, ziPtr dictionary,
|
||||
ZiChineseRecord* record, ziU16* mask, ziU16* match,
|
||||
ziU16* length, ZiChineseRecord** matchedRecord,
|
||||
int* matchedIndex, ziU8 wordMode, ziU8 partial,
|
||||
ziU8 oneCharacter, ziU16 excludedMask,
|
||||
ziU16 excludedMatch, ziU8 charset, ziU8 options,
|
||||
ziU16 ordinal, ziU16* tone, ziU8 spellingOnly,
|
||||
@@ -160,13 +160,13 @@ extern const ziU8 zi8CangjieCodes[25];
|
||||
extern const ziWChar ziPuncts[4];
|
||||
extern const ziWChar ziTones[4];
|
||||
const ziWChar zi8tones[4];
|
||||
extern ziU32 Zi8GetZHuwdPtr(ziU32* entries, ziU16* count, ziPtr work);
|
||||
extern ziU8 Zi8GetZHuwdPtr(ziU8** entries, ziU16* count, ziPtr work);
|
||||
extern ziBool Zi8IsComponent(ziWChar character, ziPtr work);
|
||||
extern ziBool Zi8IsCharacter(ziWChar character, ziPtr work);
|
||||
extern ziU8 Zi8MatchOEMdata(ziWChar* currentWord, ziU8 length, ziU8 language,
|
||||
ziWChar* output, ziU16 capacity, ziU8 mode, ziU8 next, ziPtr work);
|
||||
extern ziU16 Zi8Uni2Ord(ziWChar character, ziPtr work);
|
||||
extern ziU16 Zi8GetPCode(ziU8* table, ziU8* record);
|
||||
extern int Zi8GetPCode(ziU8* table, ziU8* record);
|
||||
extern ziU16 Zi8MatchAltSound(ziPtr table, ziU16 count, ziPtr phonetics,
|
||||
ziU16 ordinal, ziU16 mask, ziU16 value, ziU8 flags, ziPtr work);
|
||||
extern ziU32 Zi8SecMatchChar(ziPtr record, ziU8* dictionary, ziMatchParam* match, ziU16* code, ziPtr work);
|
||||
@@ -199,7 +199,7 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
ziU8 matchMode;
|
||||
int index;
|
||||
ziWChar* currentWord;
|
||||
ziU32 userEntriesAddress;
|
||||
ziU8* userEntries;
|
||||
ziU16 ordinalIndex;
|
||||
ziU16 tableIndex;
|
||||
ziU16 phraseOrdinal;
|
||||
@@ -614,10 +614,10 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
case 56: case 59:
|
||||
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->fANDh) ordinalIndex = 0xF9FF;
|
||||
break;
|
||||
case 60: case 63:
|
||||
case 52: case 55:
|
||||
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->bANDp) ordinalIndex = 0xF9FF;
|
||||
break;
|
||||
case 52: case 55:
|
||||
case 60: case 63:
|
||||
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->gANDk) ordinalIndex = 0xF9FF;
|
||||
break;
|
||||
case 38:
|
||||
@@ -755,8 +755,8 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
|
||||
componentOrdinals = (ziU8*)Zi8GetTableAddress(1, 7, work);
|
||||
componentTable = componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
|
||||
componentCursor += 8;
|
||||
componentIndex = componentCount - 1;
|
||||
--componentCount;
|
||||
componentIndex = componentCount;
|
||||
alternateCharacter = 0;
|
||||
phoneticRetry = 1;
|
||||
}
|
||||
@@ -1299,8 +1299,8 @@ context_word_lookup:
|
||||
if (emitWords) {
|
||||
++emittedCount;
|
||||
outputIndex += emittedWords;
|
||||
output[outputIndex] = ' ';
|
||||
if (++outputIndex > outputLimit) {
|
||||
output[outputIndex++] = ' ';
|
||||
if (outputIndex > outputLimit) {
|
||||
request->letters = emittedCount;
|
||||
request->count = emittedCount;
|
||||
goto engine_finish;
|
||||
@@ -1336,7 +1336,7 @@ dictionary_search:
|
||||
Zi8GetFormatVersion(1, work) >= 8) {
|
||||
lastCharHigh = (request->currentWord[request->wordCharCount - 1] >> 8) & 0xFF;
|
||||
lastCharLow = request->currentWord[request->wordCharCount - 1];
|
||||
phoneticGroups = (ziU8*)Zi8GetTableAddress(1, 28, work);
|
||||
phoneticGroups = Zi8GetTableAddress(1, 28, work);
|
||||
rangeCount = Zi8GetTableCount(1, 28, work);
|
||||
rangeIndex = 0;
|
||||
while (rangeIndex < rangeCount) {
|
||||
@@ -1384,7 +1384,7 @@ numeric_setup:
|
||||
default: ordinalCount = 0; break;
|
||||
}
|
||||
}
|
||||
if (ordinalCount) ordinalTable = (ziU8*)Zi8GetTableAddress(1, 29, work);
|
||||
if (ordinalCount) ordinalTable = Zi8GetTableAddress(1, 29, work);
|
||||
}
|
||||
if (!request->elementCount && (getMode == 7 || getMode == 8 || getMode == 9)) {
|
||||
resultFallback = 0;
|
||||
@@ -1434,8 +1434,8 @@ candidate_dictionary_search:
|
||||
if (emitWords) {
|
||||
++emittedCount;
|
||||
output[outputIndex++] = character;
|
||||
output[outputIndex] = ' ';
|
||||
if (++outputIndex > outputLimit) goto engine_finish;
|
||||
output[outputIndex++] = ' ';
|
||||
if (outputIndex > outputLimit) goto engine_finish;
|
||||
} else output[emittedCount++] = character;
|
||||
if (emittedCount >= request->maxCandidates) goto engine_finish;
|
||||
}
|
||||
@@ -1451,7 +1451,7 @@ character_range_start:
|
||||
firstOrdinal = 0;
|
||||
rangeIndex = Zi8GetTableCount(1, 16, work);
|
||||
if (Zi8GetFormatVersion(1, work) >= 4 && rangeIndex && elements[0] != 0xEF00) {
|
||||
phoneticGroups = (ziU8*)Zi8GetTableAddress(1, 16, work);
|
||||
phoneticGroups = Zi8GetTableAddress(1, 16, work);
|
||||
rangeIndex = 0;
|
||||
rangeCount = 0;
|
||||
switch (phase) {
|
||||
@@ -1612,9 +1612,9 @@ phonetic_ordinal_search:
|
||||
record = records + phraseOrdinal * 12;
|
||||
candidateCount = 0;
|
||||
phoneticGroups = 0;
|
||||
if (!Zi8MatchPhonetic(phoneticTable, records, alternateTable, alternateCount,
|
||||
(ziU32)phraseTable, record, match.phon, match.phon2,
|
||||
&candidateCount, &record, &phoneticGroups,
|
||||
if (!Zi8MatchPhonetic(phoneticTable, (ZiChineseRecord*)records, alternateTable, alternateCount,
|
||||
phraseTable, (ZiChineseRecord*)record, match.phon, match.phon2,
|
||||
&candidateCount, (ZiChineseRecord**)&record, (int*)&phoneticGroups,
|
||||
0, 1, match.nCand, phoneticMask, phoneticMatch, charset, requireFull,
|
||||
phraseOrdinal, &candidateOrdinal, 0, work)) continue;
|
||||
if (charsetTable) {
|
||||
@@ -1676,8 +1676,8 @@ tone_candidates:
|
||||
if (emitWords) {
|
||||
++emittedCount;
|
||||
output[outputIndex++] = character;
|
||||
output[outputIndex] = ' ';
|
||||
if (++outputIndex > outputLimit) goto engine_finish;
|
||||
output[outputIndex++] = ' ';
|
||||
if (outputIndex > outputLimit) goto engine_finish;
|
||||
} else output[emittedCount++] = character;
|
||||
if (emittedCount >= request->maxCandidates) goto engine_finish;
|
||||
} else if (totalResults >= options->maxResults) goto engine_finish;
|
||||
@@ -1754,10 +1754,10 @@ tone_candidates:
|
||||
user_character_search:
|
||||
if (((struct __zi8_work_data_s*)work)->uwdPtrCount && (getMode != 0 || !firstPhoneticPass) &&
|
||||
!options->countOnly && (match.nCand <= 1 || (getMode != 1 && getMode != 2)) &&
|
||||
(ziU8)Zi8GetZHuwdPtr(&userEntriesAddress, &userCount, work) && (getMode != 0 || match.nSeg <= 1)) {
|
||||
Zi8GetZHuwdPtr(&userEntries, &userCount, work) && (getMode != 0 || match.nSeg <= 1)) {
|
||||
userIndex = 0;
|
||||
while (userIndex < userCount) {
|
||||
candidateOrdinal = (ziU16)(((ziU8*)userEntriesAddress)[1] & 0x7F) << 8 | ((ziU8*)userEntriesAddress)[2];
|
||||
candidateOrdinal = (ziU16)(userEntries[1] & 0x7F) << 8 | userEntries[2];
|
||||
record = records + candidateOrdinal * 12;
|
||||
if (!(record[0] & charset)) goto user_character_next;
|
||||
character = ((ziU16)record[6] << 8) + record[7];
|
||||
@@ -1792,7 +1792,7 @@ user_character_search:
|
||||
(ziU8)Zi8SecMatchChar(record, componentTable, &match, 0, work)) candidateStatus = 1;
|
||||
break;
|
||||
case 1: case 2:
|
||||
if (request->elementCount && !(((ziU8*)userEntriesAddress)[1] & 0x80)) candidateStatus = 0;
|
||||
if (request->elementCount && !(userEntries[1] & 0x80)) candidateStatus = 0;
|
||||
else {
|
||||
candidateStatus = (match.first & (ziU16)Zi8GetPCode(phoneticTable, record)) == match.first2;
|
||||
if (!candidateStatus && (record[0] & 0x80) && !requireFull &&
|
||||
@@ -1827,7 +1827,7 @@ user_character_search:
|
||||
}
|
||||
user_character_next:
|
||||
++userIndex;
|
||||
userEntriesAddress += 3;
|
||||
userEntries += 3;
|
||||
}
|
||||
}
|
||||
if (!prefixLookup) goto phonetic_alt_continue;
|
||||
@@ -1912,7 +1912,7 @@ cangjie_components:
|
||||
Zi8GetTableCount(1, 16, work) && elements[0] != 0xEF00 && getMode != 5) {
|
||||
rangeIndex = 0;
|
||||
rangeCount = 0;
|
||||
phoneticGroups = (ziU8*)Zi8GetTableAddress(1, 16, work);
|
||||
phoneticGroups = Zi8GetTableAddress(1, 16, work);
|
||||
switch (phase) {
|
||||
case 0: rangeIndex = 0; rangeCount = 2; phase = 1; break;
|
||||
case 1:
|
||||
@@ -2052,7 +2052,7 @@ component_record_next:
|
||||
if (getMode != 5) {
|
||||
while (exactPhrase) {
|
||||
while (match.count) {
|
||||
if ((candidateCount -= 1) == 0xFFFF) goto frequency_range_retry;
|
||||
if (!candidateCount--) goto frequency_range_retry;
|
||||
if (match.arrD[0] == (record[0] & match.arr1[0]) &&
|
||||
(ziU8)Zi8SecMatchChar(record, componentTable, &match, &candidateOrdinal, work)) goto frequency_accept;
|
||||
record += 12;
|
||||
@@ -2199,7 +2199,7 @@ phonetic_main:
|
||||
if (Zi8GetFormatVersion(1, work) >= 4) rangeCount = Zi8GetTableCount(1, 23, work);
|
||||
else rangeCount = 0;
|
||||
if (rangeCount && match.nCand == 2 && emitWords) {
|
||||
frequencyCursor = (ziU8*)Zi8GetTableAddress(1, 24, work);
|
||||
frequencyCursor = Zi8GetTableAddress(1, 24, work);
|
||||
frequencyEntry = frequencyCursor;
|
||||
duplicateIndex = Zi8GetTableCount(1, 24, work);
|
||||
if (!duplicateIndex) isFirstCandidate = 1;
|
||||
@@ -2298,7 +2298,7 @@ phonetic_pair_next:
|
||||
alternateCursor += 4;
|
||||
}
|
||||
phonetic_group_next:
|
||||
ordinalIndex += 1;
|
||||
++ordinalIndex;
|
||||
frequencyCursor += 5;
|
||||
}
|
||||
}
|
||||
@@ -2323,9 +2323,9 @@ phonetic_ordinals:
|
||||
candidateCount = recordCount;
|
||||
phoneticGroups = 0;
|
||||
while (emittedCount < request->maxCandidates && candidateCount) {
|
||||
if (!Zi8MatchPhonetic(phoneticTable, records, alternateTable, alternateCount,
|
||||
(ziU32)phraseTable, record, match.phon, match.phon2,
|
||||
&candidateCount, &record, &phoneticGroups,
|
||||
if (!Zi8MatchPhonetic(phoneticTable, (ZiChineseRecord*)records, alternateTable, alternateCount,
|
||||
phraseTable, (ZiChineseRecord*)record, match.phon, match.phon2,
|
||||
&candidateCount, (ZiChineseRecord**)&record, (int*)&phoneticGroups,
|
||||
emitWords, singleCharacterPass, match.nCand, phoneticMask, phoneticMatch, charset,
|
||||
requireFull, recordCount, &candidateOrdinal, filteringMode, work)) break;
|
||||
ordinalIndex = recordCount - candidateCount - 1;
|
||||
@@ -2446,7 +2446,7 @@ engine_finish:
|
||||
return totalResults;
|
||||
filtered_search:
|
||||
userIndex = Zi8GetTableCount(1, 31, work);
|
||||
frequencyTable = (ziU8*)Zi8GetTableAddress(1, 31, work);
|
||||
frequencyTable = Zi8GetTableAddress(1, 31, work);
|
||||
for (; userIndex; --userIndex) {
|
||||
index = frequencyTable[0] & 15;
|
||||
if (!(*frequencyTable++ & charset)) goto filtered_next;
|
||||
@@ -2608,10 +2608,10 @@ static int Zi8NewMatchPhonetic(ziGetParam* request, ZiChineseRecord* records,
|
||||
ziU8* phonetics;
|
||||
int totalResults;
|
||||
int emittedCharacters;
|
||||
ziU8* matchedRecord;
|
||||
ZiChineseRecord* matchedRecord;
|
||||
ziU8* phoneticGroups;
|
||||
ziU8* candidateGroups;
|
||||
ziU8* matchedString;
|
||||
int matchedIndex;
|
||||
int capacity;
|
||||
ziU8* groupCandidates;
|
||||
ziU16 phoneticCount;
|
||||
@@ -2645,20 +2645,20 @@ static int Zi8NewMatchPhonetic(ziGetParam* request, ZiChineseRecord* records,
|
||||
if ((mask & 7) == 7) {
|
||||
stopAfterTone = match & 7;
|
||||
}
|
||||
phoneticOffsets = (ziU16*)Zi8GetTableAddress(1, 13, work);
|
||||
ordinalTable = (ziU16*)Zi8GetTableAddress(1, 14, work);
|
||||
phoneticOffsets = Zi8GetTableAddress(1, 13, work);
|
||||
ordinalTable = Zi8GetTableAddress(1, 14, work);
|
||||
if (pinyin) {
|
||||
phonetics = (ziU8*)Zi8GetTableAddress(1, 3, work);
|
||||
phonetics = Zi8GetTableAddress(1, 3, work);
|
||||
phoneticCount = Zi8GetTableCount(1, 3, work);
|
||||
phoneticGroups = (ziU8*)Zi8GetTableAddress(1, 17, work);
|
||||
phoneticGroups = Zi8GetTableAddress(1, 17, work);
|
||||
groupCount = Zi8GetTableCount(1, 17, work);
|
||||
candidateGroups = (ziU8*)Zi8GetTableAddress(1, 18, work);
|
||||
candidateGroups = Zi8GetTableAddress(1, 18, work);
|
||||
} else {
|
||||
phonetics = (ziU8*)Zi8GetTableAddress(1, 4, work);
|
||||
phonetics = Zi8GetTableAddress(1, 4, work);
|
||||
phoneticCount = Zi8GetTableCount(1, 4, work);
|
||||
phoneticGroups = (ziU8*)Zi8GetTableAddress(1, 19, work);
|
||||
phoneticGroups = Zi8GetTableAddress(1, 19, work);
|
||||
groupCount = Zi8GetTableCount(1, 19, work);
|
||||
candidateGroups = (ziU8*)Zi8GetTableAddress(1, 20, work);
|
||||
candidateGroups = Zi8GetTableAddress(1, 20, work);
|
||||
}
|
||||
|
||||
if (groupCount) {
|
||||
@@ -2782,12 +2782,12 @@ next_group_candidate:
|
||||
}
|
||||
}
|
||||
if (stopAfterTone) {
|
||||
matchedRecord = (ziU8*)(records + character);
|
||||
matchedRecord = records + character;
|
||||
matchedLength = 0;
|
||||
matchedString = 0;
|
||||
if (!Zi8MatchPhonetic(phonetics, (ziU8*)records, indexTable, indexCount,
|
||||
(ziU32)dictionary, matchedRecord, &mask, &match,
|
||||
&matchedLength, &matchedRecord, &matchedString,
|
||||
matchedIndex = 0;
|
||||
if (!Zi8MatchPhonetic(phonetics, records, indexTable, indexCount,
|
||||
dictionary, matchedRecord, &mask, &match,
|
||||
&matchedLength, &matchedRecord, &matchedIndex,
|
||||
wordMode, 1, 1, excludedMask, excludedMatch,
|
||||
charset, request->getOptions & 0x40, character,
|
||||
&matchedTone, 0, work)) {
|
||||
|
||||
@@ -62,7 +62,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
ziU8 Zi8IsZicorpSignature(ziU16* p, ziU16 len ZI_NEED_WORK) {
|
||||
ziU8 Zi8IsZicorpSignature(ziU16* p, ziU16 len) {
|
||||
if ((ziU16)len > 6 && p[0] == 0x7A && p[1] == 0x69 && p[2] == 0x63 &&
|
||||
p[3] == 0x6F && p[4] == 0x72 && p[5] == 0x70) {
|
||||
return 1;
|
||||
|
||||
@@ -254,7 +254,7 @@ ziBool Zi8PriMatchNextComp(ziU8* node, ziU8 mask0, ziU8 value0, ziU8 mask1, ziU8
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziBool Zi8SecMatchComp(ziPtr nodeAddress, ziMatchParam* matchAddress, ziPtr dictionaryAddress ZI_NEED_WORK) {
|
||||
ziBool Zi8SecMatchComp(ziPtr nodeAddress, ziMatchParam* matchAddress, ziPtr dictionaryAddress) {
|
||||
int chainIndex;
|
||||
ziU16 matchCode;
|
||||
ziU16 targetCode;
|
||||
@@ -506,7 +506,7 @@ pinyin_initial:
|
||||
convertedCount = Zi8PinyinInitials[value];
|
||||
if (convertedCount != 0) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount += 1;
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
@@ -526,7 +526,7 @@ pinyin_initial:
|
||||
value = *current;
|
||||
if (value != 0x68 && value != 0xF368) goto scan_final;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount += 1;
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
final[outputIndex] += 0x200;
|
||||
*bestInitial = initial[0];
|
||||
@@ -567,7 +567,7 @@ scan_final:
|
||||
value -= 0xF361;
|
||||
if (value > 0x19) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount += 1;
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
@@ -577,7 +577,7 @@ scan_final:
|
||||
pinyin[index] = (ziU8)value + 1;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) goto try_final_extension;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount += 1;
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
current++;
|
||||
index++;
|
||||
@@ -592,7 +592,7 @@ try_final_extension:
|
||||
pinyin[index + 1] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount += 1;
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
pinyin[index + 1] = 0;
|
||||
current++;
|
||||
@@ -615,7 +615,7 @@ try_final_extension:
|
||||
finish_final:
|
||||
if ((index > 3) && (count != 0) && (((value = *current) == 0x27) || (value == 0xF360) || (value == 0x20))) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount += 1;
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
current++;
|
||||
count--;
|
||||
@@ -705,10 +705,11 @@ finish_final:
|
||||
}
|
||||
}
|
||||
}
|
||||
if (++outputIndex > 0xf) break;
|
||||
outputIndex++;
|
||||
if (outputIndex > 0xf) break;
|
||||
}
|
||||
if ((result > 1) && (text[*resultCount - 1] >= 0xF341) && (text[*resultCount - 1] <= 0xF35A)) {
|
||||
*resultCount -= 1;
|
||||
*resultCount = *resultCount - 1;
|
||||
}
|
||||
return result;
|
||||
|
||||
@@ -742,9 +743,9 @@ check_row:
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU8 Zi8GetBpmfPhonetic(ziWChar* text, ziU8 count, ziU16* initial, ziU16* final, ziU16* bestInitial, ziU16* bestFinal ZI_NEED_WORK) {
|
||||
ziS32 Zi8GetBpmfPhonetic(ziWChar* text, ziU8 count, ziU16* initial, ziU16* final, ziU16* bestInitial, ziU16* bestFinal ZI_NEED_WORK) {
|
||||
ziU16 value;
|
||||
ziU8 resultCount = 0;
|
||||
ziU32 resultCount = 0;
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (count == 0) {
|
||||
|
||||
@@ -17,7 +17,7 @@ typedef struct ziPudHeader {
|
||||
ziU8 options[4];
|
||||
ziPudSection sections[1];
|
||||
} ziPudHeader;
|
||||
ziU8 Zi8_8147FD7C(ziWChar*, ziU8, ziU8, ziWChar*, ziU16, ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU32 Zi8_8147FD7C(ziWChar*, ziU8, ziU8, ziWChar*, ziU16, ziU8, ziU8 ZI_NEED_WORK);
|
||||
|
||||
ziU32 ZiIsPhoneticChar(ziWChar character) {
|
||||
if ((character < 0xF305 || character > 0xF329) && (character < 0xF361 || character > 0xF37A)) return 0;
|
||||
@@ -56,11 +56,8 @@ ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option, struct __zi8_work_data_s* __zi8_work_da
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return previous;
|
||||
}
|
||||
ziU8 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziWChar* spelling, ziU16 spellingCapacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
struct {
|
||||
int fallback;
|
||||
ziPtr workspace;
|
||||
} match;
|
||||
ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziWChar* spelling, ziU16 spellingCapacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
int fallback = 0;
|
||||
ziU8* bytePattern;
|
||||
ziWChar folded;
|
||||
ziPudSection* section;
|
||||
@@ -71,8 +68,6 @@ ziU8 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
ziU32 entrySize;
|
||||
ziPudHeader* table;
|
||||
ziU8* byteOutput;
|
||||
match.workspace = __zi8_work_data;
|
||||
match.fallback = 0;
|
||||
if (!(ZI_WORK->pudCount <= 16 && ZI_WORK->pudCount != 0 && ZI_WORK->pudTable[ZI_WORK->pudCount - 1] != 0)) {
|
||||
Zi8LogError(0x4B0, __zi8_work_data);
|
||||
return 0;
|
||||
@@ -93,8 +88,8 @@ ziU8 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
Zi8LogError(0x4F6, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ZI_WORK->unk_0x314 = ((ziU16)section->count[0] << 8) + (ziU16)section->count[1];
|
||||
ZI_WORK->unk_0x310 = (ziU32)table + (((ziU16)section->offset[0] << 8) + (ziU16)section->offset[1]);
|
||||
ZI_WORK->unk_0x314 = section->count[0] * 0x100 + section->count[1];
|
||||
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
for (;;) {
|
||||
@@ -135,7 +130,7 @@ matchText:
|
||||
}
|
||||
}
|
||||
matched:
|
||||
if (match.fallback) {
|
||||
if (fallback) {
|
||||
ZI_WORK->unk_0x310 = 0;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
ZI_WORK->unk_0x314 = 0;
|
||||
@@ -169,7 +164,7 @@ matched:
|
||||
}
|
||||
if (length == 1 && complete != 0 && continuation == 0) {
|
||||
complete = 0;
|
||||
match.fallback = 1;
|
||||
fallback = 1;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
} else {
|
||||
ZI_WORK->unk_0x310 = 0;
|
||||
@@ -179,12 +174,12 @@ matched:
|
||||
}
|
||||
}
|
||||
}
|
||||
ziU8 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation, struct __zi8_work_data_s* __zi8_work_data) {
|
||||
ziU8 result;
|
||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation, struct __zi8_work_data_s* __zi8_work_data) {
|
||||
ziU32 result;
|
||||
if (continuation == 0) __zi8_work_data->pudCount = 1;
|
||||
for (;;) {
|
||||
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
||||
if (result != 0) break;
|
||||
if ((ziU8)result != 0) break;
|
||||
if (++__zi8_work_data->pudCount <= 16) {
|
||||
continuation = 0;
|
||||
} else {
|
||||
@@ -194,6 +189,6 @@ ziU8 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* outp
|
||||
}
|
||||
return result;
|
||||
}
|
||||
ziU8 Zi8_8147FD7C(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
ziU32 Zi8_8147FD7C(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
return Zi8MatchPUDdata_ZHS(pattern, length, language, output, capacity, 0, 0, complete, continuation, __zi8_work_data);
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include <zi8clib/zitypes.h>
|
||||
|
||||
ziU16 Zi8GetVersion(ziPtr __zi8_work_data) {
|
||||
ziU16 Zi8GetVersion() {
|
||||
return 1802;
|
||||
}
|
||||
|
||||
ziU16 Zi8GetBuildID(ziPtr __zi8_work_data) {
|
||||
ziU16 Zi8GetBuildID() {
|
||||
return 41;
|
||||
}
|
||||
|
||||
ziU16 Zi8GetOEMID(ziPtr __zi8_work_data) {
|
||||
ziU16 Zi8GetOEMID() {
|
||||
return 249;
|
||||
}
|
||||
|
||||
@@ -11,15 +11,15 @@ typedef struct {
|
||||
ziU8 characterLow;
|
||||
} ZiKoreanKeyEntry;
|
||||
|
||||
ziU16 Zi8_8148302C(ziU16 key, ziU8* table ZI_NEED_WORK) {
|
||||
ziU32 Zi8_8148302C(ziU16 key, ziU8* table ZI_NEED_WORK) {
|
||||
ziU32 value;
|
||||
ziU16 count;
|
||||
ziU16 i;
|
||||
ziU32 i;
|
||||
|
||||
count = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
for (i = 0; i < count; i++) {
|
||||
value = (ziU16)(((ziU16)table[(i << 3) + i + 7] << 8) |
|
||||
table[(i << 3) + i + 8]);
|
||||
for (i = 0; (ziU16)i < count; i++) {
|
||||
value = (ziU16)(((ziU16)table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 7] << 8) |
|
||||
table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 8]);
|
||||
if (value == key) {
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
return i;
|
||||
@@ -119,19 +119,28 @@ ziU32 Zi8_814833F0(const ziGetParam* param, ziU16 key ZI_NEED_WORK) {
|
||||
|
||||
ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
ziU8* inserted ZI_NEED_WORK) {
|
||||
ziU8* tableA;
|
||||
ziU8* tableB;
|
||||
ZiKoreanKeyEntry* entry;
|
||||
ziS32 compactIndex;
|
||||
ziU16 tableCount;
|
||||
ziU32 j = 0;
|
||||
ziU8 candidateIndex = 0;
|
||||
ziU8 matched = 0;
|
||||
ziBool matches;
|
||||
ziU8 keys[5] = {0};
|
||||
struct {
|
||||
ziBool matches;
|
||||
ziU8 candidateIndex;
|
||||
ziU16 tableCount;
|
||||
ziS32 compactIndex;
|
||||
ZiKoreanKeyEntry* entry;
|
||||
ziU8* tableB;
|
||||
ziU8* tableA;
|
||||
union {
|
||||
ziU32 firstWord;
|
||||
ziU8 bytes[5];
|
||||
} keys;
|
||||
} filter;
|
||||
ziU32 j;
|
||||
ziS32 i;
|
||||
ziS32 candidate;
|
||||
ziU8 matched;
|
||||
|
||||
j = 0;
|
||||
filter.candidateIndex = 0;
|
||||
matched = 0;
|
||||
filter.keys.bytes[4] = filter.keys.firstWord = 0;
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->elementCount == 0) {
|
||||
if (*remaining >= *count) {
|
||||
@@ -157,40 +166,40 @@ ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
return 0;
|
||||
}
|
||||
|
||||
tableA = (ziU8*)Zi8GetTableAddress(param->language, 9, ZI_WORK);
|
||||
tableB = (ziU8*)Zi8GetTableAddress(param->language, 10, ZI_WORK);
|
||||
if (tableA == 0) {
|
||||
filter.tableA = (ziU8*)Zi8GetTableAddress(param->language, 9, ZI_WORK);
|
||||
filter.tableB = (ziU8*)Zi8GetTableAddress(param->language, 10, ZI_WORK);
|
||||
if (filter.tableA == 0) {
|
||||
Zi8ReplaceLastError(0x76C, ZI_WORK);
|
||||
return 0;
|
||||
} else if (tableB == 0) {
|
||||
} else if (filter.tableB == 0) {
|
||||
Zi8ReplaceLastError(0x776, ZI_WORK);
|
||||
return 0;
|
||||
} else {
|
||||
tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, keys);
|
||||
filter.tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, filter.keys.bytes);
|
||||
i = 0;
|
||||
while (i < tableCount && matched < *count) {
|
||||
matches = ZI8_TRUE;
|
||||
entry = (ZiKoreanKeyEntry*)&tableA[(i << 3) + i];
|
||||
while (i < filter.tableCount && matched < *count) {
|
||||
filter.matches = ZI8_TRUE;
|
||||
filter.entry = (ZiKoreanKeyEntry*)&filter.tableA[(i << 3) + i];
|
||||
j = 0;
|
||||
if (param->elementCount > 1) {
|
||||
for (j = 0; (int)(j & 0xFF) < (int)param->elementCount / 2; j++) {
|
||||
if (keys[j & 0xFF] != entry->keyBytes[j & 0xFF]) {
|
||||
matches = ZI8_FALSE;
|
||||
if (filter.keys.bytes[j & 0xFF] != filter.entry->keyBytes[j & 0xFF]) {
|
||||
filter.matches = ZI8_FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (matches && (param->elementCount % 2) != 0 &&
|
||||
((keys[j & 0xFF] & 0xF0) != (entry->keyBytes[j & 0xFF] & 0xF0))) {
|
||||
matches = ZI8_FALSE;
|
||||
if (filter.matches && (param->elementCount % 2) != 0 &&
|
||||
((filter.keys.bytes[j & 0xFF] & 0xF0) != (filter.entry->keyBytes[j & 0xFF] & 0xF0))) {
|
||||
filter.matches = ZI8_FALSE;
|
||||
}
|
||||
if (matches) {
|
||||
for (candidateIndex = 0; candidateIndex < *count; candidateIndex++) {
|
||||
if (param->candidates[candidateIndex] ==
|
||||
(((ziU16)((ZiKoreanKeyEntry*)tableA)[i].characterHigh << 8) | (ziU16)((ZiKoreanKeyEntry*)tableA)[i].characterLow)) {
|
||||
if (filter.matches) {
|
||||
for (filter.candidateIndex = 0; filter.candidateIndex < *count; filter.candidateIndex++) {
|
||||
if (param->candidates[filter.candidateIndex] ==
|
||||
(((ziU16)((ZiKoreanKeyEntry*)filter.tableA)[i].characterHigh << 8) | (ziU16)((ZiKoreanKeyEntry*)filter.tableA)[i].characterLow)) {
|
||||
matched++;
|
||||
param->candidates[candidateIndex] &= 0x7FFF;
|
||||
param->candidates[filter.candidateIndex] &= 0x7FFF;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -216,10 +225,10 @@ ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
}
|
||||
*remaining = 0;
|
||||
} else {
|
||||
for (compactIndex = 0; compactIndex < *count; compactIndex++) {
|
||||
if ((param->candidates[compactIndex] & 0x8000) == 0) {
|
||||
param->candidates[compactIndex] |= 0x8000;
|
||||
Zi8_81483308(param, param->candidates[compactIndex], inserted, ZI_WORK);
|
||||
for (filter.compactIndex = 0; filter.compactIndex < *count; filter.compactIndex++) {
|
||||
if ((param->candidates[filter.compactIndex] & 0x8000) == 0) {
|
||||
param->candidates[filter.compactIndex] |= 0x8000;
|
||||
Zi8_81483308(param, param->candidates[filter.compactIndex], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
*remaining = *remaining - matched;
|
||||
@@ -278,7 +287,8 @@ ziU32 Zi8GetKOcandidates(ziGetParam* param, ZiKoreanCandidateOptions* options ZI
|
||||
search.resultCount = 0;
|
||||
search.packedKeys.firstWord = 0;
|
||||
search.packedKeys.bytes[4] = 0;
|
||||
search.wordIndex = search.remainingLetters = 0;
|
||||
search.remainingLetters = 0;
|
||||
search.wordIndex = 0;
|
||||
search.candidateCount = 0;
|
||||
search.keyByte = 0;
|
||||
search.remainingCandidates = param->firstCandidate;
|
||||
@@ -303,8 +313,7 @@ ziU32 Zi8GetKOcandidates(ziGetParam* param, ZiKoreanCandidateOptions* options ZI
|
||||
param->candidates[0] = 0;
|
||||
}
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
if (param->wordCharCount == 0) goto scan_key_table;
|
||||
{
|
||||
if (param->wordCharCount != 0) {
|
||||
if (((search.keyIndex = Zi8_8148302C(param->currentWord[0], keyTable, ZI_WORK)) != 0xFFFF) &&
|
||||
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 8) != 0)) {
|
||||
search.wordOffset = ((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childLow |
|
||||
@@ -429,7 +438,6 @@ search_table:
|
||||
param->count = search.candidateCount;
|
||||
param->letters = search.candidateCount;
|
||||
}
|
||||
scan_key_table:
|
||||
if (param->elementCount > 9) {
|
||||
param->letters = 0;
|
||||
return 0;
|
||||
|
||||
@@ -21,7 +21,6 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
ziWChar bestFinal;
|
||||
ziWChar previousInitial;
|
||||
ziWChar previousFinal;
|
||||
ziBool hasComponent;
|
||||
ziU8 elementCount;
|
||||
ziU8 elementIndex;
|
||||
ziU8 stroke;
|
||||
@@ -44,7 +43,6 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
stroke = 0;
|
||||
contextMask = 0x20;
|
||||
Zi8Memset(match,0,0x1ee);
|
||||
hasComponent = 0;
|
||||
nibbles = 0;
|
||||
elementIndex = 0;
|
||||
elementCount = request->elementCount;
|
||||
@@ -60,15 +58,13 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
}
|
||||
}
|
||||
if (elementCount != 0) {
|
||||
element = request->elements[0];
|
||||
match->comp = element;
|
||||
match->comp = element = request->elements[0];
|
||||
if (Zi8IsComponent(element,__zi8_work_data) != 0) {
|
||||
elementIndex++;
|
||||
hasComponent = 1;
|
||||
buffers.component = (ziU8*)Zi8GetTableAddress(1,2,__zi8_work_data);
|
||||
buffers.componentIndex = (ziU8*)Zi8GetTableAddress(1,6,__zi8_work_data);
|
||||
buffers.componentIndex += (element - 0xef10) * 2;
|
||||
match->field22 = ((buffers.componentIndex[1] & 0x3f) << 8) + *buffers.componentIndex;
|
||||
match->field22 = (((ziU16)buffers.componentIndex[1] & 0x3f) << 8) + *buffers.componentIndex;
|
||||
buffers.component += (ziU32)match->field22 * 8;
|
||||
switch(*buffers.component & 0xf) {
|
||||
case 0:
|
||||
@@ -223,14 +219,13 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
Zi8Memcpy((ziU8 (*)[12])match->segs1 + match->nSeg,buffers.masks,0xc);
|
||||
Zi8Memcpy((ziU8 (*)[12])match->segsD + match->nSeg,buffers.strokes,0xc);
|
||||
match->nSeg++;
|
||||
if (stroke != 0xff || elementIndex >= elementCount || match->nSeg >= 0x10) break;
|
||||
if (stroke != 0xff || elementIndex >= elementCount || match->nSeg >= 0x10) goto complete;
|
||||
Zi8Memset(buffers.masks,0,0xc);
|
||||
Zi8Memset(buffers.strokes,0,0xc);
|
||||
buffers.masks[0] = match->arr1[0] & 0xf0;
|
||||
buffers.strokes[0] = match->arrD[0] & 0xf0;
|
||||
nibbles = 1;
|
||||
} while (1);
|
||||
return 1;
|
||||
}
|
||||
match->length = nibbles;
|
||||
if (elementCount != 0) {
|
||||
@@ -249,13 +244,15 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
else {
|
||||
initial = 0;
|
||||
final = 0;
|
||||
bestFinal = bestInitial = 0;
|
||||
previousFinal = previousInitial = 0;
|
||||
bestInitial = 0;
|
||||
bestFinal = 0;
|
||||
previousInitial = 0;
|
||||
previousFinal = 0;
|
||||
buffers.phoneticInput = request->elements;
|
||||
match->nCand = 0;
|
||||
request->completion = request->elementCount;
|
||||
phoneticLength = 1;
|
||||
for (index = 0; index < elementCount;) {
|
||||
for (index = 0; index < elementCount; index++) {
|
||||
stroke = Zi8GetBpmfPhonetic(buffers.phoneticInput,phoneticLength,&initial,&final,&bestInitial,&bestFinal,
|
||||
__zi8_work_data);
|
||||
if (stroke != 0) {
|
||||
@@ -283,8 +280,10 @@ savePhonetic:
|
||||
}
|
||||
if (buffers.phoneticInput[phoneticLength - 1] == 0xF360) {
|
||||
match->nCand--;
|
||||
bestInitial = initial = previousInitial;
|
||||
bestFinal = final = previousFinal;
|
||||
bestInitial = previousInitial;
|
||||
bestFinal = previousFinal;
|
||||
final = bestFinal;
|
||||
initial = bestInitial;
|
||||
goto savePhonetic;
|
||||
}
|
||||
if (match->nCand == 1) {
|
||||
@@ -294,7 +293,6 @@ savePhonetic:
|
||||
phoneticLength = 0;
|
||||
index--;
|
||||
}
|
||||
index++;
|
||||
phoneticLength++;
|
||||
}
|
||||
if (elementCount != 0) {
|
||||
@@ -333,5 +331,6 @@ savePhonetic:
|
||||
}
|
||||
}
|
||||
}
|
||||
complete:
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -6,6 +6,11 @@ typedef struct FA_NAND_ATTACH {
|
||||
u32 size;
|
||||
} FA_NAND_ATTACH;
|
||||
|
||||
typedef struct FA_ATTACH_REQUEST {
|
||||
FADrvTbl* table;
|
||||
u32 count;
|
||||
} FA_ATTACH_REQUEST;
|
||||
|
||||
FADisk* gOpenDisk[26];
|
||||
FAPartition* gOpenPartition[26];
|
||||
typedef struct FA_DISK_INIT {
|
||||
@@ -29,13 +34,13 @@ static struct {
|
||||
} drvInitFunc = {diskInitTbl, 3};
|
||||
extern s32 pdm_open_disk(FA_DISK_INIT* table, FADisk** disk);
|
||||
extern s32 pdm_open_partition(FADisk* disk, u32 index, FAPartition** partition);
|
||||
extern s32 pfstub_attach(FADrvTbl** drives, const void* nand_data);
|
||||
extern s32 pfstub_attach(FA_ATTACH_REQUEST* request, FA_NAND_ATTACH* nand);
|
||||
extern s32 pfd_sddrv_is_media_insert(void);
|
||||
extern s32 pfd_mscdrv_is_media_insert(FADisk* disk);
|
||||
extern s32 pfd_mscdrv_is_media_insert(void);
|
||||
|
||||
FAError FAAttach(u32 device, char* nand_path, u32 nand_size, FADrvTbl* table) {
|
||||
FADisk* disk;
|
||||
FADrvTbl* drives[2];
|
||||
FA_ATTACH_REQUEST request;
|
||||
FA_NAND_ATTACH nand;
|
||||
s32 error;
|
||||
s32 index;
|
||||
@@ -60,16 +65,16 @@ FAError FAAttach(u32 device, char* nand_path, u32 nand_size, FADrvTbl* table) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
drives[0] = table;
|
||||
drives[1] = NULL;
|
||||
request.table = table;
|
||||
request.count = 0;
|
||||
if (device == 2) {
|
||||
memcpy(nand.path, nand_path, 78);
|
||||
nand.size = nand_size;
|
||||
}
|
||||
if (device == 2) {
|
||||
error = pfstub_attach(drives, &nand);
|
||||
error = pfstub_attach(&request, &nand);
|
||||
} else {
|
||||
error = pfstub_attach(drives, NULL);
|
||||
error = pfstub_attach(&request, NULL);
|
||||
}
|
||||
if (error != 0) {
|
||||
return -1;
|
||||
@@ -80,11 +85,11 @@ FAError FAAttach(u32 device, char* nand_path, u32 nand_size, FADrvTbl* table) {
|
||||
gOpenPartition[index] = table->pPart;
|
||||
if (device == 0) {
|
||||
if (pfd_sddrv_is_media_insert()) {
|
||||
drives[0]->stat |= 0x10;
|
||||
request.table->stat |= 0x10;
|
||||
}
|
||||
} else if (device == 1) {
|
||||
if (pfd_mscdrv_is_media_insert(disk)) {
|
||||
drives[0]->stat |= 0x10;
|
||||
if (pfd_mscdrv_is_media_insert()) {
|
||||
request.table->stat |= 0x10;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
static FAEjectCallback g_detach_func;
|
||||
static FAInsertCallback g_attach_func;
|
||||
|
||||
extern s32 uhf_msc_is_media_insert(FADisk* disk);
|
||||
extern s32 uhf_msc_is_media_insert(void);
|
||||
|
||||
s32 pfd_mscdrv_registar_callback(FAInsertCallback insert, FAEjectCallback eject) {
|
||||
g_attach_func = insert;
|
||||
@@ -11,6 +11,6 @@ s32 pfd_mscdrv_registar_callback(FAInsertCallback insert, FAEjectCallback eject)
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_mscdrv_is_media_insert(FADisk* disk) {
|
||||
return uhf_msc_is_media_insert(disk);
|
||||
s32 pfd_mscdrv_is_media_insert(void) {
|
||||
return uhf_msc_is_media_insert();
|
||||
}
|
||||
|
||||
@@ -318,58 +318,58 @@ s32 pfd_sddrv_init(FADisk* disk) {
|
||||
}
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 1) != 0) {
|
||||
OSReport("INFO SD Card driver is already initialize. pfd_sddrv_init()\n");
|
||||
if (disk != g_pfd_sddrv_info.disk) {
|
||||
return -44;
|
||||
if (disk == g_pfd_sddrv_info.disk) {
|
||||
return 0;
|
||||
}
|
||||
return -44;
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 4) == 0) {
|
||||
g_pfd_sddrv_info.bytes_per_sector = 0x200;
|
||||
pf_memset(&g_pfd_sddev, 0, 0x28);
|
||||
sd_result = ISD_InitCard();
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR:Failed to init SD Card Driver in pfd_sddrv_init()\n");
|
||||
return -40;
|
||||
}
|
||||
g_pfd_sddrv_info.flags |= 4;
|
||||
}
|
||||
pf_memset(&g_pfd_sddev, 0, 0x28);
|
||||
device = &g_pfd_sddev.device;
|
||||
sd_result = ISD_MountCard(0, &device);
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR SD card can not mount [ret = 0x%x]. pfd_sddrv_init()\n", sd_result);
|
||||
return -41;
|
||||
}
|
||||
sd_result = ISD_GetDeviceStatus(device, &status);
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR Failed to get sd card status. [ret = 0x%x]\n", sd_result);
|
||||
return 21;
|
||||
}
|
||||
if ((status & 1) != 0) {
|
||||
g_pfd_sddrv_info.media_inserted = 1;
|
||||
}
|
||||
g_pfd_sddrv_info.device = device;
|
||||
if (g_pfd_sddrv_info.media_inserted != 0) {
|
||||
g_event = 2;
|
||||
sd_result = ISD_RegisterDeviceIntrHandler(device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler1 [ret = 0x%x] pfd_sddrv_init()\n", sd_result);
|
||||
ISD_UnmountCard(device);
|
||||
g_pfd_sddrv_info.device = 0;
|
||||
return -42;
|
||||
}
|
||||
} else {
|
||||
if ((g_pfd_sddrv_info.flags & 4) == 0) {
|
||||
g_pfd_sddrv_info.bytes_per_sector = 0x200;
|
||||
pf_memset(&g_pfd_sddev, 0, 0x28);
|
||||
sd_result = ISD_InitCard();
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR:Failed to init SD Card Driver in pfd_sddrv_init()\n");
|
||||
return -40;
|
||||
}
|
||||
g_pfd_sddrv_info.flags |= 4;
|
||||
}
|
||||
pf_memset(&g_pfd_sddev, 0, 0x28);
|
||||
device = &g_pfd_sddev.device;
|
||||
sd_result = ISD_MountCard(0, &device);
|
||||
g_event = 1;
|
||||
sd_result = ISD_RegisterDeviceIntrHandler(device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR SD card can not mount [ret = 0x%x]. pfd_sddrv_init()\n", sd_result);
|
||||
return -41;
|
||||
OSReport("ERR:Failed to regist intr handler1 [ret = 0x%x] pfd_sddrv_init()\n", sd_result);
|
||||
ISD_UnmountCard(device);
|
||||
g_pfd_sddrv_info.device = 0;
|
||||
return -42;
|
||||
}
|
||||
sd_result = ISD_GetDeviceStatus(device, &status);
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR Failed to get sd card status. [ret = 0x%x]\n", sd_result);
|
||||
return 21;
|
||||
}
|
||||
if ((status & 1) != 0) {
|
||||
g_pfd_sddrv_info.media_inserted = 1;
|
||||
}
|
||||
g_pfd_sddrv_info.device = device;
|
||||
if (g_pfd_sddrv_info.media_inserted != 0) {
|
||||
g_event = 2;
|
||||
sd_result = ISD_RegisterDeviceIntrHandler(device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler1 [ret = 0x%x] pfd_sddrv_init()\n", sd_result);
|
||||
ISD_UnmountCard(device);
|
||||
g_pfd_sddrv_info.device = 0;
|
||||
return -42;
|
||||
}
|
||||
} else {
|
||||
g_event = 1;
|
||||
sd_result = ISD_RegisterDeviceIntrHandler(device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
|
||||
if (sd_result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler1 [ret = 0x%x] pfd_sddrv_init()\n", sd_result);
|
||||
ISD_UnmountCard(device);
|
||||
g_pfd_sddrv_info.device = 0;
|
||||
return -42;
|
||||
}
|
||||
}
|
||||
g_pfd_sddrv_info.disk = disk;
|
||||
g_pfd_sddrv_info.flags |= 1;
|
||||
}
|
||||
g_pfd_sddrv_info.disk = disk;
|
||||
g_pfd_sddrv_info.flags |= 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -749,8 +749,7 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
|
||||
minimum_multiplier = multiplier >= 9 ? multiplier : 9;
|
||||
max_multiplier = minimum_multiplier <= 11 ? minimum_multiplier : 11;
|
||||
multiplier_factor = 1;
|
||||
max_multiplier = (u16)(max_multiplier - 9);
|
||||
multiplier_factor = (u16)(multiplier_factor << max_multiplier);
|
||||
multiplier_factor <<= (u16)(max_multiplier - 9);
|
||||
*sectors = cluster_blocks * multiplier_factor;
|
||||
} else {
|
||||
*sectors = ((csd[1] >> 8 & 0x3fffff) + 1) * 0x400;
|
||||
@@ -1361,20 +1360,19 @@ s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
|
||||
|
||||
static s32 pfd_sddrv_store_fat32_reserved_buf(u8* sector_buffer) {
|
||||
PFD_SDDRV_RESERVED_BOOT_SECTOR* reserved_boot_sector;
|
||||
s32 result = -30;
|
||||
|
||||
if (sector_buffer != 0) {
|
||||
pf_memset(sector_buffer, 0, 0x200);
|
||||
reserved_boot_sector = (PFD_SDDRV_RESERVED_BOOT_SECTOR*)sector_buffer;
|
||||
if (((u32)reserved_boot_sector->signature.bytes & 1) != 0) {
|
||||
reserved_boot_sector->signature.bytes[0] = 0x55;
|
||||
reserved_boot_sector->signature.bytes[1] = 0xaa;
|
||||
} else {
|
||||
reserved_boot_sector->signature.value = 0x55aa;
|
||||
}
|
||||
result = 0;
|
||||
if (sector_buffer == 0) {
|
||||
return -30;
|
||||
}
|
||||
return result;
|
||||
pf_memset(sector_buffer, 0, 0x200);
|
||||
reserved_boot_sector = (PFD_SDDRV_RESERVED_BOOT_SECTOR*)sector_buffer;
|
||||
if (((u32)reserved_boot_sector->signature.bytes & 1) != 0) {
|
||||
reserved_boot_sector->signature.bytes[0] = 0x55;
|
||||
reserved_boot_sector->signature.bytes[1] = 0xaa;
|
||||
} else {
|
||||
reserved_boot_sector->signature.value = 0x55aa;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_build_fat32_mbr_bpb(u32 total_sectors) {
|
||||
|
||||
@@ -1,32 +1,25 @@
|
||||
#include <private/fa/pdm.h>
|
||||
#include <revolution/types.h>
|
||||
#define MBR_WORD(buf, offset) \
|
||||
((pf_u32)(buf)[offset] + ((pf_u32)(buf)[(offset) + 1] << 8) + \
|
||||
((pf_u32)(buf)[(offset) + 2] << 16) + ((pf_u32)(buf)[(offset) + 3] << 24))
|
||||
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 2] << 16) + ((pf_u32)(buf)[(offset) + 1] << 8) + (buf)[offset])
|
||||
static inline pf_u16 read_boot_u16(pf_u8* buf, pf_u32 offset) {
|
||||
if ((pf_u32)&buf[offset] & 1) { return (buf[offset + 1] << 8) | buf[offset]; }
|
||||
return PF_SWAP_16(*(pf_u16*)&buf[(offset + 1) & ~1]);
|
||||
}
|
||||
|
||||
static inline pf_u32 read_partition_u32(const pf_u8* buf, pf_u32 offset) {
|
||||
return (((pf_u32)buf[offset + 2] << 16) + buf[offset]) +
|
||||
(((pf_u32)buf[offset + 3] << 24) + ((pf_u32)buf[offset + 1] << 8));
|
||||
}
|
||||
|
||||
pf_s32 pdm_part_is_master_boot_sector(pf_u8* buf, pf_u32 total, pf_bool* p_is_mbr) {
|
||||
pf_u32* p_start;
|
||||
pf_u32* p_count;
|
||||
pf_s16 index;
|
||||
pf_u32 start[4];
|
||||
pf_u32 count[4];
|
||||
pf_u32* p_start;
|
||||
pf_u32* p_count;
|
||||
*p_is_mbr = 0;
|
||||
if (buf[510] != 0x55 || buf[511] != 0xAA) { return 2; }
|
||||
p_start = start;
|
||||
p_count = count;
|
||||
for (index = 0; index < 4; index++) {
|
||||
*p_start = 0;
|
||||
*p_start = read_partition_u32(buf, 454);
|
||||
*p_count = read_partition_u32(buf, 458);
|
||||
*p_start = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
|
||||
*p_count = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
|
||||
if (*p_start != 0 && *p_count != 0) {
|
||||
if (index == 0) { *p_is_mbr = 1; }
|
||||
} else {
|
||||
@@ -78,20 +71,15 @@ pf_bool pdm_part_is_boot_sector(pf_u8* buf) {
|
||||
return is_boot;
|
||||
}
|
||||
|
||||
static inline pf_u32 read_relative_start_sector(pf_u32 base, const pf_u8* buf, pf_u32 offset) {
|
||||
return base + (buf[offset] + ((unsigned int)buf[offset + 1] << 8) +
|
||||
((unsigned int)buf[offset + 2] << 16) + ((unsigned int)buf[offset + 3] << 24));
|
||||
}
|
||||
|
||||
pf_s32 pdm_part_get_start_sector(PDM_PARTITION* p_part) {
|
||||
pf_u32 part_index = 0;
|
||||
pf_u32 requested = p_part->part_id;
|
||||
pf_u32 start[4];
|
||||
pf_u32 count[4];
|
||||
pf_u32 part_index = 0;
|
||||
pf_u32 sector;
|
||||
pf_u32 base;
|
||||
pf_u16 index;
|
||||
pf_u16 extended_index;
|
||||
pf_u32 base;
|
||||
pf_u32 sector;
|
||||
pf_u32 length;
|
||||
pf_bool is_mbr;
|
||||
pf_u32 success;
|
||||
@@ -124,14 +112,14 @@ pf_s32 pdm_part_get_start_sector(PDM_PARTITION* p_part) {
|
||||
sector = base;
|
||||
for (extended_index = 0; extended_index < 2; extended_index++) {
|
||||
if (extended_index == 0) {
|
||||
sector = read_relative_start_sector(sector, buf, 454);
|
||||
sector = sector + MBR_WORD(buf, 454);
|
||||
length = MBR_WORD(buf, 458);
|
||||
err = pdm_disk_physical_read(p_part->p_disk, buf, sector, 1, 512, &success);
|
||||
if (err != 0) { return err; }
|
||||
if (requested == part_index) { p_part->start_sector = sector; p_part->total_sector = length; return 0; }
|
||||
part_index++;
|
||||
} else {
|
||||
sector = read_relative_start_sector(base, buf, 470);
|
||||
sector = base + MBR_WORD(buf, 470);
|
||||
length = MBR_WORD(buf, 474);
|
||||
if (sector == 0 || length == 0) { break; }
|
||||
err = pdm_disk_physical_read(p_part->p_disk, buf, sector, 1, 512, &success);
|
||||
|
||||
@@ -550,6 +550,15 @@ pf_s32 PFCACHE_DoWriteSector(PF_VOLUME* p_vol, PF_CACHE_PAGE** pp_head, const pf
|
||||
|
||||
#pragma dont_inline reset
|
||||
|
||||
static inline pf_u32 PFCACHE_RecordPageEndOverlap(PF_CACHE_PAGE* p_page, pf_u32 end_sector, pf_u32* p_num_success, pf_u32* p_num_rest_sector) {
|
||||
pf_u32 last_sector = end_sector - 1;
|
||||
pf_u32 num_overlap = end_sector - p_page->sector;
|
||||
*p_num_success += num_overlap;
|
||||
*p_num_rest_sector -= num_overlap;
|
||||
p_page->stat |= 2;
|
||||
return last_sector;
|
||||
}
|
||||
|
||||
pf_s32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded(PF_VOLUME* p_vol, PF_CACHE_PAGE** pp_head, const pf_u8* p_buf, pf_u32 sector,
|
||||
pf_u32 num_sector, pf_u32* p_num_success) {
|
||||
PF_CACHE_PAGE* p_page = PF_NULL;
|
||||
@@ -557,6 +566,8 @@ pf_s32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded(PF_VOLUME* p_vol, PF_CACHE_PAGE**
|
||||
pf_u32 num_rest_sector = num_sector;
|
||||
pf_u8* p_sbuf;
|
||||
pf_u8* p_ebuf;
|
||||
pf_u32 num_overlap;
|
||||
pf_u32 last_sector;
|
||||
*p_num_success = 0;
|
||||
do {
|
||||
if (p_page == PF_NULL) {
|
||||
@@ -606,10 +617,10 @@ pf_s32 PFCACHE_DoWriteNumSectorAndFreeIfNeeded(PF_VOLUME* p_vol, PF_CACHE_PAGE**
|
||||
(p_page->sector + p_page->size) >= (sector + num_sector)) {
|
||||
pf_memcpy(p_page->buffer, (pf_u8*)&p_buf[(p_page->sector - sector) << p_vol->bpb.log2_bytes_per_sector],
|
||||
(sector + num_sector - p_page->sector) << p_vol->bpb.log2_bytes_per_sector);
|
||||
num_rest_sector -= p_page->size - ((p_page->sector + p_page->size) - (sector + num_sector));
|
||||
*p_num_success += p_page->size - ((p_page->sector + p_page->size) - (sector + num_sector));
|
||||
p_page->stat |= 2;
|
||||
p_ebuf = &p_page->buffer[(p_page->size - ((p_page->sector + p_page->size) - (sector + num_sector)) - 1) << p_vol->bpb.log2_bytes_per_sector];
|
||||
num_overlap = num_sector;
|
||||
num_overlap += sector;
|
||||
last_sector = PFCACHE_RecordPageEndOverlap(p_page, num_overlap, p_num_success, &num_rest_sector);
|
||||
p_ebuf = &p_page->buffer[(last_sector - p_page->sector) << p_vol->bpb.log2_bytes_per_sector];
|
||||
p_page->p_mod_sbuf = p_page->buffer;
|
||||
if (p_page->p_mod_ebuf == NULL || p_page->p_mod_ebuf < p_ebuf) {
|
||||
p_page->p_mod_ebuf = p_ebuf;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#include <revolution/fa/pf_stub.h>
|
||||
|
||||
s32 pfstub_attach(FADrvTbl** drives, const void* nand_data) {
|
||||
s32 pfstub_attach(FADrvTbl* drives, u32 mode) {
|
||||
PF_STUB_MESSAGE message;
|
||||
|
||||
message.operation = 27;
|
||||
message.object = drives;
|
||||
message.callback = NULL;
|
||||
message.data = nand_data;
|
||||
message.data = (void*)mode;
|
||||
if (pfstub_com_massage(&message) == -1) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -557,14 +557,18 @@ static void kbdSendKey(KBDKeyEventData* event) {
|
||||
}
|
||||
}
|
||||
|
||||
static inline u32 kbdChannelFlags(u32 channel) {
|
||||
return kbdData[channel].flags;
|
||||
}
|
||||
|
||||
static void kbd_led_handler(BOOL success, void* callbackArg) {
|
||||
const KBDLEDCallbackData* callback;
|
||||
s32 index;
|
||||
u32 index;
|
||||
u32 err;
|
||||
index = (s32)callbackArg;
|
||||
index = (u32)callbackArg;
|
||||
callback = &kbdLCBuf[index];
|
||||
kbdCmdBuf[index].device = 0;
|
||||
if (callback->callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[(u32)callbackArg].device) {
|
||||
if (callback->callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
|
||||
return;
|
||||
}
|
||||
switch (success) {
|
||||
@@ -575,12 +579,13 @@ static void kbd_led_handler(BOOL success, void* callbackArg) {
|
||||
err = 0;
|
||||
break;
|
||||
}
|
||||
kbdLCBuf[(u32)callbackArg].callbackAddress(err, kbdLCBuf[(u32)callbackArg].callbackArg);
|
||||
kbdLCBuf[index].callbackAddress(err, kbdLCBuf[index].callbackArg);
|
||||
}
|
||||
|
||||
USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback, void* callbackArg) {
|
||||
s32 index;
|
||||
u32 ofs;
|
||||
u8 ledBits;
|
||||
u32 index;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
if (!kbdInitialized) {
|
||||
@@ -589,18 +594,14 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
|
||||
if (channel >= 4) {
|
||||
return 4;
|
||||
}
|
||||
{
|
||||
KBDChannel* data = &kbdData[(s32)channel];
|
||||
if ((s32)data->flags == 1 || (s32)data->flags == 4) {
|
||||
return 5;
|
||||
}
|
||||
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
|
||||
return 5;
|
||||
}
|
||||
ledBits = leds;
|
||||
interrupts = OSDisableInterrupts();
|
||||
for (index = 0; index < 12; index++) {
|
||||
if (kbdCmdBuf[(s32)index].device == 0) {
|
||||
KBDChannel* data = &kbdData[channel];
|
||||
kbdCmdBuf[(s32)index].device = (u32)data->device;
|
||||
for (index = 0, ofs = 0; index < 12; index++, ofs += sizeof(KBDLEDCommand)) {
|
||||
if (*(u32*)&((u8*)kbdCmdBuf)[ofs] == 0) {
|
||||
*(u32*)&((u8*)kbdCmdBuf)[ofs] = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -608,14 +609,11 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
|
||||
if (index == 12) {
|
||||
return 7;
|
||||
}
|
||||
{
|
||||
KBDChannel* data = &kbdData[channel];
|
||||
kbdLCBuf[index].callbackAddress = callback;
|
||||
kbdLCBuf[index].callbackArg = callbackArg;
|
||||
result = USBKBDSetLEDAsync((u32)data->device, ledBits,
|
||||
(USBKBDCmdLEDAsync*)&kbdCmdBuf[index],
|
||||
kbd_led_handler, (void*)index);
|
||||
}
|
||||
kbdLCBuf[index].callbackAddress = callback;
|
||||
kbdLCBuf[index].callbackArg = callbackArg;
|
||||
result = USBKBDSetLEDAsync((u32)kbdData[channel].device, ledBits,
|
||||
(USBKBDCmdLEDAsync*)&kbdCmdBuf[index],
|
||||
kbd_led_handler, (void*)index);
|
||||
switch (result) {
|
||||
default:
|
||||
return 7;
|
||||
@@ -626,6 +624,7 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
|
||||
|
||||
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
u32 index;
|
||||
KBDLEDCommand* command;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
u8 ledBits;
|
||||
@@ -635,16 +634,20 @@ USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
if (channel >= 4) {
|
||||
return 4;
|
||||
}
|
||||
if ((s32)kbdData[(s32)channel].flags == 1 || (s32)kbdData[(s32)channel].flags == 4) {
|
||||
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
|
||||
return 5;
|
||||
}
|
||||
ledBits = leds & 0xff;
|
||||
interrupts = OSDisableInterrupts();
|
||||
for (index = 0; index < 12; index++) {
|
||||
if (kbdCmdBuf[(s32)index].device == 0) {
|
||||
kbdCmdBuf[(s32)index].device = (u32)kbdData[channel].device;
|
||||
index = 0;
|
||||
command = kbdCmdBuf;
|
||||
while (index < 12) {
|
||||
if (command->device == 0) {
|
||||
command->device = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
command++;
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
if (index == 12) {
|
||||
@@ -652,7 +655,7 @@ USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
}
|
||||
result = USBKBDSetLED((u32)kbdData[channel].device, ledBits,
|
||||
(USBKBDCmdLED*)&kbdCmdBuf[index]);
|
||||
kbdCmdBuf[(s32)index].device = 0;
|
||||
kbdCmdBuf[index].device = 0;
|
||||
switch (result) {
|
||||
default:
|
||||
return 7;
|
||||
|
||||
@@ -571,14 +571,8 @@ static inline f32 clamp_acc_value(f32 value, f32 limit) {
|
||||
}
|
||||
|
||||
static inline void smooth_acc_value(KPADInside* kpad, f32 value, f32* result) {
|
||||
f32 amount;
|
||||
f32 delta;
|
||||
delta = value - *result;
|
||||
if (delta < 0.0f) {
|
||||
amount = -delta;
|
||||
} else {
|
||||
amount = delta;
|
||||
}
|
||||
f32 delta = value - *result;
|
||||
f32 amount = delta < 0.0f ? -delta : delta;
|
||||
if (amount >= kpad->value9C) {
|
||||
amount = 1.0f;
|
||||
} else {
|
||||
@@ -618,16 +612,12 @@ static void read_kpad_acc(KPADInside* kpad, KPADSample* status) {
|
||||
kpad->status.acc_speed = (f32)sqrt(previous.z * previous.z + (previous.x * previous.x + previous.y * previous.y));
|
||||
calc_acc_horizon(kpad);
|
||||
calc_acc_vertical(kpad);
|
||||
if (status->error == 0 && status->device == 1) {
|
||||
if (status->dataFormat == 4) {
|
||||
goto read_extension_acceleration;
|
||||
}
|
||||
if (status->dataFormat == 5) {
|
||||
goto read_extension_acceleration;
|
||||
}
|
||||
if (status->error != 0 || status->device != 1) {
|
||||
return;
|
||||
}
|
||||
if (status->dataFormat != 4 && status->dataFormat != 5) {
|
||||
return;
|
||||
}
|
||||
return;
|
||||
read_extension_acceleration:
|
||||
{
|
||||
Vec extensionPrevious;
|
||||
raw.x = clamp_acc_value((f32)-(s32)status->extension.fs.accX * kpad->value4E8, kp_fs_acc_max);
|
||||
@@ -949,20 +939,15 @@ static void calc_dpd_variable(KPADInside* kpad, s8 valid) {
|
||||
f32 dx;
|
||||
f32 next;
|
||||
dx = value - kpad->status.dist;
|
||||
if (dx < 0.0f) {
|
||||
magnitude = -dx;
|
||||
} else {
|
||||
magnitude = dx;
|
||||
}
|
||||
magnitude = dx < 0.0f ? -dx : dx;
|
||||
if (magnitude >= kpad->value94) {
|
||||
magnitude = 1.0f;
|
||||
} else {
|
||||
magnitude /= kpad->value94;
|
||||
magnitude = magnitude / kpad->value94;
|
||||
magnitude *= magnitude;
|
||||
magnitude *= magnitude;
|
||||
}
|
||||
magnitude *= kpad->value98;
|
||||
next = magnitude * dx;
|
||||
next = magnitude * kpad->value98 * dx;
|
||||
kpad->status.dist_vec = next;
|
||||
if (next < 0.0f) {
|
||||
kpad->status.dist_speed = -next;
|
||||
@@ -973,15 +958,12 @@ static void calc_dpd_variable(KPADInside* kpad, s8 valid) {
|
||||
}
|
||||
}
|
||||
{
|
||||
f32 midpointFactor = 0.5f;
|
||||
f32 scaleX = midpointFactor * (kpad->dpdState.candidates[0].x + kpad->dpdState.candidates[1].x);
|
||||
f32 scaleY = midpointFactor * (kpad->dpdState.candidates[0].y + kpad->dpdState.candidates[1].y);
|
||||
f32 rotatedX = kpad->dpdObjectDirection.x * kpad->horizonTangent.x + kpad->dpdObjectDirection.y * kpad->horizonTangent.y;
|
||||
f32 rotatedX = kpad->horizonTangent.x * kpad->dpdObjectDirection.x + kpad->horizonTangent.y * kpad->dpdObjectDirection.y;
|
||||
f32 rotatedY = -kpad->dpdObjectDirection.y * kpad->horizonTangent.x + kpad->dpdObjectDirection.x * kpad->horizonTangent.y;
|
||||
f32 transformedX = rotatedX * scaleX - rotatedY * scaleY;
|
||||
f32 transformedY = rotatedY * scaleX + rotatedX * scaleY;
|
||||
delta.x = kpad->sensorBarScale * (kpad->sensorBarCenter.x - transformedX);
|
||||
delta.y = kpad->sensorBarScale * (kpad->sensorBarCenter.y - transformedY);
|
||||
f32 scaleX = 0.5f * (kpad->dpdState.candidates[0].x + kpad->dpdState.candidates[1].x);
|
||||
f32 scaleY = 0.5f * (kpad->dpdState.candidates[0].y + kpad->dpdState.candidates[1].y);
|
||||
delta.x = kpad->sensorBarScale * (kpad->sensorBarCenter.x - (rotatedX * scaleX - rotatedY * scaleY));
|
||||
delta.y = kpad->sensorBarScale * (kpad->sensorBarCenter.y - (rotatedY * scaleX + rotatedX * scaleY));
|
||||
point.x = -kpad->accelNormal.y * delta.x + kpad->accelNormal.x * delta.y;
|
||||
point.y = -kpad->accelNormal.x * delta.x - kpad->accelNormal.y * delta.y;
|
||||
if (kpad->status.dpd_valid_fg == 0) {
|
||||
@@ -1314,9 +1296,6 @@ static void read_kpad_stick(KPADInside* kpad, KPADSample* status) {
|
||||
}
|
||||
|
||||
s32 KPADRead(s32 chan, KPADStatus* statuses, u32 count) {
|
||||
u32 changed;
|
||||
u16 heldButtons;
|
||||
KPADStatus* output;
|
||||
KPADInside* kpad = &inside_kpads[chan];
|
||||
s32 probe;
|
||||
BOOL interruptState;
|
||||
@@ -1324,15 +1303,17 @@ s32 KPADRead(s32 chan, KPADStatus* statuses, u32 count) {
|
||||
u32 ringCount;
|
||||
s32 start;
|
||||
s32 sampleIndex;
|
||||
s32 remaining;
|
||||
u32 remaining;
|
||||
u32 remainingSamples;
|
||||
u32 buttons;
|
||||
u16 previousButtons;
|
||||
u32 coreButtons;
|
||||
u32 changed;
|
||||
u32 extensionButtons;
|
||||
u32 coreButtons;
|
||||
u8 device;
|
||||
KPADSample latestSample;
|
||||
KPADSample* sample;
|
||||
KPADStatus* output;
|
||||
if (WPADGetStatus() != 3) {
|
||||
return 0;
|
||||
}
|
||||
@@ -1366,19 +1347,19 @@ s32 KPADRead(s32 chan, KPADStatus* statuses, u32 count) {
|
||||
if (available > count) {
|
||||
available = count;
|
||||
}
|
||||
remaining = available;
|
||||
kpad->ringCount = 0;
|
||||
output = statuses + remaining;
|
||||
start = kpad->ringIndex - available;
|
||||
if (start < 0) {
|
||||
start += 16;
|
||||
}
|
||||
--output;
|
||||
{
|
||||
KPADStatus* copyOutput;
|
||||
sampleIndex = start;
|
||||
remaining = available;
|
||||
copyOutput = statuses + (available - 1);
|
||||
while (--remaining != 0) {
|
||||
output--;
|
||||
*(KPADSample*)output = kpad->ringData[sampleIndex];
|
||||
copyOutput--;
|
||||
*(KPADSample*)copyOutput = kpad->ringData[sampleIndex];
|
||||
sampleIndex++;
|
||||
if (sampleIndex >= 16) {
|
||||
sampleIndex = 0;
|
||||
@@ -1391,7 +1372,7 @@ s32 KPADRead(s32 chan, KPADStatus* statuses, u32 count) {
|
||||
WPADAccGravityUnit gravity = {1, 1, 1};
|
||||
WPADAccGravityUnit extensionGravity = {1, 1, 1};
|
||||
WPADGetAccGravityUnit(chan, WPAD_ACC_GRAVITY_UNIT_CORE, &gravity);
|
||||
if (gravity.x * gravity.y * gravity.z != 0) {
|
||||
if (gravity.z * gravity.x * gravity.y != 0) {
|
||||
kpad->value4DC = 1.0f / gravity.x;
|
||||
kpad->value4E0 = 1.0f / gravity.y;
|
||||
kpad->value4E4 = 1.0f / gravity.z;
|
||||
@@ -1401,7 +1382,7 @@ s32 KPADRead(s32 chan, KPADStatus* statuses, u32 count) {
|
||||
kpad->value4E4 = 0.01f;
|
||||
}
|
||||
WPADGetAccGravityUnit(chan, WPAD_ACC_GRAVITY_UNIT_FS, &extensionGravity);
|
||||
if (extensionGravity.x * extensionGravity.y * extensionGravity.z != 0) {
|
||||
if (extensionGravity.z * extensionGravity.x * extensionGravity.y != 0) {
|
||||
kpad->value4E8 = 1.0f / extensionGravity.x;
|
||||
kpad->value4EC = 1.0f / extensionGravity.y;
|
||||
kpad->value4F0 = 1.0f / extensionGravity.z;
|
||||
@@ -1414,8 +1395,8 @@ s32 KPADRead(s32 chan, KPADStatus* statuses, u32 count) {
|
||||
output = statuses + available;
|
||||
--output;
|
||||
device = 0xFD;
|
||||
extensionButtons = 0xFFFF;
|
||||
coreButtons = 0xFFFF;
|
||||
extensionButtons = 0xFFFF;
|
||||
buttons = 0xFFFF;
|
||||
do {
|
||||
output--;
|
||||
@@ -1452,20 +1433,18 @@ s32 KPADRead(s32 chan, KPADStatus* statuses, u32 count) {
|
||||
if (extensionButtons == 0xFFFF) {
|
||||
extensionButtons = kpad->status.ex_status.cl.hold;
|
||||
}
|
||||
buttons = (buttons & 0x9FFF) | (coreButtons & 0x6000);
|
||||
previousButtons = kpad->status.hold;
|
||||
heldButtons = (buttons & 0x9FFF) | (coreButtons & 0x6000);
|
||||
changed = heldButtons ^ previousButtons;
|
||||
kpad->status.hold = heldButtons;
|
||||
kpad->status.trig = changed & heldButtons;
|
||||
changed = previousButtons ^ buttons;
|
||||
kpad->status.hold = buttons;
|
||||
kpad->status.trig = changed & buttons;
|
||||
kpad->status.release = changed & previousButtons;
|
||||
if (device == 2) {
|
||||
u16 previousExtensionButtons;
|
||||
previousExtensionButtons = kpad->status.ex_status.cl.hold;
|
||||
extensionButtons = (u16)extensionButtons;
|
||||
kpad->status.ex_status.cl.hold = extensionButtons;
|
||||
changed = extensionButtons ^ previousExtensionButtons;
|
||||
previousButtons = kpad->status.ex_status.cl.hold;
|
||||
kpad->status.ex_status.cl.hold = (u16)extensionButtons;
|
||||
changed = previousButtons ^ (u16)extensionButtons;
|
||||
kpad->status.ex_status.cl.trig = changed & extensionButtons;
|
||||
kpad->status.ex_status.cl.release = changed & previousExtensionButtons;
|
||||
kpad->status.ex_status.cl.release = changed & previousButtons;
|
||||
}
|
||||
calc_button_repeat(kpad, device, ringCount);
|
||||
remainingSamples = available;
|
||||
@@ -1510,6 +1489,7 @@ void KPADInit(void) {
|
||||
f32 zero;
|
||||
f32 degreesToRadians;
|
||||
f32 one;
|
||||
f32* matrix;
|
||||
u32 i;
|
||||
s32 chan;
|
||||
BOOL enabled;
|
||||
@@ -1520,6 +1500,7 @@ void KPADInit(void) {
|
||||
one = 1.0f;
|
||||
zero = 0.0f;
|
||||
degreesToRadians = 0.017453292f;
|
||||
matrix = initial_rotation_matrix;
|
||||
kpad = inside_kpads;
|
||||
do {
|
||||
kpad->dpdEnable = 1;
|
||||
@@ -1547,9 +1528,9 @@ void KPADInit(void) {
|
||||
}
|
||||
referenceWidth = referenceWidth < referenceHeight ? referenceWidth : referenceHeight;
|
||||
initial_rotation_matrix[0] = one;
|
||||
initial_rotation_matrix[1] = zero;
|
||||
initial_rotation_matrix[2] = zero;
|
||||
initial_rotation_matrix[3] = zero;
|
||||
matrix[1] = zero;
|
||||
matrix[2] = zero;
|
||||
matrix[3] = zero;
|
||||
kpad->sensorBarScale = sensorDistance / referenceWidth;
|
||||
kpad->value9C = zero;
|
||||
kpad->value94 = zero;
|
||||
@@ -1568,18 +1549,18 @@ void KPADInit(void) {
|
||||
kpad->sensorHeightPending = 1;
|
||||
kpad->sensorBarPosition = 1;
|
||||
kpad->freeStyleAccelRotation = 0;
|
||||
initial_rotation_matrix[4] = zero;
|
||||
matrix[4] = zero;
|
||||
rotationElement = (f32)cos(degreesToRadians * sensor_bar_angle_degrees);
|
||||
initial_rotation_matrix[5] = rotationElement;
|
||||
matrix[5] = rotationElement;
|
||||
rotationElement = (f32)-sin(degreesToRadians * sensor_bar_angle_degrees);
|
||||
initial_rotation_matrix[7] = zero;
|
||||
initial_rotation_matrix[8] = zero;
|
||||
initial_rotation_matrix[6] = rotationElement;
|
||||
matrix[7] = zero;
|
||||
matrix[8] = zero;
|
||||
matrix[6] = rotationElement;
|
||||
rotationElement = (f32)sin(degreesToRadians * sensor_bar_angle_degrees);
|
||||
initial_rotation_matrix[9] = rotationElement;
|
||||
matrix[9] = rotationElement;
|
||||
rotationElement = (f32)cos(degreesToRadians * sensor_bar_angle_degrees);
|
||||
initial_rotation_matrix[10] = rotationElement;
|
||||
initial_rotation_matrix[11] = zero;
|
||||
matrix[10] = rotationElement;
|
||||
matrix[11] = zero;
|
||||
{
|
||||
i = 0;
|
||||
do {
|
||||
|
||||
@@ -64,7 +64,7 @@ struct NUPTitleInfo {
|
||||
u32 ticketCertificateSize;
|
||||
void* tmdCertificate;
|
||||
u32 tmdCertificateSize;
|
||||
ESTmdView* tmdView;
|
||||
void* tmdView;
|
||||
u32 tmdViewSize;
|
||||
u8 hasTicket;
|
||||
u8 hasTmd;
|
||||
@@ -165,7 +165,7 @@ static ESError __nupHttpBufferFlushES(u8* buffer, unsigned long size, unsigned l
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline char* __nupFindTag(char* response, const char* startTag, const char* endTag,
|
||||
static inline char* __nupFindTag(char* response, const char* endTag, const char* startTag,
|
||||
char** value, size_t* length) {
|
||||
char* start;
|
||||
char* end;
|
||||
@@ -188,7 +188,10 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
size_t titleCount;
|
||||
|
||||
{
|
||||
afterEnd = __nupFindTag(response, "<Version>", "</Version>", &start, &valueLength);
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
afterEnd = __nupFindTag(response, versionEndTag, versionStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen("1.0") || strncmp(start, "1.0", valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
@@ -196,7 +199,10 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
}
|
||||
|
||||
{
|
||||
afterEnd = __nupFindTag(response, "<DeviceId>", "</DeviceId>", &start, &valueLength);
|
||||
const char* deviceIdEndTag = "</DeviceId>";
|
||||
const char* deviceIdStartTag = "<DeviceId>";
|
||||
afterEnd = __nupFindTag(response, deviceIdEndTag, deviceIdStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || strtoull(start, 0, 10) != deviceId) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
@@ -204,7 +210,10 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
}
|
||||
|
||||
{
|
||||
afterEnd = __nupFindTag(response, "<MessageId>", "</MessageId>", &start, &valueLength);
|
||||
const char* messageIdEndTag = "</MessageId>";
|
||||
const char* messageIdStartTag = "<MessageId>";
|
||||
afterEnd = __nupFindTag(response, messageIdEndTag, messageIdStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen(messageId) || strncmp(start, messageId, valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
@@ -212,7 +221,10 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
}
|
||||
|
||||
{
|
||||
afterEnd = __nupFindTag(response, "<ErrorCode>", "</ErrorCode>", &start, &valueLength);
|
||||
const char* errorCodeEndTag = "</ErrorCode>";
|
||||
const char* errorCodeStartTag = "<ErrorCode>";
|
||||
afterEnd = __nupFindTag(response, errorCodeEndTag, errorCodeStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen("0") || strncmp(start, "0", valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
@@ -220,7 +232,10 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
}
|
||||
|
||||
{
|
||||
afterEnd = __nupFindTag(response, "<UploadAuditData>", "</UploadAuditData>", &start, &valueLength);
|
||||
const char* uploadAuditEndTag = "</UploadAuditData>";
|
||||
const char* uploadAuditStartTag = "<UploadAuditData>";
|
||||
afterEnd = __nupFindTag(response, uploadAuditEndTag, uploadAuditStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength != strlen("0") || (*start != '0' && *start != '1')) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
@@ -233,7 +248,10 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
}
|
||||
|
||||
{
|
||||
afterEnd = __nupFindTag(response, "<ContentPrefixURL>", "</ContentPrefixURL>", &start, &valueLength);
|
||||
const char* contentPrefixEndTag = "</ContentPrefixURL>";
|
||||
const char* contentPrefixStartTag = "<ContentPrefixURL>";
|
||||
afterEnd = __nupFindTag(response, contentPrefixEndTag, contentPrefixStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
@@ -248,7 +266,10 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
}
|
||||
|
||||
{
|
||||
afterEnd = __nupFindTag(response, "<UncachedContentPrefixURL>", "</UncachedContentPrefixURL>", &start, &valueLength);
|
||||
const char* uncachedPrefixEndTag = "</UncachedContentPrefixURL>";
|
||||
const char* uncachedPrefixStartTag = "<UncachedContentPrefixURL>";
|
||||
afterEnd = __nupFindTag(response, uncachedPrefixEndTag, uncachedPrefixStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0 || valueLength == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
@@ -265,8 +286,14 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
titleCount = 0;
|
||||
cursor = response;
|
||||
{
|
||||
while ((cursor = __nupFindTag(cursor, "<TitleId>", "</TitleId>", &start, &valueLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, "<Version>", "</Version>", &start, &valueLength)) != 0) {
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&start, &valueLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&start, &valueLength)) != 0) {
|
||||
titleCount++;
|
||||
}
|
||||
}
|
||||
@@ -279,13 +306,19 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
memset(context->titles, 0, titleCount * sizeof(NUPTitleInfo));
|
||||
cursor = response;
|
||||
{
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
char* titleStart;
|
||||
char* versionStart;
|
||||
size_t titleLength;
|
||||
size_t versionLength;
|
||||
char* parsedEnd;
|
||||
while ((cursor = __nupFindTag(cursor, "<TitleId>", "</TitleId>", &titleStart, &titleLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, "<Version>", "</Version>", &versionStart, &versionLength)) != 0) {
|
||||
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&titleStart, &titleLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&versionStart, &versionLength)) != 0) {
|
||||
unsigned long long titleId = strtoull(titleStart, &parsedEnd, 16);
|
||||
if (parsedEnd != titleStart + titleLength) {
|
||||
result = -5004;
|
||||
@@ -694,7 +727,7 @@ static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
title->hasContent = 1;
|
||||
result = __nupSetBootTitleVersion(title);
|
||||
} else {
|
||||
s32 i;
|
||||
u32 i;
|
||||
for (i = 0; i < context->ownedTitleCount; i++) {
|
||||
if (context->ownedTitleIds[i] == title->titleId) {
|
||||
break;
|
||||
@@ -731,16 +764,18 @@ static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
if (title->contentCount < tmdView->head.numContents) {
|
||||
u32 installedContentCount = title->contentCount;
|
||||
if (installedContentCount < tmdView->head.numContents) {
|
||||
goto done;
|
||||
}
|
||||
for (i = 0; i < tmdView->head.numContents; i++) {
|
||||
ESContentId contentId = tmdView->contents[i].cid;
|
||||
if (!__nupHasInstalledContent(title, contentId, title->contentCount)) {
|
||||
s32 contentIndex;
|
||||
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
|
||||
if (!__nupHasInstalledContent(title, tmdView->contents[contentIndex].cid,
|
||||
installedContentCount)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i < tmdView->head.numContents) {
|
||||
if (contentIndex < tmdView->head.numContents) {
|
||||
goto done;
|
||||
}
|
||||
title->hasContent = 1;
|
||||
@@ -835,7 +870,7 @@ static s32 __nupGetTmd(NUPTitleInfo* title, char* contentPrefixUrl) {
|
||||
result = ES_DiGetTmdView((ESTitleMeta*)title->tmd, title->tmdSize, 0,
|
||||
&title->tmdViewSize);
|
||||
if (result == 0) {
|
||||
title->tmdView = (ESTmdView*)nup::__nupMalloc(title->tmdViewSize);
|
||||
title->tmdView = nup::__nupMalloc(title->tmdViewSize);
|
||||
if (title->tmdView == 0) {
|
||||
result = -5000;
|
||||
} else {
|
||||
@@ -872,26 +907,23 @@ static s32 __nupGetTitleSize(NUPTitleInfo* title) {
|
||||
if (title->hasTmd == 0 && title->contentCount == 0) {
|
||||
title->progressStep += 4;
|
||||
}
|
||||
title->progressStep += 5;
|
||||
title->installedContentSize += 0x4000;
|
||||
title->progressStep++;
|
||||
title->installedContentSize += (title->tmdSize + 0x3fff) & 0xffffc000;
|
||||
title->progressStep++;
|
||||
title->installedContentSize += 0x8000;
|
||||
title->progressStep++;
|
||||
title->installedContentSize += 0x4000;
|
||||
title->progressStep++;
|
||||
title->installedContentSize += 0x4000;
|
||||
title->progressStep++;
|
||||
for (contentIndex = 0; contentIndex < title->tmdView->head.numContents; contentIndex++) {
|
||||
ESContentId contentId = title->tmdView->contents[contentIndex].cid;
|
||||
for (contentIndex = 0; contentIndex < ((ESTmdView*)title->tmdView)->head.numContents; contentIndex++) {
|
||||
ESCmdView* content = &((ESTmdView*)title->tmdView)->contents[contentIndex];
|
||||
ESContentId contentId = content->cid;
|
||||
if (!__nupHasContent(title, contentId) ||
|
||||
title->titleId == 0x0000000100000001ULL) {
|
||||
if (title->tmdView->contents[contentIndex].size > 0xffffffefULL) {
|
||||
if (content->size > 0xffffffefULL) {
|
||||
result = -0x1394;
|
||||
break;
|
||||
}
|
||||
title->updateContentSize += (title->tmdView->contents[contentIndex].size + 0xf) & 0xfffffffffffffff0ULL;
|
||||
title->installedContentSize += (title->tmdView->contents[contentIndex].size + 0x3fff) & 0xffffffffffffc000ULL;
|
||||
title->updateContentSize += (content->size + 0xf) & 0xfffffffffffffff0ULL;
|
||||
title->installedContentSize += (((ESTmdView*)title->tmdView)->contents[contentIndex].size + 0x3fff) & 0xffffffffffffc000ULL;
|
||||
title->progressStep++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1260,12 +1260,12 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
|
||||
|
||||
titleMetaSize = 0;
|
||||
contentDataSize = 0;
|
||||
files = 0;
|
||||
titleMeta = 0;
|
||||
outputBuffer = 0;
|
||||
titleMetaBuffer = 0;
|
||||
titleMeta = 0;
|
||||
files = 0;
|
||||
fileCount = 0;
|
||||
importedSize = 0;
|
||||
outputBuffer = 0;
|
||||
encryptionBuffer = 0;
|
||||
fileDataSize = 0;
|
||||
installedContentCount = 0;
|
||||
|
||||
@@ -8,11 +8,13 @@ void CDBCryptBufSysInit(CDBCryptBuf* cryptBuf) {
|
||||
cryptBuf->allocated = FALSE;
|
||||
}
|
||||
|
||||
CDBErr CDBCryptBufAllocate(CDBCryptBuf** cryptBuf) {
|
||||
// Some weird crap is going on with these functions.
|
||||
|
||||
CDBErr CDBCryptBufAllocate(CDBCryptBuf* cryptBuf) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
|
||||
if (s_cryptBuf->allocated == FALSE) {
|
||||
*cryptBuf = &s_cryptBuf[err];
|
||||
cryptBuf->buffer32[0] = (u32)&s_cryptBuf[err];
|
||||
s_cryptBuf[err].allocated = TRUE;
|
||||
return CDB_ERROR_OK;
|
||||
} else {
|
||||
@@ -21,12 +23,12 @@ CDBErr CDBCryptBufAllocate(CDBCryptBuf** cryptBuf) {
|
||||
}
|
||||
}
|
||||
|
||||
CDBErr CDBCryptBufFree(CDBCryptBuf** cryptBuf) {
|
||||
CDBErr CDBCryptBufFree(CDBCryptBuf* cryptBuf) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
|
||||
if (*cryptBuf == s_cryptBuf) {
|
||||
if ((CDBCryptBuf*)*cryptBuf->buffer32 == s_cryptBuf) {
|
||||
s_cryptBuf[err].allocated = FALSE;
|
||||
*cryptBuf = NULL;
|
||||
*cryptBuf->buffer32 = 0;
|
||||
return CDB_ERROR_OK;
|
||||
} else {
|
||||
CDBReportError("failed to free crypt buffer\n");
|
||||
|
||||
@@ -12,7 +12,7 @@ extern CDBErr CDBDatabaseFree(CDBDatabase* database);
|
||||
extern CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const char* desc, char* fileType, CDBDate epoch, int gameCode, u16 makerCode, void* buffer, u32 size);
|
||||
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
|
||||
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
|
||||
extern CDBErr CDBRecordOpenReadOnly(CDBRecord* record);
|
||||
extern void CDBRecordOpenReadOnly();
|
||||
extern void CDBRecordKeyArrayInit();
|
||||
extern void CDBRecordKeyArraySetReverse();
|
||||
extern void CDBRecordKeyArraySize();
|
||||
@@ -357,43 +357,79 @@ CDBErr CDBDatabaseSearchConditionsIsMatch(CDBSearchConditions* conditions, char*
|
||||
return CDB_ERROR_1;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseSearchCallCallback(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecord* record) {
|
||||
CDBDatabaseState* instance;
|
||||
u32 flags;
|
||||
CDBErr result;
|
||||
|
||||
CDBLock();
|
||||
instance = database->instance;
|
||||
if (instance != NULL) {
|
||||
flags = instance->flags;
|
||||
} else {
|
||||
flags = 0;
|
||||
}
|
||||
CDBUnlock();
|
||||
|
||||
if (CDBDatabaseSearchConditionsIsMatch(conditions, record->key.keyString)) {
|
||||
if (conditions->openRecord) {
|
||||
if (flags & 2) {
|
||||
result = CDBRecordOpen(record);
|
||||
} else {
|
||||
result = CDBRecordOpenReadOnly(record);
|
||||
}
|
||||
if (result == CDB_ERROR_32) {
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
} else {
|
||||
result = CDB_ERROR_OK;
|
||||
}
|
||||
if (result == CDB_ERROR_OK) {
|
||||
conditions->keepSearching = conditions->callback(conditions->callbackArg, record);
|
||||
if (record->file != NULL) {
|
||||
CDBRecordClose(record);
|
||||
}
|
||||
} else {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
asm CDBErr CDBDatabaseSearchCallCallback() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
mr r31, r3
|
||||
stw r30, 0x18(r1)
|
||||
mr r30, r5
|
||||
stw r29, 0x14(r1)
|
||||
mr r29, r4
|
||||
bl CDBLock
|
||||
lwz r3, 0x8(r31)
|
||||
cmpwi r3, 0x0
|
||||
beq CDBDatabaseSearchCallCallback_L_81487C78
|
||||
addis r3, r3, 0x1
|
||||
lwz r31, -0x3ff0(r3)
|
||||
b CDBDatabaseSearchCallCallback_L_81487C7C
|
||||
CDBDatabaseSearchCallCallback_L_81487C78:
|
||||
li r31, 0x0
|
||||
CDBDatabaseSearchCallCallback_L_81487C7C:
|
||||
bl CDBUnlock
|
||||
mr r3, r29
|
||||
addi r4, r30, 0x8
|
||||
bl CDBDatabaseSearchConditionsIsMatch
|
||||
cmpwi r3, 0x0
|
||||
beq CDBDatabaseSearchCallCallback_L_81487D0C
|
||||
lwz r0, 0x24(r29)
|
||||
cmpwi r0, 0x0
|
||||
beq CDBDatabaseSearchCallCallback_L_81487CCC
|
||||
rlwinm. r0, r31, 0, 30, 30
|
||||
beq CDBDatabaseSearchCallCallback_L_81487CB4
|
||||
mr r3, r30
|
||||
bl CDBRecordOpen
|
||||
b CDBDatabaseSearchCallCallback_L_81487CBC
|
||||
CDBDatabaseSearchCallCallback_L_81487CB4:
|
||||
mr r3, r30
|
||||
bl CDBRecordOpenReadOnly
|
||||
CDBDatabaseSearchCallCallback_L_81487CBC:
|
||||
cmpwi r3, 0x20
|
||||
bne CDBDatabaseSearchCallCallback_L_81487CD0
|
||||
li r3, 0x0
|
||||
b CDBDatabaseSearchCallCallback_L_81487D10
|
||||
CDBDatabaseSearchCallCallback_L_81487CCC:
|
||||
li r3, 0x0
|
||||
CDBDatabaseSearchCallCallback_L_81487CD0:
|
||||
cmpwi r3, 0x0
|
||||
bne CDBDatabaseSearchCallCallback_L_81487D10
|
||||
lwz r12, 0x18(r29)
|
||||
mr r4, r30
|
||||
lwz r3, 0x1c(r29)
|
||||
mtctr r12
|
||||
bctrl
|
||||
stw r3, 0x20(r29)
|
||||
lwz r0, 0x38(r30)
|
||||
cmpwi r0, 0x0
|
||||
beq CDBDatabaseSearchCallCallback_L_81487D0C
|
||||
mr r3, r30
|
||||
bl CDBRecordClose
|
||||
b CDBDatabaseSearchCallCallback_L_81487D0C
|
||||
b CDBDatabaseSearchCallCallback_L_81487D10
|
||||
CDBDatabaseSearchCallCallback_L_81487D0C:
|
||||
li r3, 0x0
|
||||
CDBDatabaseSearchCallCallback_L_81487D10:
|
||||
lwz r0, 0x24(r1)
|
||||
lwz r31, 0x1c(r1)
|
||||
lwz r30, 0x18(r1)
|
||||
lwz r29, 0x14(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseSearchRecordLayer() {
|
||||
|
||||
@@ -169,11 +169,11 @@ static const u32 AESiDecryptTable[] = {
|
||||
};
|
||||
|
||||
#define ROTATE(x,n) (((x) << (n)) | ((x) >> (32 - (n))))
|
||||
#define ENCRYPT(a,b,c,d) (((ROTATE(AESiEncryptTable[((b)>>16)&255],16) ^ ROTATE(AESiEncryptTable[(a)>>24],24)) ^ AESiEncryptTable[(d)&255]) ^ ROTATE(AESiEncryptTable[((c)>>8)&255],8))
|
||||
#define DECRYPT(a,b,c,d) (((ROTATE(AESiDecryptTable[((b)>>16)&255],16) ^ AESiDecryptTable[(d)&255]) ^ ROTATE(AESiDecryptTable[(a)>>24],24)) ^ ROTATE(AESiDecryptTable[((c)>>8)&255],8))
|
||||
#define SUBSTITUTE(table,a,b,c,d) ((((u32)table[(a)>>24]<<24) | table[(d)&255]) | (((u32)table[((b)>>16)&255]<<16) | ((u32)table[((c)>>8)&255]<<8)))
|
||||
#define ENCRYPT(a,b,c,d) (ROTATE(AESiEncryptTable[(a)>>24],24) ^ ROTATE(AESiEncryptTable[((b)>>16)&255],16) ^ ROTATE(AESiEncryptTable[((c)>>8)&255],8) ^ AESiEncryptTable[(d)&255])
|
||||
#define DECRYPT(a,b,c,d) (ROTATE(AESiDecryptTable[(a)>>24],24) ^ ROTATE(AESiDecryptTable[((b)>>16)&255],16) ^ ROTATE(AESiDecryptTable[((c)>>8)&255],8) ^ AESiDecryptTable[(d)&255])
|
||||
#define SUBSTITUTE(table,a,b,c,d) (((u32)table[(a)>>24]<<24) | ((u32)table[((b)>>16)&255]<<16) | ((u32)table[((c)>>8)&255]<<8) | table[(d)&255])
|
||||
|
||||
#define DECRYPT_FINAL(table,a,b,c,d,key) ((table[(d)&255] ^ ((u32)table[((c)>>8)&255]<<8)) ^ (((u32)table[((b)>>16)&255]<<16) ^ ((key) ^ ((u32)table[(a)>>24]<<24))))
|
||||
#define SUBSTITUTE_XOR(table,a,b,c,d) (((u32)table[(a)>>24]<<24) ^ ((u32)table[((b)>>16)&255]<<16) ^ ((u32)table[((c)>>8)&255]<<8) ^ table[(d)&255])
|
||||
|
||||
void AESiEncryptBlock(AESContext* context, u32* output, const u32* input) {
|
||||
u32 rounds = context->rounds;
|
||||
@@ -198,24 +198,22 @@ void AESiEncryptBlock(AESContext* context, u32* output, const u32* input) {
|
||||
void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
|
||||
u32 rounds=context->rounds;
|
||||
u32* key=context->keys;
|
||||
u32 b;
|
||||
u32 a;
|
||||
u32 c;
|
||||
u32 d;
|
||||
u32 a,b,c,d;
|
||||
key += rounds*4;
|
||||
if (context->needsTransform) {
|
||||
u32 round;
|
||||
for (round=1; round<context->rounds; ++round) {
|
||||
u32 word;
|
||||
u32* keys=context->keys + round*4;
|
||||
for (word=0; word<4; ++word) {
|
||||
u32 value=context->keys[round*4 + word];
|
||||
u32 value=keys[word];
|
||||
u32 twice=DOUBLE_BYTES(value);
|
||||
u32 four=DOUBLE_BYTES(twice);
|
||||
u32 eight=DOUBLE_BYTES(four)^value;
|
||||
u32 mixed=(ROTATE(eight,8) ^ (eight ^ four));
|
||||
mixed=(ROTATE(mixed,8) ^ (mixed ^ twice));
|
||||
mixed=(ROTATE(mixed,8) ^ (mixed ^ value));
|
||||
context->keys[round*4 + word]=mixed;
|
||||
u32 mixed=eight ^ (four ^ ROTATE(eight,8));
|
||||
mixed ^= twice ^ ROTATE(mixed,8);
|
||||
mixed ^= value ^ ROTATE(mixed,8);
|
||||
keys[word]=mixed;
|
||||
}
|
||||
}
|
||||
context->needsTransform=0;
|
||||
@@ -230,10 +228,10 @@ void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
|
||||
a=nextA^key[0]; b=nextB^key[1]; c=nextC^key[2]; d=nextD^key[3];
|
||||
key-=4;
|
||||
}
|
||||
output[0]=DECRYPT_FINAL(AESiInvSubShiftTable,a,d,c,b,key[0]);
|
||||
output[1]=DECRYPT_FINAL(AESiInvSubShiftTable,b,a,d,c,key[1]);
|
||||
output[2]=DECRYPT_FINAL(AESiInvSubShiftTable,c,b,a,d,key[2]);
|
||||
output[3]=DECRYPT_FINAL(AESiInvSubShiftTable,d,c,b,a,key[3]);
|
||||
output[0]=SUBSTITUTE_XOR(AESiInvSubShiftTable,a,d,c,b)^key[0];
|
||||
output[1]=SUBSTITUTE_XOR(AESiInvSubShiftTable,b,a,d,c)^key[1];
|
||||
output[2]=SUBSTITUTE_XOR(AESiInvSubShiftTable,c,b,a,d)^key[2];
|
||||
output[3]=SUBSTITUTE_XOR(AESiInvSubShiftTable,d,c,b,a)^key[3];
|
||||
}
|
||||
|
||||
BOOL NETAESCreateEx(AESContext* context, const void* key, u32 keyLength, const void* iv, const AESBlockMode* mode) {
|
||||
|
||||
@@ -75,34 +75,25 @@ static inline u32 rotateSum(u32 state, const u32* word, u32 constant, int shift)
|
||||
return ((state + (constant + left)) << shift) | ((constant + (state + right)) >> (32 - shift));
|
||||
}
|
||||
|
||||
static inline u32 rotateNextSum(u32 state, u32** cursor, u32 constant, int shift) {
|
||||
const u32* word = *cursor;
|
||||
u32 right = __lwbrx((void*)word, 0);
|
||||
u32 left = __lwbrx((void*)word, 0);
|
||||
++*cursor;
|
||||
return ((state + (constant + left)) << shift) | ((constant + (state + right)) >> (32 - shift));
|
||||
}
|
||||
|
||||
#define STEP_NEXT(a, b, c, d, f, word, n) ((a) = (b) + rotateNextSum((a) + (f), &(word), *constant, n))
|
||||
#define STEP(a, b, c, d, f, word, n) ((a) = (b) + rotateSum((a) + (f), word, *constant, n))
|
||||
|
||||
static void ProcessBlock(NETMD5Context* context) {
|
||||
static u32 constants[64] = {0xD76AA478, 0xE8C7B756, 0x242070DB, 0xC1BDCEEE, 0xF57C0FAF, 0x4787C62A, 0xA8304613, 0xFD469501, 0x698098D8, 0x8B44F7AF, 0xFFFF5BB1, 0x895CD7BE, 0x6B901122, 0xFD987193, 0xA679438E, 0x49B40821, 0xF61E2562, 0xC040B340, 0x265E5A51, 0xE9B6C7AA, 0xD62F105D, 0x02441453, 0xD8A1E681, 0xE7D3FBC8, 0x21E1CDE6, 0xC33707D6, 0xF4D50D87, 0x455A14ED, 0xA9E3E905, 0xFCEFA3F8, 0x676F02D9, 0x8D2A4C8A, 0xFFFA3942, 0x8771F681, 0x6D9D6122, 0xFDE5380C, 0xA4BEEA44, 0x4BDECFA9, 0xF6BB4B60, 0xBEBFBC70, 0x289B7EC6, 0xEAA127FA, 0xD4EF3085, 0x04881D05, 0xD9D4D039, 0xE6DB99E5, 0x1FA27CF8, 0xC4AC5665, 0xF4292244, 0x432AFF97, 0xAB9423A7, 0xFC93A039, 0x655B59C3, 0x8F0CCC92, 0xFFEFF47D, 0x85845DD1, 0x6FA87E4F, 0xFE2CE6E0, 0xA3014314, 0x4E0811A1, 0xF7537E82, 0xBD3AF235, 0x2AD7D2BB, 0xEB86D391};
|
||||
static u32 indices[48] = {0x00000001, 0x00000006, 0x0000000B, 0x00000000, 0x00000005, 0x0000000A, 0x0000000F, 0x00000004, 0x00000009, 0x0000000E, 0x00000003, 0x00000008, 0x0000000D, 0x00000002, 0x00000007, 0x0000000C, 0x00000005, 0x00000008, 0x0000000B, 0x0000000E, 0x00000001, 0x00000004, 0x00000007, 0x0000000A, 0x0000000D, 0x00000000, 0x00000003, 0x00000006, 0x00000009, 0x0000000C, 0x0000000F, 0x00000002, 0x00000000, 0x00000007, 0x0000000E, 0x00000005, 0x0000000C, 0x00000003, 0x0000000A, 0x00000001, 0x00000008, 0x0000000F, 0x00000006, 0x0000000D, 0x00000004, 0x0000000B, 0x00000002, 0x00000009};
|
||||
u32 a = context->a, b = context->b, c = context->c, d = context->d;
|
||||
u32* index;
|
||||
u32* block;
|
||||
u32* constant;
|
||||
int round;
|
||||
u32* word;
|
||||
u32* constant;
|
||||
u32* index;
|
||||
int round;
|
||||
u32* block;
|
||||
block = context->buffer32;
|
||||
word = block;
|
||||
constant = constants;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP_NEXT(a,b,c,d,(b & c) | (~b & d),word,7); ++constant;
|
||||
STEP_NEXT(d,a,b,c,(a & b) | (~a & c),word,12); ++constant;
|
||||
STEP_NEXT(c,d,a,b,(d & a) | (~d & b),word,17); ++constant;
|
||||
STEP_NEXT(b,c,d,a,(c & d) | (~c & a),word,22); ++constant;
|
||||
STEP(a,b,c,d,(b & c) | (~b & d),word++,7); ++constant;
|
||||
STEP(d,a,b,c,(a & b) | (~a & c),word++,12); ++constant;
|
||||
STEP(c,d,a,b,(d & a) | (~d & b),word++,17); ++constant;
|
||||
STEP(b,c,d,a,(c & d) | (~c & a),word++,22); ++constant;
|
||||
}
|
||||
index = indices;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
|
||||
@@ -7,7 +7,8 @@ s32 NHTTPi_strcmp(const char* left, const char* right) { return strcmp(left,righ
|
||||
void* NHTTPi_memclr(void* destination, u32 size) { return memset(destination,0,size); }
|
||||
|
||||
static int LowerCase(int character) {
|
||||
return ((character >= 'A') & (character <= 'Z')) ? character + 32 : character;
|
||||
if((character>='A') & (character<='Z')) character+=32;
|
||||
return character;
|
||||
}
|
||||
|
||||
s32 NHTTPi_strnicmp(const char* left, const char* right, s32 length) {
|
||||
@@ -126,13 +127,12 @@ s32 NHTTPi_intToStr(char* destination, u32 value) {
|
||||
}
|
||||
|
||||
s32 NHTTPi_compareToken(const char* left, const char* right) {
|
||||
u32 rawLeft;
|
||||
while (LowerCase((s8)(rawLeft = *(const u8*)left)) == LowerCase((s8)*(const u8*)right)) {
|
||||
if ((s8)rawLeft == 0 || (s8)rawLeft == ' ') {
|
||||
return 0;
|
||||
}
|
||||
++left;
|
||||
++right;
|
||||
for (;;) {
|
||||
int rightCharacter=LowerCase(*right);
|
||||
int leftCharacter=LowerCase(*left);
|
||||
if(leftCharacter!=rightCharacter) break;
|
||||
if(*left==0 || *left==' ') return 0;
|
||||
++left; ++right;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -158,24 +158,20 @@ s32 NHTTPi_strtonum(const char* string, u32 length) {
|
||||
}
|
||||
|
||||
s32 NHTTPi_Base64Encode(char* destination, const char* source) {
|
||||
const char* table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
char* output = destination;
|
||||
s32 length = strlen(source);
|
||||
s32 consumed = 0;
|
||||
|
||||
for (; consumed < length; consumed += 3) {
|
||||
output[0] = table[source[0] >> 2];
|
||||
output[1] = table[((source[0] & 3) << 4) + (source[1] >> 4)];
|
||||
output[2] = table[((source[1] & 15) << 2) + (source[2] >> 6)];
|
||||
output[3] = table[source[2] & 63];
|
||||
source += 3;
|
||||
output += 4;
|
||||
static char alphabet[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
const char* table=alphabet;
|
||||
char* output=destination;
|
||||
u32 length=strlen(source);
|
||||
s32 consumed=0;
|
||||
for(; consumed<(s32)length; consumed+=3) {
|
||||
output[0]=table[source[0]>>2];
|
||||
output[1]=table[((source[0]&3)<<4)+(source[1]>>4)];
|
||||
output[2]=table[((source[1]&15)<<2)+(source[2]>>6)];
|
||||
output[3]=table[source[2]&63];
|
||||
source+=3; output+=4;
|
||||
}
|
||||
if (consumed == length + 1) output[-1] = '=';
|
||||
else if (consumed == length + 2) {
|
||||
output[-2] = '=';
|
||||
output[-1] = '=';
|
||||
}
|
||||
*output = 0;
|
||||
if(consumed==length+1) output[-1]='=';
|
||||
else if(consumed==length+2) { output[-2]='='; output[-1]='='; }
|
||||
*output=0;
|
||||
return strlen(destination);
|
||||
}
|
||||
|
||||
@@ -7,9 +7,8 @@ s32 ConvertDateToDays(u16 year, u8 month, u8 day);
|
||||
void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days);
|
||||
|
||||
static inline BOOL IsLeapYear(u16 year) {
|
||||
s32 calendarYear = year;
|
||||
BOOL leap = FALSE;
|
||||
if ((calendarYear % 4 == 0 && calendarYear % 100 != 0) || calendarYear % 400 == 0)
|
||||
if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
|
||||
leap = TRUE;
|
||||
return leap;
|
||||
}
|
||||
@@ -153,7 +152,7 @@ NWC24Err NWC24iIsValidDate(u16 year, u8 month, u8 day) {
|
||||
s32 ConvertDateToDays(u16 year, u8 month, u8 day) {
|
||||
s32 daysOfYear;
|
||||
s32 yearOffset;
|
||||
s32 totalDays;
|
||||
s32 centuryLeapDays;
|
||||
s32 commonLeapDays;
|
||||
BOOL isLeapYear;
|
||||
|
||||
@@ -191,10 +190,11 @@ validDate:
|
||||
}
|
||||
|
||||
yearOffset = year - 1900;
|
||||
centuryLeapDays = (yearOffset + 299) / 400;
|
||||
daysOfYear += yearOffset * 365;
|
||||
totalDays = daysOfYear + (yearOffset + 299) / 400;
|
||||
daysOfYear += centuryLeapDays;
|
||||
commonLeapDays = (yearOffset - 1) / 4 - (yearOffset - 1) / 100;
|
||||
return totalDays + commonLeapDays;
|
||||
return daysOfYear + commonLeapDays;
|
||||
}
|
||||
|
||||
void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
|
||||
@@ -231,7 +231,7 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
|
||||
const u8* parsedMonth = month;
|
||||
previousDays = days;
|
||||
currentMonth = *parsedMonth;
|
||||
if (*parsedMonth == 2 && IsLeapYear(*year)) {
|
||||
if (currentMonth == 2 && IsLeapYear(*year)) {
|
||||
days -= 29;
|
||||
} else {
|
||||
days -= DAYS_OF_MONTH[currentMonth - 1];
|
||||
|
||||
@@ -253,37 +253,6 @@ static inline NWC24Err GetMaxDlTaskCount(u16* count) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline BOOL IsDlTaskWritableGroup(u32 groupId, u32 flags) {
|
||||
BOOL allowed = FALSE;
|
||||
if (flags & 0x40) {
|
||||
if (groupId == NWC24GetGroupId()) {
|
||||
allowed = TRUE;
|
||||
}
|
||||
}
|
||||
return allowed;
|
||||
}
|
||||
|
||||
static inline NWC24Err ValidateWritableDlTask(const NWC24DlTask* dlTask) {
|
||||
const DlTaskData* task = (const DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header = GetCachedDlHeader();
|
||||
if (task == NULL) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
if (header == NULL) {
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
}
|
||||
if (!NWC24IsMsgLibOpenedByTool() && !IsDlTaskOwner(task->appId)) {
|
||||
BOOL allowed = IsDlTaskWritableGroup(task->groupId, task->flags);
|
||||
if (!allowed) {
|
||||
return NWC24_ERR_PROTECTED;
|
||||
}
|
||||
}
|
||||
if (task->id != 0xffff && task->id >= header->maxTaskCount) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24InitDlTask(NWC24DlTask* dlTask, NWC24DLType dlType) {
|
||||
char homePath[64] = {0};
|
||||
u32 nwc24IdHigh;
|
||||
@@ -335,7 +304,7 @@ NWC24Err NWC24InitDlTask(NWC24DlTask* dlTask, NWC24DLType dlType) {
|
||||
strcpy(task->fileName, "content.bin");
|
||||
}
|
||||
|
||||
result = ValidateWritableDlTask(dlTask);
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
return result >> 31;
|
||||
}
|
||||
|
||||
@@ -718,10 +687,10 @@ NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIt
|
||||
return NWC24_ERR_DONE;
|
||||
}
|
||||
|
||||
static inline NWC24Err SetDlTaskAccessTime(const NWC24DlTask* dlTask, OSTime time) {
|
||||
static inline NWC24Err SetDlTaskAccessTime(NWC24DlTask* dlTask, OSTime time) {
|
||||
NWC24Work* work = NWC24WorkP;
|
||||
DlTaskListHeader* header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
|
||||
const DlTaskData* task = (const DlTaskData*)dlTask;
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
u16 taskId;
|
||||
if (task == NULL) { result = NWC24_ERR_INVALID_VALUE; }
|
||||
@@ -737,39 +706,19 @@ static inline NWC24Err SetDlTaskAccessTime(const NWC24DlTask* dlTask, OSTime tim
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err CheckDlTaskForRetry(const DlTaskData* task) {
|
||||
DlTaskListHeader* header = NWC24WorkP == NULL ? NULL : (DlTaskListHeader*)NWC24WorkP->dlHead;
|
||||
if (task == NULL) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
if (header == NULL) {
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
}
|
||||
if (task->id != 0xffff && task->id >= header->maxTaskCount) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
static inline NWC24Err CheckDlTaskRetry(NWC24DlTask* dlTask, u8 retryCount) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result = ValidateDlTask(dlTask, FALSE);
|
||||
u32 retryMask;
|
||||
if (result != NWC24_OK) { return result; }
|
||||
if (task->retryEnabled == 0) { return NWC24_ERR_INVALID_OPERATION; }
|
||||
retryMask = task->retryMask;
|
||||
if (retryMask == 0) { return NWC24_ERR_FATAL; }
|
||||
if (retryCount > 31) { return NWC24_ERR_INVALID_VALUE; }
|
||||
if ((retryMask & (1 << retryCount)) == 0) { return NWC24_ERR_DISABLED; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err CheckDlTaskRetry(const NWC24DlTask* dlTask, u8 retryCount) {
|
||||
const DlTaskData* task = (const DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
result = CheckDlTaskForRetry(task);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
if (task->retryEnabled == 0) {
|
||||
return NWC24_ERR_INVALID_OPERATION;
|
||||
}
|
||||
if (task->retryMask == 0) {
|
||||
return NWC24_ERR_FATAL;
|
||||
}
|
||||
if (retryCount > 31) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
return ((1U << retryCount) & task->retryMask) == 0 ? NWC24_ERR_DISABLED : NWC24_OK;
|
||||
}
|
||||
static inline NWC24Err UpdateDlTaskAccessTime(const NWC24DlTask* dlTask) {
|
||||
static inline NWC24Err UpdateDlTaskAccessTime(NWC24DlTask* dlTask) {
|
||||
OSTime universalTime;
|
||||
NWC24Err result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result >= NWC24_OK) {
|
||||
@@ -779,30 +728,24 @@ static inline NWC24Err UpdateDlTaskAccessTime(const NWC24DlTask* dlTask) {
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline NWC24Err ClearDlTaskError(NWC24DlTask* dlTask) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
result = ValidateWritableDlTask(dlTask);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
task->unknown_0x20 = 0;
|
||||
task->unknown_0x1a = 0;
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header;
|
||||
u16 taskId;
|
||||
OSTime universalTime;
|
||||
NWC24Err result;
|
||||
|
||||
result = ValidateWritableDlTask(dlTask);
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = UpdateDlTaskAccessTime(dlTask);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
ClearDlTaskError(dlTask);
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result == NWC24_OK) {
|
||||
task->unknown_0x20 = 0;
|
||||
task->unknown_0x1a = 0;
|
||||
}
|
||||
if (task->retryEnabled == 1) {
|
||||
while ((result = CheckDlTaskRetry(dlTask, task->retryCount)) == NWC24_ERR_DISABLED) {
|
||||
task->retryCount = (task->retryCount + 1) & 0x1f;
|
||||
@@ -1101,7 +1044,6 @@ closeList:
|
||||
NWC24Err NWC24iCheckDlHeaderConsistency(DlTaskListHeader* header, BOOL repair) {
|
||||
NWC24DlTask task;
|
||||
NWC24DlTask* taskPointer = &task;
|
||||
NWC24DlTask* readTask = &task;
|
||||
NWC24DlId taskId;
|
||||
NWC24Err result;
|
||||
DlTaskListHeader* currentHeader;
|
||||
@@ -1118,7 +1060,7 @@ NWC24Err NWC24iCheckDlHeaderConsistency(DlTaskListHeader* header, BOOL repair) {
|
||||
if (currentHeader->entries[taskId].appId == 0) { result = NWC24_ERR_NOT_FOUND; }
|
||||
}
|
||||
if (result != NWC24_OK || !shouldRepair) { continue; }
|
||||
result = ReadDlTaskInline(readTask, taskId);
|
||||
result = ReadDlTaskInline(taskPointer, taskId);
|
||||
if (result < NWC24_OK) {
|
||||
if (ValidateDlTask(taskPointer, FALSE) == NWC24_OK) {
|
||||
result = DeleteDlTask(taskPointer);
|
||||
@@ -1285,44 +1227,32 @@ NWC24Err StoreDlTask(NWC24DlTask* dlTask) {
|
||||
return closeResult;
|
||||
}
|
||||
|
||||
static inline NWC24Err CheckDlUrl(const DlTaskData* task) {
|
||||
const char* url = task->url;
|
||||
static inline NWC24Err ValidateDlTaskUrl(NWC24DlTask* dlTask) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header = GetCachedDlHeader();
|
||||
NWC24Err result;
|
||||
result = NWC24iCheckStringLength(url, 7, 0x100);
|
||||
if (result < NWC24_OK) {
|
||||
return result;
|
||||
if (task->id >= header->maxTaskCount && task->id != 0xffff) { return NWC24_ERR_INVALID_VALUE; }
|
||||
{
|
||||
const char* url = task->url;
|
||||
result = NWC24iCheckStringLength(url, 7, 0x100);
|
||||
if (result >= NWC24_OK) {
|
||||
if (strncmp(url, "http://", 7) != 0 && strncmp(url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
|
||||
else { result = NWC24_OK; }
|
||||
}
|
||||
if (result < NWC24_OK) { return result; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
if (strncmp(url, "http://", 7) != 0 && strncmp(url, "https://", 8) != 0) {
|
||||
return NWC24_ERR_FORMAT;
|
||||
}
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline DlTaskEntry* GetDlTaskEntryHeader(u16 taskId) {
|
||||
return &GetCachedDlHeader()->entries[taskId];
|
||||
}
|
||||
|
||||
static inline NWC24Err ValidateDlTaskUrl(const NWC24DlTask* dlTask) {
|
||||
const DlTaskData* task = (const DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
if (task->id >= GetCachedDlHeader()->maxTaskCount && task->id != 0xffff) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
result = CheckDlUrl(task);
|
||||
if (result < NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err FindFreeDlTask(NWC24DlTask* dlTask, u32 taskCount, u32 maxTaskCount) {
|
||||
static inline NWC24Err FindFreeDlTask(NWC24DlTask* dlTask, u16 taskCount, u16 maxTaskCount) {
|
||||
DlTaskListHeader* header = GetCachedDlHeader();
|
||||
NWC24DlId taskId;
|
||||
if (dlTask == NULL || taskCount > maxTaskCount || taskCount >= header->maxTaskCount || maxTaskCount > header->maxTaskCount) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
for (taskId = taskCount; taskId < maxTaskCount; taskId++) {
|
||||
if (GetDlTaskEntryHeader(taskId)->appId == 0) {
|
||||
header = GetCachedDlHeader();
|
||||
if (header->entries[taskId].appId == 0) {
|
||||
((DlTaskData*)dlTask)->id = taskId;
|
||||
return NWC24_OK;
|
||||
}
|
||||
@@ -1330,10 +1260,24 @@ static inline NWC24Err FindFreeDlTask(NWC24DlTask* dlTask, u32 taskCount, u32 ma
|
||||
return NWC24_ERR_FULL;
|
||||
}
|
||||
|
||||
|
||||
static inline NWC24Err RetryAndStoreDlTask(NWC24DlTask* dlTask) {
|
||||
static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header;
|
||||
u16 taskId;
|
||||
OSTime universalTime;
|
||||
NWC24Err result;
|
||||
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = UpdateDlTaskAccessTime(dlTask);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result == NWC24_OK) {
|
||||
task->unknown_0x20 = 0;
|
||||
task->unknown_0x1a = 0;
|
||||
}
|
||||
if (task->retryEnabled == 1) {
|
||||
while ((result = CheckDlTaskRetry(dlTask, task->retryCount)) == NWC24_ERR_DISABLED) {
|
||||
task->retryCount = (task->retryCount + 1) & 0x1f;
|
||||
@@ -1342,19 +1286,6 @@ static inline NWC24Err RetryAndStoreDlTask(NWC24DlTask* dlTask) {
|
||||
}
|
||||
return StoreDlTask(dlTask);
|
||||
}
|
||||
|
||||
static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
|
||||
result = ValidateWritableDlTask(dlTask);
|
||||
if (result != NWC24_OK) { return result; }
|
||||
if (task->id == 0xffff || task->id >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = UpdateDlTaskAccessTime(dlTask);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
ClearDlTaskError(dlTask);
|
||||
return RetryAndStoreDlTask(dlTask);
|
||||
}
|
||||
NWC24Err AddTaskInternal(NWC24DlTask* dlTask, u16 taskCount, u16 maxTaskCount) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
|
||||
@@ -73,28 +73,22 @@ NWC24Err NWC24ReadMsgSubjectPublic(const NWC24MsgObj* msg, u16* subject, u32* su
|
||||
truncated = TRUE;
|
||||
}
|
||||
result = NWC24ReadMsgSubject(msg, (char*)work, subjectDataSize);
|
||||
switch (result) {
|
||||
case NWC24_OK:
|
||||
break;
|
||||
default:
|
||||
if (result == NWC24_ERR_OVERFLOW) {
|
||||
truncated = TRUE;
|
||||
break;
|
||||
}
|
||||
return result;
|
||||
if (result != NWC24_OK) {
|
||||
if (result == NWC24_ERR_OVERFLOW) {
|
||||
truncated = TRUE;
|
||||
} else {
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
charsetBuffer = NWC24WorkP->stringWork;
|
||||
result =
|
||||
NWC24DecodeMIMEHeaderFieldBody((u8*)charsetBuffer, 0x40, decodedData, decodedCapacity, &decodedSize, work, subjectDataSize);
|
||||
switch (result) {
|
||||
case NWC24_OK:
|
||||
break;
|
||||
default:
|
||||
if (result == NWC24_ERR_OVERFLOW) {
|
||||
truncated = TRUE;
|
||||
break;
|
||||
}
|
||||
return result;
|
||||
if (result != NWC24_OK) {
|
||||
if (result == NWC24_ERR_OVERFLOW) {
|
||||
truncated = TRUE;
|
||||
} else {
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
*subjectSize = originalSize;
|
||||
result =
|
||||
@@ -146,15 +140,11 @@ NWC24Err NWC24ReadMsgTextPublic(const NWC24MsgObj* msg, u16* text, u32* textSize
|
||||
}
|
||||
charsetBuffer = NWC24WorkP->stringWork + 0x20;
|
||||
result = NWC24ReadMsgTextEx(msg, (char*)work, textDataSize, charsetBuffer, 0x40);
|
||||
switch (result) {
|
||||
case NWC24_OK:
|
||||
break;
|
||||
default:
|
||||
if (result == NWC24_ERR_OVERFLOW) {
|
||||
truncated = TRUE;
|
||||
break;
|
||||
}
|
||||
return result;
|
||||
if (result != NWC24_OK) {
|
||||
if (result != NWC24_ERR_OVERFLOW) {
|
||||
goto done;
|
||||
}
|
||||
truncated = TRUE;
|
||||
}
|
||||
|
||||
*textSize = originalSize;
|
||||
@@ -243,12 +233,11 @@ NWC24Err NWC24SetMsgSubjectAndTextPublic(NWC24MsgObj* msg, const u16* subject, u
|
||||
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
|
||||
NWC24Work* nwcWork;
|
||||
u32 textSourceSize;
|
||||
u32 textCapacity;
|
||||
u32 textWorkSize;
|
||||
BOOL is7Bit;
|
||||
NWC24Charset charset;
|
||||
u8* subjectWork;
|
||||
u32 subjectWorkSize;
|
||||
u8* subjectWork;
|
||||
NWC24Err result;
|
||||
|
||||
if (((privateMsg->type & 0x100) == 0) || ((privateMsg->type & 0x200) != 0)) {
|
||||
@@ -284,8 +273,7 @@ NWC24Err NWC24SetMsgSubjectAndTextPublic(NWC24MsgObj* msg, const u16* subject, u
|
||||
if (NWC24ParseCharsetStr(&charset, nwcWork->stringWork) != NWC24_OK) {
|
||||
charset = 0;
|
||||
}
|
||||
textCapacity = (workSize * textSize) / (textSize + subjectSize * 4);
|
||||
textWorkSize = textCapacity;
|
||||
textWorkSize = (workSize * textSize) / (textSize + subjectSize * 4);
|
||||
subjectWorkSize = workSize - textWorkSize;
|
||||
subjectWork = work + textWorkSize;
|
||||
textSourceSize = textSize;
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
#include <private/dvd.h>
|
||||
#include <private/nand.h>
|
||||
#include <private/os.h>
|
||||
#include <revolution/os/OSBootInfo.h>
|
||||
#include <private/vi.h>
|
||||
#include <private/hollywood/flipper.h>
|
||||
|
||||
@@ -243,6 +242,8 @@ BOOL BS2IsDiagDisc() { return (u8)(*(u8 *)OSPhysicalToCached(OS_ADDR_BOOT_INFO)
|
||||
extern vu32 BS2VideoMode;
|
||||
extern vu32 __DVDLayoutFormat;
|
||||
|
||||
extern void __pformatter(void);
|
||||
|
||||
asm void Run(u32 entryPoint, void *start, u32 blockCount, u32 argument) {
|
||||
// clang-format off
|
||||
#ifdef __MWERKS__
|
||||
@@ -281,9 +282,8 @@ asm void Run(u32 entryPoint, void *start, u32 blockCount, u32 argument) {
|
||||
li r30, 0
|
||||
li r31, 0
|
||||
|
||||
// The application stack is fixed; it is unrelated to the formatter.
|
||||
lis r1, 0x8160
|
||||
ori r1, r1, 0
|
||||
lis r1, __pformatter+640@h
|
||||
ori r1, r1, (__pformatter+640)@l
|
||||
li r6, 0
|
||||
|
||||
b Run_loop_entry
|
||||
@@ -489,7 +489,7 @@ BOOL BS2StartLoadingTitle(ESTitleId titleId, ESTicketView *pTicketView) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void callback(u32 result) { LowReadResult = result; }
|
||||
void callback(s32 result) { LowReadResult = result; }
|
||||
|
||||
ESError BS2ESGetTicketViews(IOSFd *descriptor, ESTitleId titleId, ESTicketView *views, u32 *count) {
|
||||
struct {
|
||||
@@ -726,7 +726,7 @@ void BS2StartGame() {
|
||||
BS2Report("DVDLowInit done\n");
|
||||
|
||||
LowReadResult = 0;
|
||||
DVDLowReadDiskID(&DiskID, callback);
|
||||
DVDLowReadDiskID(&DiskID, (DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
}
|
||||
|
||||
@@ -740,7 +740,7 @@ void BS2StartGame() {
|
||||
} else {
|
||||
OSReport("\nDisk error(%d) has occurred", LowReadResult);
|
||||
LowReadResult = 0;
|
||||
DVDLowRequestError(callback);
|
||||
DVDLowRequestError((DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
}
|
||||
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
|
||||
@@ -770,10 +770,10 @@ disk_done:
|
||||
if (PartitionParams.numTmdBytes != 0) {
|
||||
DVDLowOpenPartitionWithTmdAndTicketView((u32)((DVDPartitionInfo *)GamePartition)->partition, &PartitionParams.ticketView,
|
||||
PartitionParams.numTmdBytes, &PartitionParams.tmd, PartitionParams.numCertBytes,
|
||||
PartitionParams.certificates, callback);
|
||||
PartitionParams.certificates, (DVDLowCallback)callback);
|
||||
} else {
|
||||
DVDLowOpenPartition((u32)((DVDPartitionInfo *)GamePartition)->partition, NULL, 0, NULL, &PartitionParams.tmd,
|
||||
callback);
|
||||
(DVDLowCallback)callback);
|
||||
}
|
||||
while (LowReadResult == 0) {
|
||||
}
|
||||
@@ -791,7 +791,7 @@ disk_done:
|
||||
} else {
|
||||
OSReport("\nDisk error(%d) has occurred", LowReadResult);
|
||||
LowReadResult = 0;
|
||||
DVDLowRequestError(callback);
|
||||
DVDLowRequestError((DVDLowCallback)callback);
|
||||
while (LowReadResult == 0) {
|
||||
}
|
||||
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
|
||||
@@ -1345,9 +1345,6 @@ BS2State BS2Tick() {
|
||||
char *ticketByte;
|
||||
u32 entryCount;
|
||||
u32 readInterruptsEnabled;
|
||||
u32 readAddress;
|
||||
const char *discTitle;
|
||||
const DVDDiskID *bootDisc;
|
||||
switch (State) {
|
||||
case 0:
|
||||
BS2Report("No Disk : %d\n", BS2NoDisk);
|
||||
@@ -1361,10 +1358,9 @@ BS2State BS2Tick() {
|
||||
(*(u32 *)0x800030d4) = 0;
|
||||
DvdTransferred = 0;
|
||||
DvdTransferLength = 0;
|
||||
status = BS2NoDisk;
|
||||
AudioBufferUnconfigured = 1;
|
||||
CoverBlock.state = 0;
|
||||
if (status != 0)
|
||||
if (BS2NoDisk != 0)
|
||||
State = BS2_STT_NO_DISK;
|
||||
else if (BS2DriveReset != 0)
|
||||
State = BS2_STT_2;
|
||||
@@ -1443,13 +1439,11 @@ BS2State BS2Tick() {
|
||||
case 5:
|
||||
status = CheckBS2CommandStatus();
|
||||
if (status != 0) {
|
||||
if ((((const OSBootInfo *)0x80000000)->consoleType & 0xf0000000) == 0) {
|
||||
__OSDeviceCode = 0x8002;
|
||||
State = BS2_STT_8;
|
||||
} else {
|
||||
__OSDeviceCode = DriveInfo.deviceCode | 0x8000;
|
||||
State = BS2_STT_8;
|
||||
}
|
||||
if (((*(u32 *)0x8000002c) & 0xf0000000) == 0)
|
||||
(*(u16 *)0x800030e6) = 0x8002;
|
||||
else
|
||||
(*(u16 *)0x800030e6) = DriveInfo.deviceCode | 0x8000;
|
||||
State = BS2_STT_8;
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
@@ -1473,17 +1467,17 @@ BS2State BS2Tick() {
|
||||
break;
|
||||
case 9:
|
||||
case 10: {
|
||||
DVDDiskID *bootDisc;
|
||||
status = CheckBS2CommandStatus();
|
||||
if (status == 0)
|
||||
break;
|
||||
memcpy((void *)0x80000000, &DiskID, sizeof(DVDDiskID));
|
||||
bootDisc = (const DVDDiskID *)0x80000000;
|
||||
bootDisc = (DVDDiskID *)0x80000000;
|
||||
if (bootDisc->rvlMagic == 0x5d1c9ea3) {
|
||||
discTitle = (const char *)0x80000000;
|
||||
status = strncmp(discTitle, "RAAE", 4);
|
||||
if (status == 0 || strncmp(discTitle, "408", 3) == 0 ||
|
||||
strncmp(discTitle, "410", 3) == 0 ||
|
||||
strncmp(discTitle, "410", 3) == 0)
|
||||
status = strncmp((char *)bootDisc, "RAAE", 4);
|
||||
if (status == 0 || strncmp((char *)bootDisc, "408", 3) == 0 ||
|
||||
strncmp((char *)bootDisc, "410", 3) == 0 ||
|
||||
strncmp((char *)bootDisc, "410", 3) == 0)
|
||||
regionMatches = FALSE;
|
||||
else
|
||||
regionMatches = TRUE;
|
||||
@@ -1505,8 +1499,8 @@ BS2State BS2Tick() {
|
||||
State = BS2_STT_11;
|
||||
}
|
||||
case 0xb: {
|
||||
DVDDiskID *bootDisc = (DVDDiskID *)0x80000000;
|
||||
u32 audioBufferSize;
|
||||
bootDisc = (const DVDDiskID *)0x80000000;
|
||||
if (AudioBufferUnconfigured == 0) {
|
||||
State = BS2_STT_GC_GAME;
|
||||
break;
|
||||
@@ -1852,24 +1846,22 @@ invalidRvlRegion:
|
||||
State = BS2_STT_RESET_SYSTEM;
|
||||
break;
|
||||
}
|
||||
if (GamePartition != 0) {
|
||||
if (GamePartition != 0)
|
||||
State = BS2_STT_37;
|
||||
} else {
|
||||
else {
|
||||
State = BS2_STT_54;
|
||||
break;
|
||||
}
|
||||
case 0x25: {
|
||||
u32 partitionOffset = (u32)((DVDPartitionInfo *)GamePartition)->partition;
|
||||
case 0x25:
|
||||
if (BS2BootFromCache != 0) {
|
||||
BS2Report("Open partition from cache.dat\n");
|
||||
NandPending = 1;
|
||||
BS2NANDDivideReadAsync(&BS2CacheFileInfo, &PartitionParams.tmd, 0x4a00, BS2NANDCallback, &BS2NandBlock);
|
||||
} else
|
||||
DVDOpenPartitionAsync(&Block, &PartitionParams.tmd, partitionOffset, BS2DVDCallback);
|
||||
DVDOpenPartitionAsync(&Block, &PartitionParams.tmd, (u32)((DVDPartitionInfo *)GamePartition)->partition, BS2DVDCallback);
|
||||
PartitionOpen = 1;
|
||||
State = BS2_STT_38;
|
||||
break;
|
||||
}
|
||||
case 0x26: {
|
||||
status = CheckBS2CommandStatus();
|
||||
if (status == 0)
|
||||
@@ -1896,16 +1888,13 @@ invalidRvlRegion:
|
||||
titlePrefix = titleCode >> 0x18;
|
||||
titleCharacters[3] = (u8)titleCode;
|
||||
titleCharacters[0] = (char)(titleCode >> 0x18);
|
||||
switch (titlePrefix) {
|
||||
case 'D':
|
||||
case 'R':
|
||||
case 'S':
|
||||
case 'T':
|
||||
if (titlePrefix < 'R') {
|
||||
if (titlePrefix == 'D')
|
||||
goto check_title_region;
|
||||
} else if (titlePrefix < 'U')
|
||||
goto check_title_region;
|
||||
default:
|
||||
regionMatches = TRUE;
|
||||
goto title_region_checked;
|
||||
}
|
||||
regionMatches = TRUE;
|
||||
goto title_region_checked;
|
||||
{
|
||||
check_title_region:
|
||||
if (titleCharacters[3] == 0x41) {
|
||||
@@ -2028,9 +2017,8 @@ invalidRvlRegion:
|
||||
BS2Report("Addr [0x%x] length [0x%x] offset [0x%x]\n", loaderRead.address, loaderRead.length, loaderRead.offset);
|
||||
readInterruptsEnabled = OSDisableInterrupts();
|
||||
BS2ReadDiskID((void *)loaderRead.address, loaderRead.length, loaderRead.offset >> __DVDLayoutFormat);
|
||||
readAddress = loaderRead.address;
|
||||
LoaderLength = loaderRead.length;
|
||||
LoaderAddress = readAddress;
|
||||
LoaderAddress = loaderRead.address;
|
||||
LoaderOffset = loaderRead.offset;
|
||||
if ((*(s32 *)DvdProgress != 0) && (BS2BootFromCache == 0)) {
|
||||
DvdReadPending = 1;
|
||||
@@ -2064,8 +2052,8 @@ invalidRvlRegion:
|
||||
if (status == 0)
|
||||
OSPanic("BS2Mach.c", 0x12c8, "BS2 ERROR >>> Cannnot alloc 0x%08x from MEMAllocator", bannerFile.length);
|
||||
BannerLength = bannerFile.length;
|
||||
BannerBuffer = BannerAllocation + 32 - BannerAllocation % 32;
|
||||
BS2Report("BannerBufferAddr : %08X\n", BannerBuffer);
|
||||
BannerBuffer = OSRoundDown32B(BannerAllocation) + 32;
|
||||
BS2Report("BannerBufferAddr : %08X\n");
|
||||
} else {
|
||||
if ((BannerBuffer != 0) && (BannerLength != 0)) {
|
||||
if (BannerLength < ((bannerFile.length + 0x1fU) & 0xffffffe0))
|
||||
|
||||
@@ -23,10 +23,10 @@ s32 WADImportDVDForBS(const char* path, void* buffer, u32 length);
|
||||
s32 WADImportDVDExForBS(const char* path, void* buffer, u32 length);
|
||||
|
||||
static BS2UpdateEntry* pEntries = NULL;
|
||||
static volatile u32 EntriesCount = 0;
|
||||
static u32 EntriesCount = 0;
|
||||
static u32* pFlags = NULL;
|
||||
static void* MemAllocator = NULL;
|
||||
volatile int State = 0;
|
||||
int State = 0;
|
||||
BS2UpdateEntry* CurrentEntry = 0;
|
||||
static u32 RebootRequired = 0;
|
||||
static BOOL ContainsSeatTitles = 0;
|
||||
@@ -77,8 +77,7 @@ void BS2UpdateInit(void* allocator) {
|
||||
OSResumeThread(&Thread);
|
||||
}
|
||||
|
||||
static inline u32 BS2SelectUpdateEntries(void) {
|
||||
|
||||
static void* UpdateThread(void* argument) {
|
||||
BOOL missingFile;
|
||||
u32 selectedCount;
|
||||
u32 requiredBytes;
|
||||
@@ -90,6 +89,7 @@ static inline u32 BS2SelectUpdateEntries(void) {
|
||||
u32 selectedSeatCount;
|
||||
BOOL regionValid;
|
||||
u32 titleRegion;
|
||||
s32 importResult;
|
||||
struct {
|
||||
u32 freeChannels;
|
||||
u32 freeBlocks;
|
||||
@@ -102,6 +102,9 @@ static inline u32 BS2SelectUpdateEntries(void) {
|
||||
DVDFileInfo file;
|
||||
} scratch;
|
||||
|
||||
BS2Report("Start update thread\n");
|
||||
StartUpdate = 0;
|
||||
CancelUpdate = 0;
|
||||
missingFile = FALSE;
|
||||
selectedCount = 0;
|
||||
requiredBytes = 0;
|
||||
@@ -159,12 +162,12 @@ product_region_checked:
|
||||
if (!regionValid) {
|
||||
BS2Report("Error: failed to check product region.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
if (!SCGetProductAreaString(scratch.productArea, sizeof(scratch.productArea))) {
|
||||
BS2Report("Error: failed to get product information.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
strcpy(scratch.updatePath, "__update.inf");
|
||||
strcat(scratch.updatePath, ".");
|
||||
@@ -180,46 +183,46 @@ product_region_checked:
|
||||
if (DVDConvertPathToEntrynum(scratch.updatePath) < 0) {
|
||||
BS2Report("Error: update information file is not found.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
BS2Report("Error: update information file is not found.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
}
|
||||
BS2Report("%s is found.\n", scratch.updatePath);
|
||||
if (!DVDOpen(scratch.updatePath, &scratch.file)) {
|
||||
BS2Report("Error: failed to open update information file.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
if (DVDReadPrio(&scratch.file, &UpdateHeader0, sizeof(UpdateHeader0), 0, 2) < 0) {
|
||||
BS2Report("Error: failed to read update information header.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
if (UpdateHeader0.wadCount == 0) {
|
||||
BS2Report("Error: no entry.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
if (UpdateHeader0.wadCount > 32) {
|
||||
BS2Report("Error: found too many entries.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
UpdateHeader0.wadCount += UpdateHeader0.extraCount;
|
||||
if (UpdateHeader0.wadCount > BS2_UPDATE_ENTRY_COUNT) {
|
||||
BS2Report("Error: found too many extra entries.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
if (DVDReadPrio(&scratch.file, UPDATE_DISC_ENTRIES, UpdateHeader0.wadCount * sizeof(BS2UpdateEntry), 32, 2) < 0) {
|
||||
BS2Report("Error: failed to read update information.");
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
{
|
||||
BS2UpdateEntry *discEntries = UPDATE_DISC_ENTRIES;
|
||||
@@ -242,7 +245,7 @@ product_region_checked:
|
||||
BS2Report("Cannot get physical MEM2 size\n");
|
||||
State = 5;
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
if (DVDOpen(discEntries[index].path, &scratch.file) < 0) {
|
||||
BS2Report("%s is not found\n", discEntries[index].path);
|
||||
@@ -302,10 +305,8 @@ product_region_checked:
|
||||
BS2Report("Error: found too many extra entries.");
|
||||
goto seats_done;
|
||||
}
|
||||
seatEntries = UPDATE_DISC_ENTRIES;
|
||||
seatEntries += UpdateHeader0.wadCount;
|
||||
selectedSeats = EntriesToImport;
|
||||
selectedSeats += selectedCount;
|
||||
seatEntries = &UPDATE_DISC_ENTRIES[UpdateHeader0.wadCount];
|
||||
selectedSeats = &EntriesToImport[selectedCount];
|
||||
if (DVDReadPrio(&scratch.file, seatEntries, UpdateHeader1.wadCount * sizeof(BS2UpdateEntry), 32, 2) < 0) {
|
||||
BS2Report("Error: failed to read update information.");
|
||||
goto seats_done;
|
||||
@@ -407,7 +408,7 @@ seats_done:
|
||||
if (missingFile) {
|
||||
State = 5;
|
||||
selectedCount = 0;
|
||||
goto selection_complete;
|
||||
goto selection_done;
|
||||
}
|
||||
pEntries = EntriesToImport;
|
||||
pFlags = Flags1;
|
||||
@@ -423,17 +424,8 @@ seats_done:
|
||||
}
|
||||
}
|
||||
}
|
||||
selection_complete:
|
||||
return selectedCount;
|
||||
}
|
||||
|
||||
static void* UpdateThread(void* argument) {
|
||||
u32 index;
|
||||
s32 importResult;
|
||||
BS2Report("Start update thread\n");
|
||||
StartUpdate = 0;
|
||||
CancelUpdate = 0;
|
||||
EntriesCount = BS2SelectUpdateEntries();
|
||||
selection_done:
|
||||
EntriesCount = selectedCount;
|
||||
if (EntriesCount == 0) {
|
||||
State = 5;
|
||||
StartUpdate = 0;
|
||||
@@ -457,7 +449,7 @@ static void* UpdateThread(void* argument) {
|
||||
UpdateProgress++;
|
||||
continue;
|
||||
}
|
||||
if (((const BS2UpdateEntry *)discEntries)[UpdateProgress].type == 1) {
|
||||
if (discEntries[UpdateProgress].type == 1) {
|
||||
BS2Report("BS2WADImportDVD : ");
|
||||
index = UpdateProgress;
|
||||
if (strcmp(getSuffix(discEntries[index].path), "wad") == 0) {
|
||||
@@ -510,8 +502,8 @@ static void* UpdateThread(void* argument) {
|
||||
} else {
|
||||
State = 3;
|
||||
}
|
||||
CurrentEntry = NULL;
|
||||
UpdateProgress++;
|
||||
CurrentEntry = NULL;
|
||||
break;
|
||||
}
|
||||
} else if (CancelUpdate != 0) {
|
||||
|
||||
@@ -19,10 +19,10 @@
|
||||
typedef struct {
|
||||
u64 work[0xD0 / sizeof(u64)];
|
||||
} NETHMACContext;
|
||||
extern const void* NETGetSHA1Interface(void);
|
||||
extern void NETHMACInit(NETHMACContext* ctx, const void* interface, const void* key, u32 keyLen);
|
||||
extern void NETHMACUpdate(NETHMACContext* ctx, const void* data, u32 len);
|
||||
extern void NETHMACGetDigest(NETHMACContext* ctx, void* digest);
|
||||
static const void* NETGetSHA1Interface(void);
|
||||
static void NETHMACInit(NETHMACContext* ctx, const void* interface, const void* key, u32 keyLen);
|
||||
static void NETHMACUpdate(NETHMACContext* ctx, const void* data, u32 len);
|
||||
static void NETHMACGetDigest(NETHMACContext* ctx, void* digest);
|
||||
extern char VmReportFormat[];
|
||||
|
||||
#define CHANSVmDebugLength 1024
|
||||
@@ -54,6 +54,7 @@ const u64 VmMinusInf = 0xFFF0000000000000ULL;
|
||||
#define VM_READ_BE_U16(b, o) ((u16)((b)[(o)] << 8 | (b)[(o) + 1]))
|
||||
#define VM_READ_BE_U24(b, o) ((u32)((b)[(o)] << 16 | (b)[(o) + 1] << 8 | (b)[(o) + 2]))
|
||||
#define VM_MAKE_U64(hi, lo) ((u64)(u32)(hi) << 32 | (u64)(lo))
|
||||
#define VM_S64_FROM_U64(v) ((s64)(u32)((v) >> 32) << 32 | (u64)(u32)(v))
|
||||
|
||||
void CHANSVmDebugPrintf(const vmString format, ...) {
|
||||
va_list args;
|
||||
@@ -1413,7 +1414,7 @@ CHANSVmErr VmCmpGeq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSV
|
||||
return VmCmpLeq(vm, type, ret, right, left);
|
||||
}
|
||||
|
||||
CHANSVmErr CHANSVmGetBoolean(vmBoolInt* ret, CHANSVmObjHdr* val) {
|
||||
CHANSVmErr CHANSVmGetBoolean(CHANSVmObjHdr* ret, CHANSVmObjHdr* val) {
|
||||
vmBoolInt result;
|
||||
switch (val->type) {
|
||||
case CHANS_VM_OBJ_TYPE_BLANK: {
|
||||
@@ -1447,7 +1448,7 @@ CHANSVmErr CHANSVmGetBoolean(vmBoolInt* ret, CHANSVmObjHdr* val) {
|
||||
}
|
||||
}
|
||||
if (ret != vmNull) {
|
||||
*ret = result;
|
||||
ret->value.bool_v = result;
|
||||
}
|
||||
return CHANS_VM_OK;
|
||||
}
|
||||
@@ -3069,22 +3070,20 @@ VmMethodDefine(String, Search) {
|
||||
return VmStringObjectIndex(VmInst, VmParentObj, VmReturnObj, 1, 1);
|
||||
}
|
||||
|
||||
static inline vmBoolInt VmReplaceStringContents(CHANSVm *VmInst, const CHANSVmObjHdr *VmParentObj, CHANSVmObjHdr *VmReturnObj) {
|
||||
VmMethodDefine(String, Replace) {
|
||||
CHANSVmObjHdr* arg0;
|
||||
vmString replaceStr;
|
||||
vmString searchStr;
|
||||
vmString parentStr;
|
||||
vmString newStr;
|
||||
u32 dstBufLen;
|
||||
u32 replaceLen;
|
||||
u32 dstOffs;
|
||||
CHANSVmObjHdr* arg1;
|
||||
u32 searchLen;
|
||||
u32 srcOffs;
|
||||
vmString parentStr;
|
||||
vmString searchStr;
|
||||
vmString replaceStr;
|
||||
u32 parentLen;
|
||||
u32 srcOffs;
|
||||
u32 dstOffs;
|
||||
u32 searchLen;
|
||||
u32 replaceLen;
|
||||
u32 dstBufLen;
|
||||
vmString newStr;
|
||||
u32 segLen;
|
||||
const vmStringObjVal *parentValue;
|
||||
const vmStringObjVal *searchValue;
|
||||
|
||||
if (((CHANSVmPrivate*)VmInst)->pActiveCtx->argc < 2) {
|
||||
goto return_input;
|
||||
@@ -3099,12 +3098,10 @@ static inline vmBoolInt VmReplaceStringContents(CHANSVm *VmInst, const CHANSVmOb
|
||||
goto return_input;
|
||||
}
|
||||
|
||||
parentValue = VmParentObj->value.string_v;
|
||||
searchValue = arg0->value.string_v;
|
||||
parentLen = parentValue->len;
|
||||
searchLen = searchValue->len;
|
||||
parentStr = parentValue->spData;
|
||||
searchStr = searchValue->spData;
|
||||
parentLen = VmParentObj->value.string_v->len;
|
||||
searchLen = arg0->value.string_v->len;
|
||||
parentStr = VmParentObj->value.string_v->spData;
|
||||
searchStr = arg0->value.string_v->spData;
|
||||
replaceStr = arg1->value.string_v->spData;
|
||||
replaceLen = arg1->value.string_v->len;
|
||||
|
||||
@@ -3172,16 +3169,12 @@ static inline vmBoolInt VmReplaceStringContents(CHANSVm *VmInst, const CHANSVmOb
|
||||
return VmReturnObj->value.string_v->len == dstOffs ? vmTrue : vmFalse;
|
||||
|
||||
return_input:
|
||||
return VmStringObjectDup(VmInst, VmReturnObj, (CHANSVmObjHdr *)VmParentObj) ? vmTrue : vmFalse;
|
||||
return VmStringObjectDup(VmInst, VmReturnObj, VmParentObj) ? vmTrue : vmFalse;
|
||||
|
||||
error:
|
||||
return 0;
|
||||
}
|
||||
|
||||
VmMethodDefine(String, Replace) {
|
||||
return VmReplaceStringContents(VmInst, VmParentObj, VmReturnObj);
|
||||
}
|
||||
|
||||
VmMethodDefine(String, Splice) {
|
||||
CHANSVmObjHdr* arg0;
|
||||
CHANSVmObjHdr* arg1;
|
||||
@@ -4975,24 +4968,6 @@ exit:
|
||||
return curPos;
|
||||
}
|
||||
|
||||
static inline void VmBlobCopyPadded(BlobHeader* parentBlob, const BlobHeader* srcBlob, s32 copySize) {
|
||||
u32 srcOff;
|
||||
u32 dataSize;
|
||||
u8* dest;
|
||||
|
||||
srcOff = srcBlob->offset;
|
||||
dataSize = srcBlob->size - srcOff;
|
||||
dest = parentBlob->pData + parentBlob->offset;
|
||||
if (dataSize > copySize) {
|
||||
dataSize = copySize;
|
||||
}
|
||||
memmove(dest, srcBlob->pData + srcOff, dataSize);
|
||||
if (dataSize < copySize) {
|
||||
memset(dest + dataSize, 0, copySize - dataSize);
|
||||
}
|
||||
parentBlob->offset += copySize;
|
||||
}
|
||||
|
||||
static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, CHANSVmObjHdr* VmReturnObj, vmU32 flag) {
|
||||
u32 packBuf[2];
|
||||
BlobHeader* parentBlob;
|
||||
@@ -5008,6 +4983,8 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
CHANSVmObjHdr* obj;
|
||||
BlobHeader* srcBlob;
|
||||
s32 copySize;
|
||||
u32 dataSize;
|
||||
u32 srcOff;
|
||||
CHANSVmObjHdr* strObj;
|
||||
u8* srcData;
|
||||
u32 charCount;
|
||||
@@ -5156,7 +5133,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
argCount++;
|
||||
totalSize += (s32)((u32)count + 1U) / 2;
|
||||
totalSize += (count + 1) / 2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -5229,7 +5206,17 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
VmBlobCopyPadded(parentBlob, srcBlob, copySize);
|
||||
srcOff = srcBlob->offset;
|
||||
dataSize = srcBlob->size - srcOff;
|
||||
dest = parentBlob->pData + parentBlob->offset;
|
||||
if (dataSize > copySize) {
|
||||
dataSize = copySize;
|
||||
}
|
||||
memmove(dest, srcBlob->pData + srcOff, dataSize);
|
||||
if (dataSize < copySize) {
|
||||
memset(dest + dataSize, 0, copySize - dataSize);
|
||||
}
|
||||
parentBlob->offset += copySize;
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
@@ -5436,7 +5423,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
bufSize = (s32)((u32)count + 1U) / 2;
|
||||
bufSize = (count + 1) / 2;
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, bufSize)) {
|
||||
goto error;
|
||||
}
|
||||
@@ -5447,20 +5434,22 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
memset(dest, 0, bufSize);
|
||||
|
||||
for (i = 0; (s32)i < count; i++) {
|
||||
u32 nibble;
|
||||
|
||||
ch = ((const u16*)srcData)[i];
|
||||
if (ch >= 0x30 && ch <= 0x39) {
|
||||
ch -= 0x30;
|
||||
nibble = ch - 0x30;
|
||||
} else if (ch >= 0x61 && ch <= 0x66) {
|
||||
ch -= 0x57;
|
||||
nibble = ch - 0x57;
|
||||
} else if (ch >= 0x41 && ch <= 0x46) {
|
||||
ch -= 0x37;
|
||||
nibble = ch - 0x37;
|
||||
} else {
|
||||
ch = 0;
|
||||
nibble = 0;
|
||||
}
|
||||
if ((i & 1) == 0) {
|
||||
ch *= 16;
|
||||
nibble *= 16;
|
||||
}
|
||||
*dest |= ch & 0xFF;
|
||||
*dest |= nibble & 0xFF;
|
||||
if (i & 1) {
|
||||
dest++;
|
||||
}
|
||||
@@ -6285,27 +6274,6 @@ vmU32 CHANSVmGetFreeExeSize(CHANSVm* vm) {
|
||||
|
||||
void CHANSConvertModuleOfsToPtr(CHANSVmModule* ptr);
|
||||
|
||||
static inline int VmFixMethodTable(CHANSVmModule* header, CHANSVm* vm) {
|
||||
u32 i;
|
||||
DispatchEntry* methodTable = header->pMethodRefTbl;
|
||||
|
||||
for (i = 1; i < header->methodCount; i++) {
|
||||
if (methodTable[i].nameLength) {
|
||||
if ((u8*)(methodTable[i].offset + (methodTable[i].nameLength + (vmU32)methodTable)) <=
|
||||
(u8*)((vmU32)header + header->regionSize)) {
|
||||
CHANSVmObjHdr* method = (CHANSVmObjHdr*)CHANSVmAddNativeMethodName(vm, (const char*)(methodTable[i].offset + (vmU32)methodTable),
|
||||
methodTable[i].nameLength);
|
||||
if (method) {
|
||||
header->pMethodTbl[i] = (vmU32)method;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
CHANSVmErr CHANSVmAddExe(CHANSVm* vm, vmS32 unk0, CHANSVm* execCtx) {
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
ModuleHeader* mod;
|
||||
@@ -6410,15 +6378,41 @@ CHANSVmErr CHANSVmAddExe(CHANSVm* vm, vmS32 unk0, CHANSVm* execCtx) {
|
||||
|
||||
{
|
||||
u32 i;
|
||||
for (i = 0; i < header->moduleCount; i++) {
|
||||
memset(&header->pModuleTbl[i], 0, sizeof(ModuleEntry));
|
||||
u32 tblOffs;
|
||||
|
||||
for (i = 0, tblOffs = 0; i < header->moduleCount;) {
|
||||
memset((u8*)header->pModuleTbl + tblOffs, 0, sizeof(ModuleEntry));
|
||||
i++;
|
||||
tblOffs += sizeof(ModuleEntry);
|
||||
}
|
||||
}
|
||||
|
||||
CHANSConvertModuleOfsToPtr(header);
|
||||
|
||||
if (!VmFixMethodTable(header, vm)) {
|
||||
goto fail_format;
|
||||
{
|
||||
DispatchEntry* methodTable = header->pMethodRefTbl;
|
||||
u32 i;
|
||||
int ok;
|
||||
|
||||
for (i = 1; i < header->methodCount; i++) {
|
||||
if (methodTable[i].nameLength) {
|
||||
if ((u8*)(methodTable[i].nameLength + (vmU32)methodTable + methodTable[i].offset) <= (u8*)((vmU32)header + header->regionSize)) {
|
||||
CHANSVmObjHdr* method = (CHANSVmObjHdr*)CHANSVmAddNativeMethodName(vm, (const char*)(methodTable[i].offset + (vmU32)methodTable),
|
||||
methodTable[i].nameLength);
|
||||
if (method) {
|
||||
header->pMethodTbl[i] = (vmU32)method;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
ok = 0;
|
||||
goto check_method;
|
||||
}
|
||||
ok = 1;
|
||||
check_method:
|
||||
if (ok == 0) {
|
||||
goto fail_format;
|
||||
}
|
||||
}
|
||||
{
|
||||
u8* strPtr = header->pStringDataTbl;
|
||||
@@ -6785,79 +6779,10 @@ static CHANSVmErr VmReturnWithValue(CHANSVm* vm, u32 val) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline CHANSVmErr VmResolveGlobalModules(CHANSVmModule* module, GlobalObjListNode* head) {
|
||||
DispatchEntry* dispatchTable;
|
||||
GlobalObjListNode* gIter;
|
||||
u32 i;
|
||||
dispatchTable = module->pDispatchTbl;
|
||||
|
||||
for (gIter = head; gIter != vmNull; gIter = gIter->next) {
|
||||
for (i = 0; i < module->moduleCount; i++) {
|
||||
DispatchEntry entry = dispatchTable[i];
|
||||
u8* addr;
|
||||
|
||||
if (!gIter->nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
addr = (u8*)dispatchTable + entry.offset;
|
||||
if (addr + gIter->nameLength > (u8*)module + module->regionSize || gIter->nameLength != entry.nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (memcmp(gIter->name, addr, gIter->nameLength) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (module->pModuleTbl[i].type) {
|
||||
return CHANS_VM_ERR_RESOLVE_GLOBAL_OBJECT_REFERENCE;
|
||||
}
|
||||
module->pModuleTbl[i].type = CHANS_VM_TYPE_GLOBAL_REF;
|
||||
module->pModuleTbl[i].pGlobalObj = gIter;
|
||||
module->pModuleTbl[i].flags = CHANSVM_OBJ_FLAG_READONLY;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline CHANSVmErr VmResolveNativeModules(CHANSVmModule* module, CHANSVmNativeClass* head) {
|
||||
DispatchEntry* dispatchTable;
|
||||
CHANSVmNativeClass* nIter;
|
||||
u32 i;
|
||||
dispatchTable = module->pDispatchTbl;
|
||||
for (nIter = head; nIter != vmNull; nIter = nIter->pNext) {
|
||||
for (i = 0; i < module->moduleCount; i++) {
|
||||
DispatchEntry entry = dispatchTable[i];
|
||||
u8* addr;
|
||||
|
||||
if (!nIter->nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
addr = (u8*)dispatchTable + entry.offset;
|
||||
if (addr + nIter->nameLength > (u8*)module + module->regionSize || nIter->nameLength != entry.nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (memcmp(nIter->sName, addr, nIter->nameLength) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (module->pModuleTbl[i].type) {
|
||||
return CHANS_VM_ERR_RESOLVE_NATIVE_METHOD_CALL;
|
||||
}
|
||||
module->pModuleTbl[i].type = CHANS_VM_TYPE_CLASS_REF;
|
||||
module->pModuleTbl[i].pNativeClass = nIter;
|
||||
module->pModuleTbl[i].flags = CHANSVM_OBJ_FLAG_READONLY;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0) {
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
u32 modIdx;
|
||||
CHANSVmModule* module;
|
||||
u32 modIdx;
|
||||
u32 i;
|
||||
|
||||
(void)unk0;
|
||||
@@ -6869,14 +6794,76 @@ CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0) {
|
||||
|
||||
while (modIdx < (u32)pVm->depth) {
|
||||
CHANSVmErr result;
|
||||
DispatchEntry* dispatchTable;
|
||||
GlobalObjListNode* gIter;
|
||||
CHANSVmNativeClass* nIter;
|
||||
|
||||
pVm->pActiveCtx->pDbg = module;
|
||||
result = VmResolveGlobalModules(module, pVm->pGlobalObjList);
|
||||
dispatchTable = module->pDispatchTbl;
|
||||
|
||||
for (gIter = pVm->pGlobalObjList; gIter != vmNull; gIter = gIter->next) {
|
||||
for (i = 0; i < module->moduleCount; i++) {
|
||||
DispatchEntry entry = dispatchTable[i];
|
||||
u8* addr;
|
||||
|
||||
if (!gIter->nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
addr = (u8*)dispatchTable + entry.offset;
|
||||
if (addr + gIter->nameLength > (u8*)module + module->regionSize || gIter->nameLength != entry.nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (memcmp(gIter->name, addr, gIter->nameLength) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (module->pModuleTbl[i].type) {
|
||||
result = CHANS_VM_ERR_RESOLVE_GLOBAL_OBJECT_REFERENCE;
|
||||
goto post_pass1;
|
||||
}
|
||||
module->pModuleTbl[i].type = CHANS_VM_TYPE_GLOBAL_REF;
|
||||
module->pModuleTbl[i].pGlobalObj = gIter;
|
||||
module->pModuleTbl[i].flags = CHANSVM_OBJ_FLAG_READONLY;
|
||||
}
|
||||
}
|
||||
result = 0;
|
||||
post_pass1:
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
|
||||
result = VmResolveNativeModules(module, pVm->pNativeClasses);
|
||||
dispatchTable = module->pDispatchTbl;
|
||||
for (nIter = pVm->pNativeClasses; nIter != vmNull; nIter = nIter->pNext) {
|
||||
for (i = 0; i < module->moduleCount; i++) {
|
||||
DispatchEntry entry = dispatchTable[i];
|
||||
u8* addr;
|
||||
|
||||
if (!nIter->nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
addr = (u8*)dispatchTable + entry.offset;
|
||||
if (addr + nIter->nameLength > (u8*)module + module->regionSize || nIter->nameLength != entry.nameLength) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (memcmp(nIter->sName, addr, nIter->nameLength) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (module->pModuleTbl[i].type) {
|
||||
result = CHANS_VM_ERR_RESOLVE_NATIVE_METHOD_CALL;
|
||||
goto post_pass2;
|
||||
}
|
||||
module->pModuleTbl[i].type = CHANS_VM_TYPE_CLASS_REF;
|
||||
module->pModuleTbl[i].pNativeClass = nIter;
|
||||
module->pModuleTbl[i].flags = CHANSVM_OBJ_FLAG_READONLY;
|
||||
}
|
||||
}
|
||||
result = 0;
|
||||
post_pass2:
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
@@ -6942,7 +6929,7 @@ static u8* VmGetOperand(CHANSVm* vm, u32 num, u32 offset) {
|
||||
}
|
||||
|
||||
static CHANSVmErr VmLoadImmInteger(CHANSVm* vm, CHANSVmObjHdr* obj, u8* buf, s32 count) {
|
||||
u64 acc = 0;
|
||||
s64 acc = 0;
|
||||
u8* p = buf;
|
||||
|
||||
while (count != 0) {
|
||||
@@ -6952,7 +6939,7 @@ static CHANSVmErr VmLoadImmInteger(CHANSVm* vm, CHANSVmObjHdr* obj, u8* buf, s32
|
||||
count--;
|
||||
}
|
||||
|
||||
return CHANSVmSetInteger(vm, obj, (vmInteger)acc);
|
||||
return CHANSVmSetInteger(vm, obj, acc);
|
||||
}
|
||||
|
||||
CHANSVmErr VmStore(CHANSVm* vm, CHANSVmObjHdr* dest, CHANSVmObjHdr* src) {
|
||||
@@ -7220,7 +7207,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
u32 cmpLow;
|
||||
struct {
|
||||
CHANSVmObjType operandTypes[2];
|
||||
double floatLiteral;
|
||||
u64 floatBits;
|
||||
CHANSVmObjHdr copies[2];
|
||||
CHANSVmObjHdr load;
|
||||
CHANSVmObjHdr operand;
|
||||
@@ -7247,7 +7234,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
CHANSVmErr result;
|
||||
u32 newPos;
|
||||
u32 isTypeMatch;
|
||||
vmBoolInt shouldBranch;
|
||||
u32 shouldBranch;
|
||||
|
||||
if (pVm->bSignalUpdated != vmFalse && pVm->bSignalBlocked == vmFalse) {
|
||||
pVm->bSignalUpdated = vmFalse;
|
||||
@@ -7304,8 +7291,8 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
case CHANS_VM_OP_LOAD_FLOAT: {
|
||||
opSize = 9;
|
||||
operandBuf = VmGetOperand(vm, 1, 9);
|
||||
memcpy(&scratch.floatLiteral, operandBuf, 8);
|
||||
result = CHANSVmSetFloat(vm, &pVm->accumulator, scratch.floatLiteral);
|
||||
memcpy(&scratch.floatBits, operandBuf, 8);
|
||||
result = CHANSVmSetFloat(vm, &pVm->accumulator, *(double*)&scratch.floatBits);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -7636,8 +7623,8 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
|
||||
case CHANS_VM_OP_LOG_NOT: {
|
||||
CHANSVmObjHdr* pAcc = &pVm->accumulator;
|
||||
vmBoolInt bResult;
|
||||
CHANSVmErr booleanResult = CHANSVmGetBoolean(&bResult, pAcc);
|
||||
u32 bResult;
|
||||
CHANSVmErr booleanResult = CHANSVmGetBoolean((CHANSVmObjHdr*)&bResult, pAcc);
|
||||
if (booleanResult == CHANS_VM_OK) {
|
||||
s32 boolVal = bResult ? 0 : 1;
|
||||
booleanResult = CHANSVmSetInteger(vm, pAcc, boolVal);
|
||||
@@ -7782,8 +7769,8 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
arrayIdx = (u32)stackPtr->value.int_v;
|
||||
goto set_index_ok;
|
||||
case CHANS_VM_OBJ_TYPE_FLOAT: {
|
||||
double stackFloat = stackPtr->value.float_v;
|
||||
if (stackFloat >= 0.0 && stackFloat <= 4294967294.0) {
|
||||
double stackFloat = *(double*)stackPtr;
|
||||
if (stackFloat <= 4294967294.0 && 0.0 <= stackFloat) {
|
||||
arrayIdx = (u32)stackFloat;
|
||||
goto set_index_ok;
|
||||
}
|
||||
@@ -7794,7 +7781,8 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
cmpHigh = 0;
|
||||
cmpLow = -2;
|
||||
cmpVal = VM_MAKE_U64(cmpHigh, cmpLow);
|
||||
if (tmp64 <= cmpVal) {
|
||||
fullVal = VM_S64_FROM_U64(tmp64);
|
||||
if ((u64)fullVal <= cmpVal) {
|
||||
arrayIdx = (u32)tmp64;
|
||||
goto set_index_ok;
|
||||
}
|
||||
@@ -8016,27 +8004,34 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
if (pVm->pActiveCtx->stackDepth != 0 && pVm->pObjStackTopBuf + sizeof(CHANSVmObjHdr) <= pVm->pHeapEnd) {
|
||||
CHANSVmObjHdr* stackTop = (CHANSVmObjHdr*)pVm->pObjStackTopBuf;
|
||||
isTypeMatch = 0;
|
||||
if (stackTop->type == pVm->accumulator.type) {
|
||||
if (pVm->accumulator.type == stackTop->type) {
|
||||
switch (stackTop->type) {
|
||||
case CHANS_VM_OBJ_TYPE_INTEGER: {
|
||||
isTypeMatch = stackTop->value.int_v == pVm->accumulator.value.int_v;
|
||||
u32 low1 = *(u32*)stackTop;
|
||||
u32 low2 = *(u32*)&pVm->accumulator;
|
||||
u32 high1 = *((u32*)stackTop + 1);
|
||||
u32 high2 = *((u32*)&pVm->accumulator + 1);
|
||||
u32 xor1 = low1 ^ low2;
|
||||
u32 xor2 = high1 ^ high2;
|
||||
isTypeMatch = !(xor1 | xor2);
|
||||
goto end_branch_check;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_FLOAT: {
|
||||
isTypeMatch = stackTop->value.float_v == pVm->accumulator.value.float_v;
|
||||
double stackFloat = stackTop->value.float_v;
|
||||
double accFloat = pVm->accumulator.value.float_v;
|
||||
isTypeMatch = stackFloat == accFloat ? 1 : 0;
|
||||
goto end_branch_check;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_STRING: {
|
||||
u32 len1, len2;
|
||||
const vmWStringObjVal* accumulatorString = pVm->accumulator.value.wstring_v;
|
||||
const vmWStringObjVal* stackString = stackTop->value.wstring_v;
|
||||
CHANSVmObjHdr* stackObj = (CHANSVmObjHdr*)pVm->pObjStackTopBuf;
|
||||
u32 strEqual;
|
||||
isTypeMatch = 0;
|
||||
len1 = stackString->len;
|
||||
len2 = accumulatorString->len;
|
||||
len1 = stackObj->value.wstring_v->len;
|
||||
len2 = pVm->accumulator.value.wstring_v->len;
|
||||
if (len1 == len2) {
|
||||
strEqual = 0;
|
||||
if (len1 == 0 || memcmp(stackString->spData, accumulatorString->spData, len1) == 0) {
|
||||
if (len1 == 0 || memcmp(stackObj->value.wstring_v->spData, pVm->accumulator.value.wstring_v->spData, len1) == 0) {
|
||||
strEqual = 1;
|
||||
}
|
||||
if (strEqual) {
|
||||
@@ -8077,14 +8072,14 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OP_BRANCH_FALSE: {
|
||||
result = CHANSVmGetBoolean(&shouldBranch, &pVm->accumulator);
|
||||
result = CHANSVmGetBoolean((CHANSVmObjHdr*)&shouldBranch, &pVm->accumulator);
|
||||
if (result == CHANS_VM_OK) {
|
||||
shouldBranch = !shouldBranch;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OP_BRANCH_TRUE: {
|
||||
result = CHANSVmGetBoolean(&shouldBranch, &pVm->accumulator);
|
||||
result = CHANSVmGetBoolean((CHANSVmObjHdr*)&shouldBranch, &pVm->accumulator);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OP_BRANCH_ALWAYS: {
|
||||
|
||||
@@ -394,24 +394,17 @@ namespace textinput {
|
||||
mOnOffButton.Create(this);
|
||||
mOnOffButton.Init();
|
||||
const char* paneNames = scPaneNameTable;
|
||||
const char* leftScrollBoundName = paneNames + 48;
|
||||
const char* leftScrollPaneName = paneNames + 68;
|
||||
mLeftScroll.Create(this, leftScrollPaneName, leftScrollBoundName);
|
||||
const char* rightScrollBoundName = paneNames + 88;
|
||||
const char* rightScrollPaneName = paneNames + 108;
|
||||
mRightScroll.Create(this, rightScrollPaneName, rightScrollBoundName);
|
||||
mLeftScroll.Create(this, paneNames + 68, paneNames + 48);
|
||||
mRightScroll.Create(this, paneNames + 108, paneNames + 88);
|
||||
mLeftScroll.Init();
|
||||
mRightScroll.Init();
|
||||
const char* windowName = scW_predictWindow;
|
||||
mTextWindow.Create(this, windowName);
|
||||
mTextWindow.Create(this, scW_predictWindow);
|
||||
init();
|
||||
}
|
||||
|
||||
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
|
||||
CandidateTextAnmPane* pane;
|
||||
u16 j;
|
||||
u16 i;
|
||||
for (i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
pane = NULL;
|
||||
const PaneToAnimation& p = scCandidatePaneData.panes[i];
|
||||
switch (p.type) {
|
||||
@@ -440,18 +433,16 @@ namespace textinput {
|
||||
|
||||
nw4r::ut::List_Append(&mAnmPanes, pane);
|
||||
|
||||
const char* forceAddName = p.forceAddName;
|
||||
u32 animationCount = p.count;
|
||||
for (j = 0; j < animationCount; j++) {
|
||||
const AnimationFile* const& animation = p.pAnims[j];
|
||||
void* pResource = mpMultiArcResourceAccessor->GetResource(0, animation->fileName);
|
||||
for (u16 j = 0; j < p.count; j++) {
|
||||
const AnimationFile* animation = p.pAnims[j];
|
||||
void* pResource = mpMultiArcResourceAccessor->GetResource(0, p.pAnims[j]->fileName);
|
||||
AnimTransformPane* transform =
|
||||
static_cast<AnimTransformPane*>(getLayout()->CreateAnimTransform(pResource, mpMultiArcResourceAccessor));
|
||||
|
||||
if (forceAddName == NULL) {
|
||||
if (p.forceAddName == NULL) {
|
||||
pane->addAnimation(allocator, animation->id, transform, false, true);
|
||||
} else {
|
||||
pane->forceAddAnimation(allocator, animation->id, transform, forceAddName, false, true);
|
||||
pane->forceAddAnimation(allocator, animation->id, transform, p.forceAddName, false, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1074,19 +1065,11 @@ namespace textinput {
|
||||
return calcStringWidth(pTextBox->GetString(), pTextBox);
|
||||
}
|
||||
|
||||
static inline void setCandidatePaneSize(nw4r::lyt::Pane* pane, const nw4r::lyt::Size& original, f32 width) {
|
||||
nw4r::lyt::Size size;
|
||||
size.width = width;
|
||||
size.height = original.height;
|
||||
pane->SetSize(size);
|
||||
}
|
||||
|
||||
static inline void setCandidatePanePosition(nw4r::lyt::Pane* pane, f32 x, f32 y) {
|
||||
nw4r::math::VEC2 position(x, y);
|
||||
pane->SetTranslate(position);
|
||||
}
|
||||
|
||||
void UITextArea::CalcPaneLocate_() {
|
||||
// NONMATCHING - only regswaps, hopefully
|
||||
// The calcStringWidth inline may be partially responsible,
|
||||
// so looking into the smaller functions utilizing that inline
|
||||
// might be simpler (GetNextPageIdx / GetPrevPageIdx)
|
||||
f32 widthScale = GetWidthScale_();
|
||||
f32 margin = GetMargin_();
|
||||
f32 xOffset = mfXOffset;
|
||||
@@ -1099,9 +1082,9 @@ namespace textinput {
|
||||
nw4r::lyt::TextBox* textPane = mpTextBoxPane[i]->getTextPane();
|
||||
nw4r::lyt::Bounding* boundPane = mpBoundingPane[i]->getBoundPane();
|
||||
nw4r::lyt::Size sz1 = textPane->GetSize();
|
||||
textPane->SetString(scEmptyWChars);
|
||||
textPane->SetString(L"");
|
||||
textPane->SetVisible(false);
|
||||
setCandidatePaneSize(boundPane, sz1, 0.0f);
|
||||
boundPane->SetSize(nw4r::lyt::Size(0.0f, sz1.height));
|
||||
}
|
||||
|
||||
int i = NUM_PANES;
|
||||
@@ -1129,16 +1112,16 @@ namespace textinput {
|
||||
textPane->SetVisible(true);
|
||||
nw4r::lyt::Size sz2 = textPane->GetSize();
|
||||
f32 stringWidth = calcStringWidth(textPane);
|
||||
setCandidatePaneSize(textPane, sz2, stringWidth);
|
||||
setCandidatePaneSize(boundPane, sz2, stringWidth * widthScale);
|
||||
textPane->SetSize(nw4r::lyt::Size(stringWidth, sz2.height));
|
||||
boundPane->SetSize(nw4r::lyt::Size(stringWidth * widthScale, sz2.height));
|
||||
|
||||
xOffset -= margin;
|
||||
xOffset -= stringWidth * widthScale;
|
||||
|
||||
stringWidth *= widthScale;
|
||||
f32 x = stringWidth / 2.0f + (areaPaneXOffset + xOffset);
|
||||
setCandidatePanePosition(textPane, x, 0.0f);
|
||||
setCandidatePanePosition(boundPane, x, 0.0f);
|
||||
textPane->SetTranslate(nw4r::math::VEC2(x, 0.0f));
|
||||
boundPane->SetTranslate(nw4r::math::VEC2(x, 0.0f));
|
||||
|
||||
if (offsetIdx == selectedIdx) {
|
||||
mpTextAnmPane[i]->onAnmEvent(nw4rmanager::AnmPane::PE_1);
|
||||
@@ -1167,13 +1150,13 @@ namespace textinput {
|
||||
textPane->SetVisible(true);
|
||||
nw4r::lyt::Size sz2 = textPane->GetSize();
|
||||
f32 stringWidth = calcStringWidth(textPane);
|
||||
setCandidatePaneSize(textPane, sz2, stringWidth);
|
||||
setCandidatePaneSize(boundPane, sz2, stringWidth * widthScale);
|
||||
textPane->SetSize(nw4r::lyt::Size(stringWidth, sz2.height));
|
||||
boundPane->SetSize(nw4r::lyt::Size(stringWidth * widthScale, sz2.height));
|
||||
|
||||
stringWidth *= widthScale;
|
||||
f32 x = stringWidth / 2.0f + (areaPaneXOffset + xOffset);
|
||||
setCandidatePanePosition(textPane, x, 0.0f);
|
||||
setCandidatePanePosition(boundPane, x, 0.0f);
|
||||
textPane->SetTranslate(nw4r::math::VEC2(x, 0.0f));
|
||||
boundPane->SetTranslate(nw4r::math::VEC2(x, 0.0f));
|
||||
|
||||
if (offsetIdx == selectedIdx) {
|
||||
mpTextAnmPane[i]->onAnmEvent(nw4rmanager::AnmPane::PE_1);
|
||||
@@ -1700,9 +1683,9 @@ namespace textinput {
|
||||
|
||||
void UIOnOffButton::Create(nw4rmanager::Layout* layout) {
|
||||
gui::PaneManager* mgr = layout->getPaneManager();
|
||||
mpOnPictPane = mgr->searchPaneComponent(scP_OnBtn);
|
||||
mpOnBoundPane = mgr->searchPaneComponent(scB_OnBtn);
|
||||
mpOnAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(scP_OnBtn));
|
||||
mpOnPictPane = mgr->searchPaneComponent("P_OnBtn");
|
||||
mpOnBoundPane = mgr->searchPaneComponent("B_OnBtn");
|
||||
mpOnAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane("P_OnBtn"));
|
||||
mpOffPictPane = mgr->searchPaneComponent(scCandidatePaneData.tail);
|
||||
mpOffBoundPane = mgr->searchPaneComponent(scPaneNameTable);
|
||||
mpOffAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(scCandidatePaneData.tail));
|
||||
|
||||
@@ -206,33 +206,6 @@ namespace textinput {
|
||||
return 0x1B;
|
||||
}
|
||||
|
||||
static inline const PaneNameToCharCode* inputKeys(const LanguageDependencyData* table, u32 mode) {
|
||||
return table->keySets[mode]->pPaneNameToCharCode;
|
||||
}
|
||||
|
||||
struct NumericKeyView {
|
||||
const PaneNameToCharCode& key;
|
||||
NumericKeyView(const KeySet& set, u16 index) : key(set.pPaneNameToCharCode[index]) {}
|
||||
bool matches(const char* paneName) const { return util::strcmp(key.szPaneName, paneName); }
|
||||
wchar_t character() const { return key.wc[0]; }
|
||||
};
|
||||
|
||||
static inline const PaneNameToCharCode* findLowerCaseKey(const LanguageDependencyData* table, const char* paneName) {
|
||||
u16 index = 0;
|
||||
const PaneNameToCharCode* keys = table->keySets[Base::IM_01]->pPaneNameToCharCode;
|
||||
for (; index < 12; ++index) {
|
||||
if (util::strcmp(keys[index].szPaneName, paneName)) { return &keys[index]; }
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline const PaneNameToCharCode* findKeyInSet(const KeySet& set, const char* paneName) {
|
||||
const PaneNameToCharCode* keys = set.pPaneNameToCharCode;
|
||||
for (u16 index = 0; index < 12; ++index) {
|
||||
if (util::strcmp(keys[index].szPaneName, paneName)) { return &keys[index]; }
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void Base::onKey(u32 event, void* data) {
|
||||
struct KeyEvent { const char* paneName; u8 state; };
|
||||
@@ -261,7 +234,8 @@ namespace textinput {
|
||||
} else if (static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[inputMode]->uType == KEY_TYPE_ABC_UPPER && !mbUpperCaseMode) {
|
||||
inputMode = IM_01;
|
||||
}
|
||||
mHoldingButton = findKeyInSet(*static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[inputMode], paneName);
|
||||
const PaneNameToCharCode* keys = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[inputMode]->pPaneNameToCharCode;
|
||||
mHoldingButton = findKeyForPane(keys, paneName);
|
||||
if (state) {
|
||||
mPreviousInputMode = 15;
|
||||
while (mHoldingButton->wc[mPreviousInputMode] == 0) { mPreviousInputMode--; }
|
||||
@@ -297,10 +271,11 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const PaneNameToCharCode* keys = csKeySetNumber.pPaneNameToCharCode;
|
||||
for (u16 index = 0; index < 12; index++) {
|
||||
const NumericKeyView key(csKeySetNumber, index);
|
||||
if (key.matches(paneName)) {
|
||||
wchar_t character = key.character();
|
||||
const PaneNameToCharCode* pane = &keys[index];
|
||||
if (util::strcmp(pane->szPaneName, paneName)) {
|
||||
wchar_t character = pane->wc[0];
|
||||
ConfirmInput commandData = {0};
|
||||
commandData.character = character;
|
||||
commandData.letterMode = mCurrentInputMode;
|
||||
@@ -316,11 +291,12 @@ namespace textinput {
|
||||
mPreviousInputMode = 0;
|
||||
mHoldingButton = NULL;
|
||||
} else {
|
||||
const PaneNameToCharCode* currentKeys = inputKeys(static_cast<const LanguageDependencyData*>(mpInputModeTable), mCurrentInputMode);
|
||||
const PaneNameToCharCode* currentKeys = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[mCurrentInputMode]->pPaneNameToCharCode;
|
||||
commandData.holdingKey = findKeyForPane(currentKeys, paneName);
|
||||
if (static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[mCurrentInputMode]->uType == KEY_TYPE_ABC_UPPER && !mbAbcMode) {
|
||||
commandData.letterMode = IM_01;
|
||||
commandData.holdingKey = findLowerCaseKey(static_cast<const LanguageDependencyData*>(mpInputModeTable), paneName);
|
||||
currentKeys = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[IM_01]->pPaneNameToCharCode;
|
||||
commandData.holdingKey = findKeyForPane(currentKeys, paneName);
|
||||
}
|
||||
commandData.character = convertToZiCellphoneInput_(commandData.character);
|
||||
sendCommand(5, &commandData);
|
||||
@@ -675,24 +651,6 @@ namespace textinput {
|
||||
setLanguage(getLanguage());
|
||||
}
|
||||
|
||||
static inline void initializeTogglePane(nw4rmanager::Layout& layout, void* const& inputModeTable,
|
||||
int inputMode, const char* paneName) {
|
||||
char textPaneName[17];
|
||||
memset(textPaneName, 0, sizeof(textPaneName));
|
||||
strncpy(textPaneName, paneName, strlen(paneName));
|
||||
textPaneName[0] = 'T';
|
||||
|
||||
nw4r::lyt::TextBox* textPane = static_cast<nw4r::lyt::TextBox*>(layout.getPane(textPaneName));
|
||||
nw4r::lyt::Pane* buttonPane = layout.getPane(paneName);
|
||||
const KeySet* keySet = static_cast<const LanguageDependencyData*>(inputModeTable)->keySets[inputMode];
|
||||
if (keySet == NULL) {
|
||||
buttonPane->SetVisible(false);
|
||||
} else {
|
||||
buttonPane->SetVisible(true);
|
||||
textPane->SetString(static_cast<const LanguageDependencyData*>(inputModeTable)->keySets[inputMode]->szKeySetName, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutByNW4R::init() {
|
||||
Base::init();
|
||||
|
||||
@@ -712,7 +670,21 @@ namespace textinput {
|
||||
setVisible("W_ChngTag_03", true);
|
||||
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
initializeTogglePane(*this, mpInputModeTable, i, csPaneNameToggleAnimationKey[i].name);
|
||||
const char* paneName = csPaneNameToggleAnimationKey[i].name;
|
||||
char textPaneName[17];
|
||||
memset(textPaneName, 0, sizeof(textPaneName));
|
||||
strncpy(textPaneName, paneName, strlen(paneName));
|
||||
textPaneName[0] = 'T';
|
||||
|
||||
nw4r::lyt::TextBox* textPane = static_cast<nw4r::lyt::TextBox*>(getPane(textPaneName));
|
||||
nw4r::lyt::Pane* buttonPane = getPane(paneName);
|
||||
const KeySet* keySet = static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[i];
|
||||
if (keySet == NULL) {
|
||||
buttonPane->SetVisible(false);
|
||||
} else {
|
||||
buttonPane->SetVisible(true);
|
||||
textPane->SetString(static_cast<const LanguageDependencyData*>(mpInputModeTable)->keySets[i]->szKeySetName, 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (getLanguage() == JP) {
|
||||
|
||||
@@ -1169,7 +1169,7 @@ void LayoutByNW4R::create(MEMAllocator* allocator, EditBuffer* editBuffer) {
|
||||
setVisible("N_2line", true);
|
||||
mpPaneManager->setAllComponentTriggerTarget(false);
|
||||
mpPaneManager->setAllBoundingBoxComponentTriggerTarget(true);
|
||||
nw4r::lyt::Pane* pane = mpLayout->GetRootPane()->FindPaneByName(static_cast<const LanguagePaneData*>(mpLanguageData)->textBox, true);
|
||||
nw4r::lyt::Pane* pane = getPane(static_cast<const LanguagePaneData*>(mpLanguageData)->textBox);
|
||||
if (!pane) pane = mpLayout->GetRootPane()->FindPaneByName(getLanguageTextPane() ? static_cast<const LanguagePaneData*>(mpLanguageData)->textBox : "T_2l_TextBox", true);
|
||||
mpPaneManager->getPaneComponentByPane(pane)->setTriggerTarget(true);
|
||||
for (u32 buttonIndex = 0; buttonIndex < 2; ++buttonIndex) {
|
||||
@@ -1187,7 +1187,7 @@ void LayoutByNW4R::create(MEMAllocator* allocator, EditBuffer* editBuffer) {
|
||||
const char* bindingName = button.bindingName;
|
||||
count = button.count;
|
||||
for (u16 animationIndex = 0; animationIndex < count; ++animationIndex) {
|
||||
const InputFormAnimationFile* const& file = button.files[animationIndex];
|
||||
const InputFormAnimationFile* file = button.files[animationIndex];
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, file->fileName, NULL);
|
||||
AnimTransformPane* transform = static_cast<AnimTransformPane*>(getLayout()->CreateAnimTransform(resource, mpMultiArcResourceAccessor));
|
||||
if (!bindingName) animationPane->addAnimation(allocator, file->id, transform, false, true);
|
||||
@@ -1254,13 +1254,6 @@ void LayoutByNW4R::calc() {
|
||||
}
|
||||
}
|
||||
}
|
||||
static inline const char* selectInputTextName(const nw4rmanager::Layout& layout, const void* const& languageData) {
|
||||
if (layout.getPane(static_cast<const LanguagePaneData*>(languageData)->textBox)) {
|
||||
return static_cast<const LanguagePaneData*>(languageData)->textBox;
|
||||
}
|
||||
return "T_2l_TextBox";
|
||||
}
|
||||
|
||||
void LayoutByNW4R::setLanguage(Language language) {
|
||||
Base::setLanguage(language);
|
||||
if (language == CN) mpLanguageData = &csLanguageDependencyDataCHN__Q29textinput9inputform;
|
||||
@@ -1271,12 +1264,12 @@ void LayoutByNW4R::setLanguage(Language language) {
|
||||
else textName = static_cast<const LanguagePaneData*>(mpLanguageData)->textBox;
|
||||
mpLayoutData = textName;
|
||||
if (::strcmp(static_cast<const char*>(mpLayoutData), "T_2l_TextBox") != 0) setVisible("T_2l_TextBox", false);
|
||||
nw4r::lyt::Pane* pane = mpLayout->GetRootPane()->FindPaneByName(selectInputTextName(*this, mpLanguageData), true);
|
||||
nw4r::lyt::Pane* pane = mpLayout->GetRootPane()->FindPaneByName(getLanguageTextPane() ? static_cast<const LanguagePaneData*>(mpLanguageData)->textBox : "T_2l_TextBox", true);
|
||||
static_cast<nw4r::lyt::TextBox*>(pane)->SetString(L"", 0);
|
||||
const VisiblePanes* visibility = static_cast<const LanguagePaneData*>(mpLanguageData)->visibility;
|
||||
for (u16 index = 0; index < visibility->visibleCount; ++index) setVisible(visibility->visibleNames[index], true);
|
||||
for (u16 index = 0; index < visibility->hiddenCount; ++index) setVisible(visibility->hiddenNames[index], false);
|
||||
pane = mpLayout->GetRootPane()->FindPaneByName(selectInputTextName(*this, mpLanguageData), true);
|
||||
pane = mpLayout->GetRootPane()->FindPaneByName(getLanguageTextPane() ? static_cast<const LanguagePaneData*>(mpLanguageData)->textBox : "T_2l_TextBox", true);
|
||||
mpPaneManager->getPaneComponentByPane(pane)->setTriggerTarget(true);
|
||||
if (getPane("T_title_text")) {
|
||||
nw4r::lyt::TextBox* title = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(getPane("T_title_text"));
|
||||
@@ -3078,9 +3071,7 @@ bool Base::onCursor(CursorPos* cursor) {
|
||||
f32 left = glyph.rect.left + GetCursorX();
|
||||
f32 top = glyph.rect.top + GetCursorY();
|
||||
f32 right = glyph.rect.right + GetCursorX();
|
||||
f32 cursorY = GetCursorY();
|
||||
f32 fontHeight = GetFontHeight();
|
||||
f32 bottomEdge = fontHeight + cursorY;
|
||||
f32 bottomEdge = GetCursorY() + GetFontHeight();
|
||||
candidateBackground.a = muGlobalAlpha;
|
||||
debug::drawBox_(left, top, right, bottomEdge, 0.0f, 1.0f, candidateBackground);
|
||||
SetupGX();
|
||||
@@ -3140,9 +3131,7 @@ bool Base::onCursor(CursorPos* cursor) {
|
||||
f32 left = glyph.rect.left + GetCursorX();
|
||||
f32 top = glyph.rect.top + GetCursorY();
|
||||
f32 right = glyph.rect.right + GetCursorX();
|
||||
f32 cursorY = GetCursorY();
|
||||
f32 fontHeight = GetFontHeight();
|
||||
f32 bottomEdge = fontHeight + cursorY;
|
||||
f32 bottomEdge = GetCursorY() + GetFontHeight();
|
||||
kanaBackground.a = muGlobalAlpha;
|
||||
debug::drawBox_(left, top, right, bottomEdge, 0.0f, 1.0f, kanaBackground);
|
||||
SetupGX();
|
||||
@@ -3188,7 +3177,7 @@ u32 Base::calcCursorPos(f32 x, f32 y) {
|
||||
info.character = *string;
|
||||
calcRect(info);
|
||||
lineBottom = lineTop + scale.y * (info.rect.bottom - info.rect.top);
|
||||
f32 right = cursorX + scale.x * info.rect.GetWidth();
|
||||
f32 right = cursorX + scale.x * (info.rect.right - info.rect.left);
|
||||
if (doWordWrap(mpString->getWCString(), pos, cursorX)) {
|
||||
if (localY >= lineTop && localY <= lineBottom) {
|
||||
if (pos != 0) return pos - 1;
|
||||
@@ -3197,14 +3186,14 @@ u32 Base::calcCursorPos(f32 x, f32 y) {
|
||||
lineTop += scale.y * getLineHeight();
|
||||
cursorX = getScale().x;
|
||||
lineBottom = lineTop + scale.y * (info.rect.bottom - info.rect.top);
|
||||
right = cursorX + scale.x * info.rect.GetWidth();
|
||||
right = cursorX + scale.x * (info.rect.right - info.rect.left);
|
||||
}
|
||||
if (right >= scale.x * mRect.GetWidth()) {
|
||||
if (right >= scale.x * (mRect.right - mRect.left)) {
|
||||
if (localY >= lineTop && localY <= lineBottom) return pos;
|
||||
lineTop += scale.y * getLineHeight();
|
||||
cursorX = getScale().x;
|
||||
lineBottom = lineTop + scale.y * (info.rect.bottom - info.rect.top);
|
||||
right = cursorX + scale.x * info.rect.GetWidth();
|
||||
right = cursorX + scale.x * (info.rect.right - info.rect.left);
|
||||
}
|
||||
if (x <= info.rect.left && localY >= lineTop && localY <= lineBottom) return pos;
|
||||
if (*string == L'\n') {
|
||||
@@ -3218,7 +3207,7 @@ u32 Base::calcCursorPos(f32 x, f32 y) {
|
||||
if (cursorX + 0.5f * (right - cursorX) > x) return pos;
|
||||
return pos + 1;
|
||||
}
|
||||
cursorX += scale.x * info.rect.GetWidth();
|
||||
cursorX += scale.x * (info.rect.right - info.rect.left);
|
||||
}
|
||||
++string;
|
||||
++pos;
|
||||
|
||||
@@ -11,18 +11,6 @@
|
||||
#include "keyboard/tiLanguageIndependentData.h"
|
||||
|
||||
namespace textinput {
|
||||
const keyboard::hwkey::HWKeyboard* Manager::getHWKeyboard() const {
|
||||
return mpHWKeyboard;
|
||||
}
|
||||
|
||||
bool toolbar::Base::isQwerty() const {
|
||||
return mQwerty;
|
||||
}
|
||||
|
||||
const toolbar::LayoutByNW4R* Manager::getToolBar() const {
|
||||
return mpToolBar;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace pctype {
|
||||
struct SelectorPosition {
|
||||
@@ -1329,20 +1317,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
const keyboard::pctype::LayoutByNW4R* Manager::getPCKeyboard() const {
|
||||
return mpPCKeyboard;
|
||||
}
|
||||
|
||||
Language Manager::getLanguage() const {
|
||||
return meLanguage;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace pctype {
|
||||
|
||||
bool Base::isCapsOn() const {
|
||||
return (mKeyState.abcFlags >> 6) & 1;
|
||||
}
|
||||
@@ -1351,7 +1325,7 @@ namespace textinput {
|
||||
mpAllocator = allocator;
|
||||
}
|
||||
|
||||
inline void Base::initializeKeyState() {
|
||||
void Base::init() {
|
||||
mState.rejected = false;
|
||||
Language language = getLanguage();
|
||||
mKeyState.inputType = 0;
|
||||
@@ -1369,10 +1343,6 @@ namespace textinput {
|
||||
sendCommand(18, &mode);
|
||||
}
|
||||
|
||||
void Base::init() {
|
||||
initializeKeyState();
|
||||
}
|
||||
|
||||
void Base::inputCharCode(wchar_t code) {
|
||||
sendInputWChar(code, false);
|
||||
}
|
||||
@@ -1640,7 +1610,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void Base::setTranslateMode(TranslateMode mode) {
|
||||
u32 keyMode;
|
||||
u32 keyMode = mode;
|
||||
switch (mode) {
|
||||
case TM_Direct:
|
||||
keyMode = 0;
|
||||
@@ -1651,6 +1621,8 @@ namespace textinput {
|
||||
case TM_Kana:
|
||||
keyMode = 2;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (keyMode != (mKeyState.abcFlags & 15)) {
|
||||
if (getLanguage() == KR || getLanguage() == CN)
|
||||
@@ -1972,18 +1944,8 @@ namespace textinput {
|
||||
AnmPane::~AnmPane() {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
TiLayout* nw4rmanager::Layout::getLayout() {
|
||||
return mpLayout;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace pctype {
|
||||
|
||||
void LayoutByNW4R::init() {
|
||||
initializeKeyState();
|
||||
Base::init();
|
||||
setLineFeedButton(true);
|
||||
setPredictLanguageButton(true);
|
||||
setSignWindowButton(true);
|
||||
@@ -2331,15 +2293,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void nw4rmanager::AnmPane::onAnmEvent(AnmPaneEvent) {
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace pctype {
|
||||
|
||||
void LayoutByNW4R::cancelStateFocusIn() {
|
||||
for (AnmPane* pane = static_cast<AnmPane*>(nw4r::ut::List_GetFirst(&mAnmPanes)); pane != NULL;
|
||||
pane = static_cast<AnmPane*>(nw4r::ut::List_GetNext(&mAnmPanes, pane))) {
|
||||
@@ -3124,20 +3077,6 @@ namespace textinput {
|
||||
: UIObj(id, layout, listener), mpPaneComponent(NULL), mpBoundingComponent(NULL), mpAnimation(NULL), mbOn(false) {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
gui::PaneManager* nw4rmanager::Layout::getPaneManager() {
|
||||
return mpPaneManager;
|
||||
}
|
||||
|
||||
void gui::GUIComponent::setTriggerTarget(bool triggerTarget) {
|
||||
mbTriggerTarget = triggerTarget;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace pctype {
|
||||
|
||||
void UIModifierButton::onGUIEvent(gui::PaneComponent&, u32 event, nw4rmanager::TiEventHandler::Input* input) {
|
||||
const char* name = "P_key_CAPS";
|
||||
if (mId == 1)
|
||||
@@ -3193,43 +3132,6 @@ namespace textinput {
|
||||
void UIModePanel::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void keyboard::KeyboardBase::update() {
|
||||
}
|
||||
|
||||
nw4r::ut::List& nw4rmanager::Layout::getAnmPaneList() {
|
||||
return mAnmPanes;
|
||||
}
|
||||
|
||||
void nw4rmanager::Layout::setAnimOn(bool flag) {
|
||||
mbAnimOn = flag;
|
||||
}
|
||||
|
||||
nw4rmanager::Anim* nw4rmanager::AnmPane::searchAnimation(u32 id) {
|
||||
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
|
||||
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
|
||||
if (animation->muID == id) return animation;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool nw4rmanager::AnmPane::isInAnimation() {
|
||||
return mpCurrentAnim != NULL;
|
||||
}
|
||||
|
||||
int gui::EventHandler::getLatestEventCtrlNo() {
|
||||
return muLatestEventCtrlNo;
|
||||
}
|
||||
|
||||
void gui::EventHandler::setLatestEventCtrlNo(int ctrlNo) {
|
||||
muLatestEventCtrlNo = ctrlNo;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace pctype {
|
||||
|
||||
Base::InputMode Base::getAIUInputMode() const {
|
||||
switch (static_cast<int>(mKeyState.aiuFlags & 15)) {
|
||||
case 0:
|
||||
@@ -3288,16 +3190,6 @@ namespace textinput {
|
||||
void UIObj::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void nw4rmanager::TiEventHandler::setEventObserver(EventObserver* event) {
|
||||
mpEventObserver = event;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace pctype {
|
||||
|
||||
void Base::setInputModeCK(u32) {
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
extern "C" {
|
||||
u8 KPRLookAhead(KPRQueue*, wchar_t*, u32);
|
||||
u8 KPRPutChar(KPRQueue*, wchar_t);
|
||||
u32 KPRPutChar(KPRQueue*, wchar_t);
|
||||
wchar_t KPRGetChar(KPRQueue*);
|
||||
void KPRClearQueue(KPRQueue*);
|
||||
void KPRInitQueue(KPRQueue*);
|
||||
@@ -141,28 +141,6 @@ wchar_t StringBase::getLastWChar() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
namespace {
|
||||
class CharacterOutput {
|
||||
public:
|
||||
CharacterOutput(wchar_t* output) : mpOutput(output), mCount(0) {
|
||||
mpOutput[0] = 0;
|
||||
}
|
||||
|
||||
void append(wchar_t ch) {
|
||||
mpOutput[mCount++] = ch;
|
||||
}
|
||||
|
||||
u16 finish() {
|
||||
mpOutput[mCount] = 0;
|
||||
return mCount;
|
||||
}
|
||||
|
||||
private:
|
||||
wchar_t* mpOutput;
|
||||
u32 mCount;
|
||||
};
|
||||
}
|
||||
|
||||
void Decolated::inputChar(wchar_t ch) {
|
||||
if (ch != 0xfffe) {
|
||||
wchar_t input[8];
|
||||
@@ -195,9 +173,9 @@ void Decolated::inputChar(wchar_t ch) {
|
||||
}
|
||||
nonKana:
|
||||
if (mTranslateMode == 3) {
|
||||
CharacterOutput output(input);
|
||||
output.append(ch);
|
||||
count = output.finish();
|
||||
input[0] = ch;
|
||||
input[1] = 0;
|
||||
count = 1;
|
||||
mKanaStream.mOutput[0] = 0;
|
||||
} else {
|
||||
count = 1;
|
||||
|
||||
@@ -15,9 +15,7 @@ struct OEMDictionary {
|
||||
};
|
||||
|
||||
u16 WithZi::ElementBuffer[0x100];
|
||||
u16 WithZi::CandidatesBuffer[0x100];
|
||||
u16 WithZi::ElementWorkBuffer[0x100];
|
||||
u16 WithZi::PredictionBuffer[0x100];
|
||||
u16 WithZi::CandidatesBuffer[0x300];
|
||||
u16 WithZi::CandidatedWord[0xa00];
|
||||
u16 WithZi::LatestWord[0x40];
|
||||
|
||||
@@ -118,8 +116,8 @@ void WithZi::clearCandidates() {
|
||||
mCandidateCount = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(candidates, 0, 0x200);
|
||||
memset(ElementWorkBuffer, 0, 0x1fe);
|
||||
memset(PredictionBuffer, 0, 0x200);
|
||||
memset(candidates + 0x100, 0, 0x1fe);
|
||||
memset(candidates + 0x200, 0, 0x200);
|
||||
memset(CandidatedWord, 0, 0x1400);
|
||||
memset(&mSearch, 0, sizeof(mSearch) + sizeof(mSearchState));
|
||||
mSearch.language = getPredictLanguage();
|
||||
@@ -128,7 +126,7 @@ void WithZi::clearCandidates() {
|
||||
mSearch.context = 1;
|
||||
mSearch.getOptions = 0x81;
|
||||
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(PredictionBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&candidates[0x200]);
|
||||
mSearch.maxCandidates = 0x28;
|
||||
mSearch.elementCount = 0;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -300,6 +298,7 @@ void WithZi::update() {
|
||||
return;
|
||||
}
|
||||
|
||||
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
|
||||
mSelectedCandidate = 0;
|
||||
s32 elementCount = static_cast<u16>(setElementBuffer());
|
||||
mSearch.language = getPredictLanguage();
|
||||
@@ -308,7 +307,7 @@ void WithZi::update() {
|
||||
mSearch.context = 1;
|
||||
mSearch.getOptions = 0x81;
|
||||
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(PredictionBuffer);
|
||||
mSearch.candidates = candidateOutput;
|
||||
mSearch.maxCandidates = 0x28;
|
||||
mSearch.elementCount = static_cast<u8>(elementCount);
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -352,28 +351,29 @@ void WithZi::update() {
|
||||
EZTXGetCandidates(&mSearch, mpDictionaryWork);
|
||||
}
|
||||
else {
|
||||
memcpy(PredictionBuffer, CandidatesBuffer, 0x200);
|
||||
memcpy(&CandidatesBuffer[0x200], CandidatesBuffer, 0x200);
|
||||
ChangeDictionaryLanguage(getPredictLanguage());
|
||||
u32 count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
|
||||
if (getPredictLanguage() == 1 && count == 0x61) {
|
||||
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(PredictionBuffer);
|
||||
mSearch.firstCandidate = 0x61;
|
||||
mSearch.candidates = candidateOutput + 0xC2;
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x2c2]);
|
||||
mSearch.maxCandidates = 199;
|
||||
count += EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
|
||||
count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
|
||||
mSearch.firstCandidate = 0;
|
||||
count += 0x61;
|
||||
mSearch.candidates = candidateOutput;
|
||||
}
|
||||
if (static_cast<s32>(count) > 0x28) {
|
||||
count = 0x28;
|
||||
}
|
||||
if (getPredictLanguage() == 1 && mbContextChanged != 0 &&
|
||||
(mbContextChanged = 0, mSearch.count == 0)) {
|
||||
(mbContextChanged = 0, mSearch.wordCharCount == 0)) {
|
||||
u32 length = mCurrentWordLength;
|
||||
u32 wordLength = wcslen((wchar_t*)LatestWord) & 0xff;
|
||||
u32 copied;
|
||||
u16* source = LatestWord + wordLength - length;
|
||||
for (copied = 0; copied < length; ++copied) {
|
||||
LatestWord[copied] = LatestWord[(wordLength - length) + copied];
|
||||
LatestWord[copied] = source[copied];
|
||||
}
|
||||
LatestWord[copied] = 0;
|
||||
mSearch.wordCharCount = wcslen((wchar_t*)LatestWord);
|
||||
@@ -396,10 +396,8 @@ void WithZi::update() {
|
||||
u16* destination = CandidatedWord;
|
||||
for (s32 index = 0; index < static_cast<s32>(count); index++) {
|
||||
if (getPredictLanguage() == 1) {
|
||||
u16* output;
|
||||
s32 length;
|
||||
length = 0;
|
||||
output = destination;
|
||||
s32 length = 0;
|
||||
u16* output = destination;
|
||||
for (; *source != 0x20 && *source != 0; source++) {
|
||||
*output++ = *source;
|
||||
++length;
|
||||
@@ -411,20 +409,16 @@ void WithZi::update() {
|
||||
destination[1] = 0;
|
||||
} else if (getPredictLanguage() == 0x12) {
|
||||
u16* output = destination;
|
||||
u16 character;
|
||||
while ((character = *source) >= 0x100) {
|
||||
*output++ = character;
|
||||
++source;
|
||||
while (*source >= 0x100) {
|
||||
*output++ = *source++;
|
||||
}
|
||||
} else if (EZTXCopy(reinterpret_cast<wchar_t*>(destination), &mSearch, index & 0xff, mpDictionaryWork) == 0) {
|
||||
goto nextCandidate;
|
||||
}
|
||||
++mCandidateCount;
|
||||
{
|
||||
u16* candidate;
|
||||
s32 position;
|
||||
position = 0;
|
||||
for (candidate = destination; *candidate != 0; ++candidate, ++position) {
|
||||
s32 position = 0;
|
||||
for (u16* candidate = destination; *candidate != 0; ++candidate) {
|
||||
switch (mLetterMode) {
|
||||
case LM_1:
|
||||
*candidate = util::toWLower(*candidate);
|
||||
@@ -436,11 +430,10 @@ void WithZi::update() {
|
||||
if (position == 0) *candidate = util::toWUpper(*candidate);
|
||||
else *candidate = util::toWLower(*candidate);
|
||||
break;
|
||||
case LM_3:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
++position;
|
||||
}
|
||||
}
|
||||
nextCandidate:
|
||||
@@ -517,28 +510,22 @@ scanDone:
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct ElementInputView {
|
||||
u16* elements;
|
||||
const u16* candidates;
|
||||
|
||||
ElementInputView() : elements(WithZi::ElementBuffer), candidates(WithZi::CandidatesBuffer) {}
|
||||
u16 read(u16 index) const { return candidates[index]; }
|
||||
u16& element(u16 index) const { return elements[index]; }
|
||||
};
|
||||
|
||||
u32 WithZi::setElementBuffer() {
|
||||
u16* elements;
|
||||
u16* candidates;
|
||||
u16 inputCharacter;
|
||||
u32 count = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(ElementWorkBuffer, 0, 0x1fe);
|
||||
ElementInputView buffers;
|
||||
while ((inputCharacter = buffers.read(static_cast<u16>(count))) != 0 && static_cast<u16>(count) < 0xff) {
|
||||
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
|
||||
elements = ElementBuffer;
|
||||
candidates = CandidatesBuffer;
|
||||
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
|
||||
u16 index = count;
|
||||
buffers.element(index) = inputCharacter;
|
||||
elements[index] = inputCharacter;
|
||||
if (getPredictLanguage() == 1) {
|
||||
s32 character = buffers.element(index);
|
||||
if (0x30 <= character && character <= 0x39) buffers.element(index) = character + 0xf300;
|
||||
else if ((0x61 <= character && character <= 0x7a) || (0x41 <= character && character <= 0x5a)) buffers.element(index) += 0xf300;
|
||||
s32 character = elements[index];
|
||||
if (0x30 <= character && character <= 0x39) elements[index] = character + 0xf300;
|
||||
else if ((0x61 <= character && character <= 0x7a) || (0x41 <= character && character <= 0x5a)) elements[index] += 0xf300;
|
||||
}
|
||||
++count;
|
||||
}
|
||||
|
||||
@@ -1208,9 +1208,9 @@ namespace ipl {
|
||||
wchar_t blank[2] = {0, 0};
|
||||
static_cast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(sTextNameB[mDrag.mButton]))->SetString(blank, 0);
|
||||
|
||||
nigaoe::Object* nigaoe = mMiiObj[buttonNo].getPortrait();
|
||||
nigaoe::Object* nigaoe = mMiiObj[buttonNo].mpNigaoe;
|
||||
if (nigaoe != NULL) {
|
||||
nw4r::lyt::Pane* miiPane = mpLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("mii_move", true);
|
||||
nw4r::lyt::Pane* miiPane = mpLayout->FindPaneByName("mii_move");
|
||||
miiPane->SetVisible(true);
|
||||
|
||||
mDragTexObj = nigaoe->getIconTexture();
|
||||
@@ -1778,38 +1778,30 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline f32 GetDragNameWidth(nw4r::lyt::TextBox* textBox, const NWC24FriendInfo& info) {
|
||||
f32 width = 0.0f;
|
||||
if (textBox == NULL) {
|
||||
return width;
|
||||
}
|
||||
const u16* name = info.attr.name;
|
||||
if (name == NULL) {
|
||||
return width;
|
||||
}
|
||||
textBox->GetFont()->GetWidth();
|
||||
for (; *name != 0; ++name) {
|
||||
width += textBox->GetFont()->GetCharWidth(*name);
|
||||
}
|
||||
return 0.01f + width;
|
||||
}
|
||||
|
||||
void Address::movePane_onDrag() {
|
||||
nw4r::math::VEC3 baseTrans = mpLayout->FindPaneByName("N_base_move")->GetTranslate();
|
||||
math::VEC2 pos = System::getControllerManager()->getController(mDrag.mChan)->getDpdProjectionPos();
|
||||
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpLayout->GetRootPane()->FindPaneByName("T_name_move", true));
|
||||
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName("T_name_move"));
|
||||
|
||||
f32 width = GetDragNameWidth(textBox, mpFriendCache->getInfo(mDrag.mButton + mDrag.mPage * BTN_MAX));
|
||||
f32 width = 0.0f;
|
||||
if (textBox != NULL) {
|
||||
const u16* name = mpFriendCache->getInfo(mDrag.mButton + mDrag.mPage * BTN_MAX).attr.name;
|
||||
if (name != NULL) {
|
||||
textBox->GetFont()->GetWidth();
|
||||
for (; *name != 0; name++) {
|
||||
width += textBox->GetFont()->GetCharWidth(*name);
|
||||
}
|
||||
}
|
||||
}
|
||||
width += 0.01f;
|
||||
|
||||
nw4r::ut::Rect rect;
|
||||
nw4r::ut::Rect rect4x3;
|
||||
System::getProjectionRect(&rect);
|
||||
System::getProjectionRect4x3(&rect4x3);
|
||||
|
||||
f32 rightEdge = baseTrans.x + width;
|
||||
if (rightEdge < pos.x) {
|
||||
rightEdge *= rect4x3.GetWidth() / rect.GetWidth();
|
||||
mDragOffsetX = -rightEdge;
|
||||
if (baseTrans.x + width < pos.x) {
|
||||
mDragOffsetX = -((baseTrans.x + width) * (rect4x3.GetWidth() / rect.GetWidth()));
|
||||
} else {
|
||||
pos.x *= rect4x3.GetWidth() / rect.GetWidth();
|
||||
mDragOffsetX = -pos.x;
|
||||
@@ -1958,7 +1950,7 @@ namespace ipl {
|
||||
mInfos[index].attr.fdId = fdId;
|
||||
memset(mInfos[index].attr.name, 0, sizeof(mInfos[index].attr.name));
|
||||
wcsncpy((wchar_t*)getInfo(index).attr.name, name, 10);
|
||||
System::getNwc24Manager()->updateFriendInfo(&mInfos[static_cast<s32>(index)], index);
|
||||
System::getNwc24Manager()->updateFriendInfo(&getInfo(index), index);
|
||||
}
|
||||
|
||||
void FriendListCache::del(u32 index) {
|
||||
|
||||
@@ -140,6 +140,7 @@ void ipl::scene::AddressEdit::reset_gui() {
|
||||
}
|
||||
|
||||
|
||||
extern "C" void* __nw__FUl(u32);
|
||||
extern "C" BOOL RFLSearchOfficialData(const RFLCreateID*, u16*);
|
||||
|
||||
namespace ipl {
|
||||
@@ -583,10 +584,15 @@ create_mode_done:
|
||||
|
||||
ipl::System::getKeyboard()->init();
|
||||
|
||||
f32 margin4x3 = 30.0f;
|
||||
f32 margin16x9 = 120.0f;
|
||||
mpBalloon = new ipl::scene::TextBalloon(getHeap(), mpBalloonFile, "arc",
|
||||
"my_IplTopBalloon_a.brlyt", ipl::math::VEC3(0.0f, 0.0f, 0.0f), margin16x9, margin4x3);
|
||||
ipl::scene::TextBalloon* balloon = reinterpret_cast<ipl::scene::TextBalloon*>(__nw__FUl(0x3c));
|
||||
if (balloon != NULL) {
|
||||
f32 balloonWidth = 30.0f;
|
||||
f32 balloonHeight = 120.0f;
|
||||
EGG::Heap* heap = getHeap();
|
||||
ipl::math::VEC3 position(0.0f, 0.0f, 0.0f);
|
||||
balloon = new (balloon) ipl::scene::TextBalloon(heap, mpBalloonFile, "arc", "my_IplTopBalloon_a.brlyt", position, balloonHeight, balloonWidth);
|
||||
}
|
||||
mpBalloon = balloon;
|
||||
}
|
||||
|
||||
void ipl::scene::AddressEdit::stt_wait_decide_anm() {
|
||||
|
||||
@@ -45,7 +45,7 @@ struct CardThreadState {
|
||||
|
||||
MEMAllocator sAllocator_;
|
||||
static CardThreadState* sThread;
|
||||
extern "C" void* cardThreadMain(void*);
|
||||
extern "C" void* cardThreadMain();
|
||||
static char sCardSlotName[3] = "AB";
|
||||
|
||||
FileInfo* getCardDirState() {
|
||||
@@ -302,7 +302,7 @@ void initCardThread() {
|
||||
|
||||
OSInitMessageQueue(&sThread->responses, sThread->responseMessages, 0x10);
|
||||
OSInitMessageQueue(&sThread->requests, sThread->requestMessages, 0x10);
|
||||
OSCreateThread(&sThread->thread, cardThreadMain, 0,
|
||||
OSCreateThread(&sThread->thread, (void* (*)(void*))cardThreadMain, 0,
|
||||
sThread->stack + sizeof(sThread->stack), 0x8000, 0x11, 0);
|
||||
OSResumeThread(&sThread->thread);
|
||||
OSSendMessage(&sThread->requests, (OSMessage)10, 0);
|
||||
@@ -408,7 +408,7 @@ static inline void sendValidityResponse(u32 command, u32 valid) {
|
||||
OSSendMessage(&sThread->responses, (OSMessage)reply.value, 1);
|
||||
}
|
||||
|
||||
extern "C" void* cardThreadMain(void*) {
|
||||
extern "C" void* cardThreadMain() {
|
||||
struct CardThreadLocals {
|
||||
u8 compareName[6];
|
||||
u32 message;
|
||||
@@ -697,9 +697,9 @@ extern "C" s32 loadCardFileIcons(s32 slot, s32 fileNo, CARDDir* dir) {
|
||||
s32 sectorSize;
|
||||
CARDFileInfo fileInfo;
|
||||
} local;
|
||||
s32 iconAddressOffset;
|
||||
u32 iconAddressBase;
|
||||
s32 result;
|
||||
u32 iconAddressBase;
|
||||
s32 iconAddressOffset;
|
||||
result = CARDFastOpen(slot, fileNo, &local.fileInfo);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
@@ -873,28 +873,29 @@ iconSpeedDone:
|
||||
if (result < 0) {
|
||||
goto clearComment;
|
||||
}
|
||||
{
|
||||
u32 fileSize;
|
||||
if ((s32)iconAddressBase < 0 ||
|
||||
iconAddressBase > (fileSize = (u32)dir->length * local.commentSectorSize)) {
|
||||
if ((s32)iconAddressBase < 0) {
|
||||
result = 0;
|
||||
} else {
|
||||
u32 fileSize = (u32)dir->length * local.commentSectorSize;
|
||||
if (iconAddressBase > fileSize) {
|
||||
result = 0;
|
||||
} else {
|
||||
u32 endOffset = iconAddressBase + imageSize;
|
||||
if ((s32)endOffset < 0 || endOffset > fileSize) {
|
||||
result = 0;
|
||||
goto clearComment;
|
||||
}
|
||||
result = CARDRead(&local.fileInfo, sThread->commentBuffer, imageSize,
|
||||
iconAddressBase);
|
||||
if (result < 0) {
|
||||
goto clearComment;
|
||||
}
|
||||
memset(sThread->comments[slot][fileNo], 0, 0x40);
|
||||
memcpy(sThread->comments[slot][fileNo],
|
||||
sThread->commentBuffer + commentDataOffset, 0x40);
|
||||
result = 0;
|
||||
goto commentDone;
|
||||
goto clearComment;
|
||||
}
|
||||
u32 endOffset = iconAddressBase + imageSize;
|
||||
if ((s32)endOffset < 0 || endOffset > fileSize) {
|
||||
result = 0;
|
||||
goto clearComment;
|
||||
}
|
||||
result = CARDRead(&local.fileInfo, sThread->commentBuffer, imageSize,
|
||||
iconAddressBase);
|
||||
if (result < 0) {
|
||||
goto clearComment;
|
||||
}
|
||||
memset(sThread->comments[slot][fileNo], 0, 0x40);
|
||||
memcpy(sThread->comments[slot][fileNo],
|
||||
sThread->commentBuffer + commentDataOffset, 0x40);
|
||||
result = 0;
|
||||
goto commentDone;
|
||||
}
|
||||
|
||||
clearComment:
|
||||
@@ -1003,29 +1004,27 @@ sectorSizeError:
|
||||
sectorSizeDone:
|
||||
;
|
||||
|
||||
{
|
||||
s32 permissionResult = 0;
|
||||
statusResult = __CARDGetStatusEx(slot, fileNo, &checkedStatus);
|
||||
if (statusResult >= 0) {
|
||||
switch (command) {
|
||||
case 2:
|
||||
if (checkedStatus.permission & 8) {
|
||||
permissionResult = -10;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
if (checkedStatus.permission & 0x10) {
|
||||
permissionResult = -10;
|
||||
}
|
||||
break;
|
||||
result = 0;
|
||||
statusResult = __CARDGetStatusEx(slot, fileNo, &checkedStatus);
|
||||
if (statusResult >= 0) {
|
||||
switch (command) {
|
||||
case 2:
|
||||
if (checkedStatus.permission & 8) {
|
||||
result = -10;
|
||||
}
|
||||
} else {
|
||||
permissionResult = CARDGetResultCode(slot);
|
||||
}
|
||||
if (permissionResult < 0) {
|
||||
reportCardThreadError(slot, command, permissionResult);
|
||||
goto finish;
|
||||
break;
|
||||
case 3:
|
||||
if (checkedStatus.permission & 0x10) {
|
||||
result = -10;
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
result = CARDGetResultCode(slot);
|
||||
}
|
||||
if (result < 0) {
|
||||
reportCardThreadError(slot, command, result);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
result = __CARDGetStatusEx(slot, fileNo, &createStatus);
|
||||
@@ -1199,8 +1198,8 @@ copyIoDone:
|
||||
renamedStatus = moveStatus;
|
||||
memset(renamedStatus.company, 0, 2);
|
||||
memset(renamedStatus.gameName, 0, 4);
|
||||
memset(renamedStatus.fileName, 0, 0x20);
|
||||
do {
|
||||
memset(renamedStatus.fileName, 0, 0x20);
|
||||
sprintf((char*)renamedStatus.fileName, "Broken File%03d", attempt);
|
||||
result = __CARDSetStatusEx(slot, fileNo, &renamedStatus);
|
||||
if (result < 0 && result != -7) {
|
||||
|
||||
@@ -147,13 +147,14 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
memorycard::CardState* states = memorycard::getCardSlotState();
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::FileInfo* dir = NULL;
|
||||
long result;
|
||||
bool enabled = false;
|
||||
if (isDistSlot(slot, NULL) &&
|
||||
dirs[slot][file].canMove != 0 &&
|
||||
((dir = &dirs[slot][file])->canMove != 0) &&
|
||||
states[slot].key == states[slot ^ 1].key &&
|
||||
states[slot ^ 1].freeBlocks >= dirs[slot][file].size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dirs[slot][file].unk_0x06 == 0) {
|
||||
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dir->unk_0x06 == 0) {
|
||||
result = -0x15;
|
||||
enabled = true;
|
||||
} else {
|
||||
@@ -166,13 +167,13 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
} else {
|
||||
result = -0x1c;
|
||||
}
|
||||
} else if (dirs[slot][file].canMove == 0) {
|
||||
} else if ((dir = &dirs[slot][file])->canMove == 0) {
|
||||
result = -0x1a;
|
||||
} else if (states[slot].key != states[slot ^ 1].key) {
|
||||
result = -0x1b;
|
||||
} else if (states[slot ^ 1].freeBlocks < dirs[slot][file].size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
result = -0x19;
|
||||
} else if (dirs[slot][file].unk_0x06 != 0) {
|
||||
} else if (dir->unk_0x06 != 0) {
|
||||
result = -0x18;
|
||||
}
|
||||
}
|
||||
@@ -186,13 +187,14 @@ bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
memorycard::CardState* states = memorycard::getCardSlotState();
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::FileInfo* dir = NULL;
|
||||
long result;
|
||||
bool enabled = false;
|
||||
if (isDistSlot(slot, NULL) &&
|
||||
dirs[slot][file].canCopy != 0 &&
|
||||
((dir = &dirs[slot][file])->canCopy != 0) &&
|
||||
states[slot].key == states[slot ^ 1].key &&
|
||||
states[slot ^ 1].freeBlocks >= dirs[slot][file].size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dirs[slot][file].unk_0x06 == 0) {
|
||||
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dir->unk_0x06 == 0) {
|
||||
result = -0x15;
|
||||
enabled = true;
|
||||
} else {
|
||||
@@ -205,13 +207,13 @@ bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
|
||||
} else {
|
||||
result = -0x1c;
|
||||
}
|
||||
} else if (dirs[slot][file].canCopy == 0) {
|
||||
} else if ((dir = &dirs[slot][file])->canCopy == 0) {
|
||||
result = -0x1a;
|
||||
} else if (states[slot].key != states[slot ^ 1].key) {
|
||||
result = -0x1b;
|
||||
} else if (states[slot ^ 1].freeBlocks < dirs[slot][file].size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
result = -0x19;
|
||||
} else if (dirs[slot][file].unk_0x06 != 0) {
|
||||
} else if (dir->unk_0x06 != 0) {
|
||||
result = -0x18;
|
||||
}
|
||||
}
|
||||
@@ -235,7 +237,10 @@ bool MemoryCardManager::isIconValidate(u8 slot, s16 index) {
|
||||
|
||||
bool MemoryCardManager::isBannerEnable(u8 slot, s16 index) {
|
||||
CardIcons* icons = reinterpret_cast<CardIcons*>(memorycard::getIconStateArray());
|
||||
return icons[slot][mFile[slot][index].fileNo].bannerEnable != 0;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::IconState* icon = &icons[slot][file];
|
||||
u8 enabled = icon->bannerEnable;
|
||||
return enabled != 0;
|
||||
}
|
||||
|
||||
void MemoryCardManager::update_icon_anm() {
|
||||
@@ -279,11 +284,7 @@ void MemoryCardManager::update_file_array(u8 slot) {
|
||||
memorycard::CardState* states = memorycard::getCardSlotState();
|
||||
states[slot].changed = 0;
|
||||
sort_file_array(slot);
|
||||
enum CardCommand {
|
||||
NoCommand, Format, Copy, Move, Delete,
|
||||
CopyComplete, MoveComplete, DeleteComplete, FormatComplete
|
||||
};
|
||||
CardCommand command = static_cast<CardCommand>(mLastCmd);
|
||||
long command = mLastCmd;
|
||||
if ((u32)(command - 1) <= 3) {
|
||||
if (mLastResult == -0x15) {
|
||||
mLastResult = memorycard::getCardLastCMDFCmdResult();
|
||||
|
||||
@@ -1266,9 +1266,10 @@ namespace ipl {
|
||||
memoPosition.x = translation.x;
|
||||
memoPosition.y = translation.y;
|
||||
memoPosition.z = translation.z;
|
||||
f32 bodyY = memoPosition.y;
|
||||
mpDialogLayout->FindPaneByName("header_header");
|
||||
nw4r::lyt::Pane* bodyPane = mpDialogLayout->FindPaneByName("header_body");
|
||||
|
||||
f32 bodyY = memoPosition.y;
|
||||
if (bodyY < 500.0f) {
|
||||
mpDialogLayout->draw("header_header");
|
||||
}
|
||||
@@ -1281,11 +1282,11 @@ namespace ipl {
|
||||
++child;
|
||||
}
|
||||
|
||||
s32 lineCount = 0;
|
||||
f32 messageOffset = 0.0f;
|
||||
f32 bodyHeight = bodyPane->GetSize().height;
|
||||
if (mNandTitleCount != 0) {
|
||||
const wchar_t* messageForCount = System::getMessage(0xCB);
|
||||
s32 lineCount = 0;
|
||||
const wchar_t* newline = wcsstr(messageForCount, L"\n");
|
||||
while (newline != NULL) {
|
||||
++lineCount;
|
||||
|
||||
@@ -1406,10 +1406,10 @@ namespace ipl {
|
||||
getCurrentTitleUsage(&bytes, &blocks);
|
||||
*titleCount = 0;
|
||||
|
||||
ESTitleId titleId;
|
||||
for (int page = MAX_CHANNEL_PAGE - 1; page >= 0; --page) {
|
||||
for (int order = 0; order < MAX_CHANNEL_INDEX; ++order) {
|
||||
int channelIndex = channelOrder[order];
|
||||
ESTitleId titleId;
|
||||
const channel::SEntry& channelInfo =
|
||||
System::getChannelManager()->mChannels[page][channelIndex];
|
||||
if (channelInfo.loadedBnr) {
|
||||
@@ -2710,19 +2710,23 @@ namespace ipl {
|
||||
nw4r::ut::Rect projection;
|
||||
System::getProjectionRect(&projection);
|
||||
GXRenderModeObj* renderMode = System::getRenderModeObj();
|
||||
f32 scissorX;
|
||||
f32 scissorY;
|
||||
f32 scissorWidth;
|
||||
f32 scissorY;
|
||||
f32 scissorX;
|
||||
f32 scissorHeight;
|
||||
u16 framebufferWidth;
|
||||
u16 framebufferHeight;
|
||||
|
||||
if (mState == 7 || mState == 12 || mState == 14) {
|
||||
nw4r::math::MTX44 matrix;
|
||||
f32 right = mPosition.x + projection.right / mScale.x;
|
||||
f32 left = mPosition.x + projection.left / mScale.x;
|
||||
f32 bottom = mPosition.y - projection.bottom / mScale.y;
|
||||
f32 top = mPosition.y - projection.top / mScale.y;
|
||||
f32 rightScale = projection.right / mScale.x;
|
||||
f32 leftScale = projection.left / mScale.x;
|
||||
f32 bottomScale = projection.bottom / mScale.y;
|
||||
f32 topScale = projection.top / mScale.y;
|
||||
f32 bottom = mPosition.y - bottomScale;
|
||||
f32 right = mPosition.x + rightScale;
|
||||
f32 left = mPosition.x + leftScale;
|
||||
f32 top = mPosition.y - topScale;
|
||||
MTXOrtho(matrix, top, bottom, left, right, -100.0f, 100.0f);
|
||||
|
||||
nw4r::math::VEC4 input(position.x, position.y, 0.0f, 1.0f);
|
||||
@@ -2730,13 +2734,14 @@ namespace ipl {
|
||||
nw4r::math::VEC4Transform(&transformed, &matrix, &input);
|
||||
framebufferWidth = renderMode->fbWidth;
|
||||
framebufferHeight = renderMode->efbHeight;
|
||||
const f32 projectionWidth = projection.GetWidth();
|
||||
scissorX = ((1.0f + transformed.x) * framebufferWidth / 2) -
|
||||
((mThumbOffsetX * mScale.x) * (framebufferWidth / projectionWidth));
|
||||
scissorWidth = projection.GetWidth();
|
||||
scissorY = (framebufferHeight - ((1.0f + transformed.y) * framebufferHeight / 2)) -
|
||||
(mThumbOffsetY * mScale.y);
|
||||
f32 widthScale = framebufferWidth / scissorWidth;
|
||||
scissorX = ((1.0f + transformed.x) * framebufferWidth / 2) -
|
||||
((mThumbOffsetX * mScale.x) * widthScale);
|
||||
scissorWidth = 2.0f * (mThumbOffsetX * mScale.x) *
|
||||
(framebufferWidth / projectionWidth);
|
||||
(framebufferWidth / scissorWidth);
|
||||
scissorHeight = 2.0f * (mThumbOffsetY * mScale.y);
|
||||
} else {
|
||||
framebufferWidth = renderMode->fbWidth;
|
||||
@@ -3406,7 +3411,7 @@ namespace ipl {
|
||||
case ::gui::EventHandler::ON_TRIG:
|
||||
if (mpScene->mState == 1 && controller != NULL) {
|
||||
BOOL writeProtected = mpScene->mpSDWorker->is_sd_write_protected();
|
||||
if (controller->pinchTrg() && iplSDChannelObj_hasAppMeta(channel) &&
|
||||
if (controller->pinchTrg() && SDChannelSelect::isChannelReady(channel) &&
|
||||
!mpScene->mbSDCardBroken) {
|
||||
if (!writeProtected) {
|
||||
mpScene->startDrag(controller, mpScene->mCurrentPage, index);
|
||||
@@ -3420,20 +3425,20 @@ namespace ipl {
|
||||
break;
|
||||
case ::gui::EventHandler::ON_DRAG:
|
||||
if (mpScene->mState == 1 && controller != NULL && controller->decide() &&
|
||||
iplSDChannelObj_hasAppMeta(channel)) {
|
||||
SDChannelSelect::isChannelReady(channel)) {
|
||||
mpScene->selectChannel(channel->getPage(), channel->getIndex());
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
}
|
||||
break;
|
||||
case ::gui::EventHandler::ON_POINT:
|
||||
if (mpScene->mState == 1 && iplSDChannelObj_hasAppMeta(channel)) {
|
||||
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
|
||||
iplSDChannelObj_startAppear(channel, 0);
|
||||
snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING");
|
||||
controller->rumble(1);
|
||||
}
|
||||
break;
|
||||
case ::gui::EventHandler::ON_LEFT:
|
||||
if (mpScene->mState == 1 && iplSDChannelObj_hasAppMeta(channel)) {
|
||||
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
|
||||
iplSDChannelObj_startDisappear(channel, 0);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -3,10 +3,6 @@
|
||||
#define IPL_SDMEMORY_DIALOG_STATE_ACCESSOR
|
||||
#define IPL_SDMEMORY_COMPLETION_PCT_ACCESSOR
|
||||
|
||||
#define IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#include "math/iplInterporation.h"
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
#include "scene/sdChannelTitle/iplSDChannelTitle.h"
|
||||
#include "scene/sdChannelSelect/iplSDChannelSelect.h"
|
||||
#include "system/iplSystem.h"
|
||||
@@ -1558,5 +1554,15 @@ void SDChannelTitle::startResetting() {
|
||||
snd::getSystem()->resetAllSound();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
handler->onEventDerived(component, event, controller);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
handler->onEvent(component, event, const_cast<controller::Interface*>(controller));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,11 +167,6 @@ typedef struct AOSSKeySchedule {
|
||||
u32 length;
|
||||
} AOSSKeySchedule;
|
||||
|
||||
typedef struct AOSSKeyMaterial {
|
||||
u8 nonce[2];
|
||||
u8 address[8];
|
||||
} AOSSKeyMaterial;
|
||||
|
||||
typedef struct AOSSReceiveBuffer {
|
||||
s32 socket;
|
||||
u32 length;
|
||||
@@ -262,7 +257,8 @@ static AOSSRuntimeState s_runtime;
|
||||
static AOSSConfigData s_configData;
|
||||
static u8 s_networkBuffer[0x280];
|
||||
static struct {
|
||||
AOSSKeyMaterial key;
|
||||
u8 keyNonce[2];
|
||||
u8 keyAddress[8];
|
||||
u8 payload[0x5e];
|
||||
} s_packetState;
|
||||
static u32 s_crcTable[0x100];
|
||||
@@ -287,10 +283,8 @@ extern int AOSSi_cancel_flag;
|
||||
extern int AOSSi_WLANGetBSSList(void** list);
|
||||
extern int AOSSi_Status(int status);
|
||||
extern int AOSSi_SetNCDIPAddr(u32 ipAddress, u32 netmask, u32 gateway, u32 dns1, u32 dns2);
|
||||
extern void AOSSi_Sleep(u32 duration);
|
||||
struct AOSSConnection;
|
||||
struct AOSSConnectionStatus;
|
||||
extern int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionStatus* status);
|
||||
extern int AOSSi_Sleep(u32 duration);
|
||||
extern int AOSSi_WLANConnect(void);
|
||||
extern int SOPoll(AOSSPollDescriptor* descriptors, int count, s32 timeoutHigh, s32 timeoutLow);
|
||||
extern int SORecvFrom(int socket, void* buffer, int length, int flags, void* address);
|
||||
extern int SOSendTo(int socket, const void* buffer, int length, int flags, const void* address);
|
||||
@@ -623,20 +617,6 @@ int AOSS_Init_old(AOSSInitInput* input)
|
||||
}
|
||||
resultCode = 0xffffffff;
|
||||
} else {
|
||||
/* The original initialization path repeats this status check. */
|
||||
if (state != 0) {
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
AOSSi_Free(s_accessPointConfig);
|
||||
s_accessPointConfig = 0;
|
||||
}
|
||||
if (s_accessPointList) {
|
||||
AOSSi_Free(s_accessPointList);
|
||||
s_accessPointList = 0;
|
||||
}
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
s_accessPointConfig = (int *)AOSSi_Alloc(0x58);
|
||||
if (s_accessPointConfig == 0) {
|
||||
input->status = 0xf;
|
||||
@@ -744,15 +724,19 @@ handle_initial_link:
|
||||
AOSSi_Free(s_accessPointList);
|
||||
s_accessPointList = 0;
|
||||
}
|
||||
{
|
||||
int recordIndex;
|
||||
for (recordIndex = 0; recordIndex < 3; recordIndex++) {
|
||||
memcpy(requestRecords.records[recordIndex].address, input->optionData, 6);
|
||||
requestRecords.records[recordIndex].transactionId = rand();
|
||||
requestRecords.records[recordIndex].transactionId =
|
||||
SOHtoNs(requestRecords.records[recordIndex].transactionId);
|
||||
}
|
||||
}
|
||||
requestResult = 0;
|
||||
state = 0;
|
||||
do {
|
||||
AOSSRequestRecord* currentRecord = &requestRecords.records[requestResult];
|
||||
u16 transactionId;
|
||||
memcpy(requestRecords.bytes + state,input->optionData,6);
|
||||
transactionId = rand();
|
||||
currentRecord->transactionId = transactionId;
|
||||
receivedLength = SOHtoNs(transactionId);
|
||||
currentRecord->transactionId = receivedLength;
|
||||
requestResult++;
|
||||
state += sizeof(AOSSRequestRecord);
|
||||
} while (requestResult < 3);
|
||||
s_socket = SOSocket(2,2,0);
|
||||
if (s_socket < 0) {
|
||||
input->status = 0xf;
|
||||
@@ -817,7 +801,7 @@ perform_request:
|
||||
if (s_socketStarted == 1) {
|
||||
s_socketStarted = 0;
|
||||
requestResult = SOCleanup();
|
||||
if (requestResult >= 0) goto request_socket_cleanup_complete;
|
||||
if (-1 < requestResult) goto request_socket_cleanup_complete;
|
||||
requestResult = -1;
|
||||
}
|
||||
else {
|
||||
@@ -906,6 +890,7 @@ request_socket_cleanup_complete:
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
initialSleep = remainingWait <= 100 ? remainingWait : 100;
|
||||
AOSSi_Sleep(remainingWait > 100 ? 100 : remainingWait);
|
||||
if (remainingWait > 100) initialSleep = 100;
|
||||
else initialSleep = remainingWait;
|
||||
@@ -958,76 +943,73 @@ request_socket_cleanup_complete:
|
||||
goto finish_initialization;
|
||||
}
|
||||
}
|
||||
{
|
||||
int sendResult;
|
||||
int requestSocket = s_socket;
|
||||
switch (protocolState) {
|
||||
case 0:
|
||||
if (s_operationState != 2) {
|
||||
s_operationState = 2;
|
||||
AOSSi_Status(2);
|
||||
}
|
||||
sendResult = AOSSSendDiscoveryRequest(networkAddresses,&requestRecords,requestSocket);
|
||||
break;
|
||||
case 1:
|
||||
if (s_operationState != 3) {
|
||||
s_operationState = 3;
|
||||
AOSSi_Status(3);
|
||||
}
|
||||
sendResult = AOSSSendHelloRequest(networkAddresses,&requestRecords,requestSocket);
|
||||
|
||||
break;
|
||||
case 2:
|
||||
if (s_operationState != 5) {
|
||||
s_operationState = 5;
|
||||
AOSSi_Status(5);
|
||||
}
|
||||
packetWords = s_responseBuffer;
|
||||
memset(s_responseBuffer,0,0x5dc);
|
||||
memcpy(messageIdentity,&requestRecords.records[2],8);
|
||||
manufacturerLength = strlen(s_manufacturer);
|
||||
AOSSXorBufferWithKey(messageIdentity,8,s_manufacturer,manufacturerLength);
|
||||
receivedLength = SOHtoNs(1);
|
||||
packetWords->initialLength = receivedLength;
|
||||
packetWords->initialType = 0;
|
||||
packetWords->initialSequence = 0;
|
||||
packetWords->responseLength = SOHtoNs(0x3000);
|
||||
packetWords->responseType = 0;
|
||||
packetWords->finalLength = SOHtoNs(0);
|
||||
packetWords->finalSequence = SOHtoNs(0);
|
||||
packetWords->reserved = 0;
|
||||
packetWords->messageType = 0x11;
|
||||
memcpy(packetWords->messageIdentity,messageIdentity,8);
|
||||
memset(&replyAddress,0,8);
|
||||
replyAddress.family = 2;
|
||||
replyAddress.port = SOHtoNs(0x5790);
|
||||
replyAddress.address = SOHtoNl(s_runtime.ipAddress);
|
||||
if ((s8)s_runtime.active == 0) {
|
||||
replyAddress.address = 0xffffffff;
|
||||
}
|
||||
replyAddress.length = 8;
|
||||
SOSendTo(requestSocket,packetWords,0x18,0,&replyAddress);
|
||||
sendResult = 0;
|
||||
|
||||
break;
|
||||
default:
|
||||
sendResult = -1;
|
||||
break;
|
||||
requestResult = s_socket;
|
||||
switch (protocolState) {
|
||||
case 0:
|
||||
if (s_operationState != 2) {
|
||||
s_operationState = 2;
|
||||
AOSSi_Status(2);
|
||||
}
|
||||
if (sendResult == -1) {
|
||||
s_errorCode = protocolState + 0x1000;
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
AOSSi_Free(s_accessPointConfig);
|
||||
s_accessPointConfig = (int *)0x0;
|
||||
}
|
||||
if (s_accessPointList) {
|
||||
AOSSi_Free(s_accessPointList);
|
||||
s_accessPointList = 0;
|
||||
}
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
requestResult = AOSSSendDiscoveryRequest(networkAddresses,&requestRecords,requestResult);
|
||||
break;
|
||||
case 1:
|
||||
if (s_operationState != 3) {
|
||||
s_operationState = 3;
|
||||
AOSSi_Status(3);
|
||||
}
|
||||
requestResult = AOSSSendHelloRequest(networkAddresses,&requestRecords,requestResult);
|
||||
|
||||
break;
|
||||
case 2:
|
||||
if (s_operationState != 5) {
|
||||
s_operationState = 5;
|
||||
AOSSi_Status(5);
|
||||
}
|
||||
packetWords = s_responseBuffer;
|
||||
memset(s_responseBuffer,0,0x5dc);
|
||||
memcpy(messageIdentity,&requestRecords.records[2],8);
|
||||
manufacturerLength = strlen(s_manufacturer);
|
||||
AOSSXorBufferWithKey(messageIdentity,8,s_manufacturer,manufacturerLength);
|
||||
receivedLength = SOHtoNs(1);
|
||||
packetWords->initialLength = receivedLength;
|
||||
packetWords->initialType = 0;
|
||||
packetWords->initialSequence = 0;
|
||||
packetWords->responseLength = SOHtoNs(0x3000);
|
||||
packetWords->responseType = 0;
|
||||
packetWords->finalLength = SOHtoNs(0);
|
||||
packetWords->finalSequence = SOHtoNs(0);
|
||||
packetWords->reserved = 0;
|
||||
packetWords->messageType = 0x11;
|
||||
memcpy(packetWords->messageIdentity,messageIdentity,8);
|
||||
memset(&replyAddress,0,8);
|
||||
replyAddress.family = 2;
|
||||
replyAddress.port = SOHtoNs(0x5790);
|
||||
replyAddress.address = SOHtoNl(s_runtime.ipAddress);
|
||||
if ((s8)s_runtime.active == 0) {
|
||||
replyAddress.address = 0xffffffff;
|
||||
}
|
||||
replyAddress.length = 8;
|
||||
SOSendTo(requestResult,packetWords,0x18,0,&replyAddress);
|
||||
requestResult = 0;
|
||||
|
||||
break;
|
||||
default:
|
||||
requestResult = -1;
|
||||
break;
|
||||
}
|
||||
if (requestResult == -1) {
|
||||
s_errorCode = protocolState + 0x1000;
|
||||
input->status = 0xf;
|
||||
if (s_accessPointConfig) {
|
||||
AOSSi_Free(s_accessPointConfig);
|
||||
s_accessPointConfig = (int *)0x0;
|
||||
}
|
||||
if (s_accessPointList) {
|
||||
AOSSi_Free(s_accessPointList);
|
||||
s_accessPointList = 0;
|
||||
}
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
memset(packetBuffer,0,0x5f8);
|
||||
pollTime.seconds = timeoutMilliseconds / 1000;
|
||||
@@ -1046,12 +1028,10 @@ request_socket_cleanup_complete:
|
||||
if (0 < requestResult) goto process_received_packet;
|
||||
receivedPackets = receivedPackets + 1;
|
||||
if (receivedPackets > attemptCount) {
|
||||
if (protocolState == 0) {
|
||||
s_errorCode = 0xf;
|
||||
} else if (protocolState == 1) {
|
||||
s_errorCode = 0x10;
|
||||
} else {
|
||||
s_errorCode = 0x11;
|
||||
switch (protocolState) {
|
||||
case 0: s_errorCode = 0xf; break;
|
||||
case 1: s_errorCode = 0x10; break;
|
||||
default: s_errorCode = 0x11; break;
|
||||
}
|
||||
protocolResult = -1;
|
||||
goto close_protocol_socket;
|
||||
@@ -1118,7 +1098,8 @@ process_received_packet:
|
||||
}
|
||||
else {
|
||||
if (protocolState != requestResult) {
|
||||
if (requestResult != 2) goto advance_protocol_state;
|
||||
protocolState = requestResult;
|
||||
if (requestResult != 2) goto perform_request;
|
||||
if (s_socket != -1) {
|
||||
SOClose(s_socket);
|
||||
}
|
||||
@@ -1256,8 +1237,7 @@ wait_for_packet:
|
||||
goto finish_initialization;
|
||||
}
|
||||
AOSSi_Sleep(remainingWait > 100 ? 100 : remainingWait);
|
||||
if (remainingWait > 100) initialSleep = 100;
|
||||
else initialSleep = remainingWait;
|
||||
initialSleep = remainingWait <= 100 ? remainingWait : 100;
|
||||
}
|
||||
if (AOSSi_cancel_flag == 1) {
|
||||
input->status = 0xf;
|
||||
@@ -1314,18 +1294,15 @@ wait_for_packet:
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
advance_protocol_state:
|
||||
protocolState = requestResult;
|
||||
goto perform_request;
|
||||
}
|
||||
protocolState = requestResult;
|
||||
if (receivedPackets > waitSettings.halfwords.high) {
|
||||
if (requestResult == 0) {
|
||||
s_errorCode = 0xf;
|
||||
} else if (requestResult == 1) {
|
||||
s_errorCode = 0x10;
|
||||
} else {
|
||||
s_errorCode = 0x11;
|
||||
switch (requestResult) {
|
||||
case 0: s_errorCode = 0xf; break;
|
||||
case 1: s_errorCode = 0x10; break;
|
||||
default: s_errorCode = 0x11; break;
|
||||
}
|
||||
protocolResult = -1;
|
||||
goto close_protocol_socket;
|
||||
@@ -1345,7 +1322,8 @@ advance_protocol_state:
|
||||
resultCode = 0xffffffff;
|
||||
goto finish_initialization;
|
||||
}
|
||||
AOSSi_Sleep(retryDelay > 100 ? 100 : retryDelay);
|
||||
if (retryDelay > 100) AOSSi_Sleep(100);
|
||||
else AOSSi_Sleep(retryDelay);
|
||||
if (retryDelay > 100) delayStep = 100;
|
||||
else delayStep = retryDelay;
|
||||
}
|
||||
@@ -1372,7 +1350,7 @@ close_protocol_socket:
|
||||
if (s_socketStarted == 1) {
|
||||
s_socketStarted = 0;
|
||||
state = SOCleanup();
|
||||
if (state >= 0) goto protocol_socket_cleanup_complete;
|
||||
if (-1 < state) goto protocol_socket_cleanup_complete;
|
||||
state = -1;
|
||||
}
|
||||
else {
|
||||
@@ -1851,22 +1829,24 @@ int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSR
|
||||
}
|
||||
|
||||
int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
|
||||
struct { u32 expected; u32 actual; } integrity;
|
||||
u32 checksum;
|
||||
u8 manufacturerAddress[8];
|
||||
AOSSKeySchedule schedule;
|
||||
AOSSEncryptedPayload* encrypted = &message->payload.encrypted;
|
||||
u32 firstValue;
|
||||
u32 secondValue;
|
||||
u8* state;
|
||||
u8* decryptedData;
|
||||
u32 controlFlags;
|
||||
u32 dataLength;
|
||||
u32 i;
|
||||
s32 crcIndex;
|
||||
u32 firstIndex;
|
||||
u32 secondIndex;
|
||||
u8* decryptedData;
|
||||
u32 controlFlags;
|
||||
u32 firstValue;
|
||||
u32 secondValue;
|
||||
u32 stateIndex;
|
||||
u32 crc;
|
||||
const u8* inputCursor;
|
||||
u32 dataLength;
|
||||
u8* state;
|
||||
u8* outputCursor;
|
||||
int result;
|
||||
|
||||
memcpy(manufacturerAddress, message->manufacturerAddress, sizeof(manufacturerAddress));
|
||||
@@ -1898,16 +1878,18 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
|
||||
return 100;
|
||||
}
|
||||
|
||||
integrity.expected = message->checksum;
|
||||
checksum = message->checksum;
|
||||
schedule.bytes = AOSSi_Alloc(dataLength);
|
||||
if (schedule.bytes == 0) {
|
||||
s_errorCode = 2;
|
||||
result = -1;
|
||||
} else {
|
||||
memcpy(s_packetState.key.nonce, &encrypted->keyNonce, sizeof(encrypted->keyNonce));
|
||||
memcpy(s_packetState.key.address, s_accessPointName, sizeof(s_accessPointName));
|
||||
AOSSInitKeySchedule(&schedule, (const u8*)&s_packetState.key, sizeof(s_packetState.key), dataLength);
|
||||
memcpy(s_packetState.keyNonce, &encrypted->keyNonce, sizeof(encrypted->keyNonce));
|
||||
memcpy(s_packetState.keyAddress, s_accessPointName, sizeof(s_accessPointName));
|
||||
AOSSInitKeySchedule(&schedule, s_packetState.keyNonce,
|
||||
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), dataLength);
|
||||
|
||||
outputCursor = decryptedData;
|
||||
inputCursor = encrypted->data;
|
||||
for (i = 0; i < dataLength; i++) {
|
||||
state = schedule.bytes;
|
||||
@@ -1920,18 +1902,15 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
|
||||
schedule.j = secondIndex;
|
||||
state[secondIndex] = (u8)firstValue;
|
||||
state[firstIndex] = (u8)secondValue;
|
||||
{
|
||||
u8 streamByte = state[stateIndex % schedule.length];
|
||||
decryptedData[i] = streamByte ^ *inputCursor++;
|
||||
}
|
||||
*outputCursor++ = *inputCursor++ ^ state[stateIndex % schedule.length];
|
||||
}
|
||||
|
||||
integrity.actual = 0xffffffff;
|
||||
crc = 0xffffffff;
|
||||
AOSSInitCrc32Table(0, s_crcTable);
|
||||
for (crcIndex = 0; crcIndex < (s32)dataLength; crcIndex++) {
|
||||
integrity.actual = (integrity.actual >> 8) ^ s_crcTable[(integrity.actual ^ decryptedData[crcIndex]) & 0xff];
|
||||
crc = (crc >> 8) ^ s_crcTable[(crc ^ decryptedData[crcIndex]) & 0xff];
|
||||
}
|
||||
if (((integrity.actual ^ 0xffffffff) & 0xff) != integrity.expected) {
|
||||
if (((crc ^ 0xffffffff) & 0xff) != checksum) {
|
||||
s_errorCode = 0x12;
|
||||
AOSSi_Free(schedule.bytes);
|
||||
result = -1;
|
||||
@@ -2337,8 +2316,8 @@ int AOSSSendHelloRequest(void* packet, void* request, int socket) {
|
||||
u16 nonce;
|
||||
u32 stateLength;
|
||||
u32 index;
|
||||
u32 firstIndex;
|
||||
u32 firstByte;
|
||||
u32 firstIndex;
|
||||
u32 secondIndex;
|
||||
u8* state;
|
||||
u8 value;
|
||||
@@ -2380,9 +2359,10 @@ int AOSSSendHelloRequest(void* packet, void* request, int socket) {
|
||||
if (construction.schedule.bytes != 0) {
|
||||
nonce = (u16)rand();
|
||||
memcpy(&payload->encrypted.key.nonce, &nonce, 2);
|
||||
memcpy(s_packetState.key.nonce, payload->encrypted.key.nonceBytes, 2);
|
||||
memcpy(s_packetState.key.address, s_accessPointName, 8);
|
||||
AOSSInitKeySchedule(&construction.schedule, (const u8*)&s_packetState.key, sizeof(s_packetState.key), 8);
|
||||
memcpy(s_packetState.keyNonce, payload->encrypted.key.nonceBytes, 2);
|
||||
memcpy(s_packetState.keyAddress, s_accessPointName, 8);
|
||||
AOSSInitKeySchedule(&construction.schedule, s_packetState.keyNonce,
|
||||
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), 8);
|
||||
for (index = 0; index < 8; index++) {
|
||||
state = construction.schedule.bytes;
|
||||
firstIndex = (construction.schedule.i + 1) % construction.schedule.length & 0xff;
|
||||
@@ -2566,7 +2546,7 @@ int AOSSConnectAndAwaitHost(void* settings, void* config) {
|
||||
s32 connectionAttempts = 0;
|
||||
u32 ticksPerMillisecond;
|
||||
|
||||
if (AOSSi_WLANConnect(settings, config) != 0) {
|
||||
if (AOSSi_WLANConnect() != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ int AOSSi_EndLocal(void) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int AOSSi_WLANGetBSSList(void** output) {
|
||||
int AOSSi_WLANGetBSSList(struct AOSSAccessPointList** output) {
|
||||
int result = -1;
|
||||
int startupRetries = 0;
|
||||
WDScanParam scan ATTRIBUTE_ALIGN(32);
|
||||
@@ -338,7 +338,7 @@ void AOSSi_Sleep(u32 milliseconds) {
|
||||
AOSSi_SleepMs(milliseconds);
|
||||
}
|
||||
|
||||
int AOSSi_Status(int status) {
|
||||
int AOSSi_Status(void) {
|
||||
if (statusCallback != NULL) {
|
||||
statusCallback();
|
||||
}
|
||||
|
||||
@@ -357,6 +357,11 @@ extern int SOBind(int socket, void* address);
|
||||
extern int SORecvFrom(int socket, void* buffer, int length, int flags, void* address);
|
||||
extern int SOSendTo(int socket, const void* buffer, int length, int flags, void* address);
|
||||
|
||||
typedef struct {
|
||||
NCDIpConfig ipConfig;
|
||||
NCDIfConfig ifConfig;
|
||||
} AtermNetworkSettings;
|
||||
|
||||
typedef struct {
|
||||
u32 ssidLength;
|
||||
u8 ssid[32];
|
||||
@@ -395,13 +400,10 @@ typedef struct {
|
||||
u8 value[4];
|
||||
} AtermRequestOption8;
|
||||
|
||||
typedef union {
|
||||
struct {
|
||||
u8 firstAddress[6];
|
||||
u8 secondAddress[6];
|
||||
char productName[4];
|
||||
};
|
||||
u8 keyMaterial[16];
|
||||
typedef struct {
|
||||
u8 firstAddress[6];
|
||||
u8 secondAddress[6];
|
||||
char productName[4];
|
||||
} AtermAssociationRequest;
|
||||
|
||||
typedef struct {
|
||||
@@ -458,6 +460,10 @@ typedef struct {
|
||||
u32 securityMode;
|
||||
u8 reserved028[0x80];
|
||||
u8 keyMaterial[0x40];
|
||||
u8 connectionPrefix[0x10];
|
||||
u8 packetBuffer[0x800];
|
||||
u16 responseLength;
|
||||
u8 trailingData[6];
|
||||
} AtermConfigurationResult;
|
||||
|
||||
typedef struct {
|
||||
@@ -467,12 +473,25 @@ typedef struct {
|
||||
} AtermDecodedPayload;
|
||||
|
||||
typedef union {
|
||||
u8 keyMaterial[32];
|
||||
u8 data[0x818];
|
||||
struct {
|
||||
u8 challenge[8];
|
||||
u8 digest[16];
|
||||
};
|
||||
} AtermSession;
|
||||
u8 encryptedOptions[0x7F8];
|
||||
u8 keyMaterial[24];
|
||||
} session;
|
||||
struct {
|
||||
union {
|
||||
u8 payload[0x800];
|
||||
AtermDecodedPayload decoded;
|
||||
};
|
||||
union {
|
||||
struct {
|
||||
u8 challenge[8];
|
||||
u8 digest[16];
|
||||
};
|
||||
u8 keyMaterial[24];
|
||||
};
|
||||
} authentication;
|
||||
} AtermThreadBuffer;
|
||||
|
||||
typedef struct {
|
||||
u32 state[4];
|
||||
@@ -485,15 +504,11 @@ typedef void (*AtermProgressCallback)(void*);
|
||||
typedef void* (*AtermAllocateCallback)(u32);
|
||||
typedef void (*AtermFreeCallback)(void*);
|
||||
|
||||
NCDIpConfig gAtermIpConfig;
|
||||
NCDIfConfig gAtermIfConfig;
|
||||
AtermNetworkSettings gNetworkSettings;
|
||||
char gAccessPointName[0x24];
|
||||
AtermScanSettings gScanSettings;
|
||||
AtermConfigurationResult gAtermConfigurationResult;
|
||||
AtermAssociationRequest gAtermAssociationRequest;
|
||||
u8 gAtermPacketBuffer[0x800];
|
||||
AtermDecodedPayload gAtermDecodedResponse;
|
||||
AtermSession gAtermSession;
|
||||
AtermThreadBuffer gAtermResponseBuffer;
|
||||
static OSThread sAtermThread;
|
||||
u32 gAtermDeadline = 0xFFFFFFFF;
|
||||
u32 gAtermScanLimit = 0x40;
|
||||
@@ -527,7 +542,7 @@ s32 gAtermState;
|
||||
|
||||
void ATERMAlarmWakeQueue(OSAlarm* alarm, OSContext* context);
|
||||
s32 ATERMRunConfigProtocol(void);
|
||||
void ATERMMd5Update(AtermMd5Context* context, u8* input, u32 length);
|
||||
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length);
|
||||
extern u8 gAtermDigestFill[64];
|
||||
extern u8* gAtermRequestOptions;
|
||||
int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
|
||||
@@ -554,7 +569,7 @@ int ATERMStartNetworkStack(void) {
|
||||
OSMessage hostQueueBuffer;
|
||||
OSAlarm hostAlarm;
|
||||
|
||||
ipConfig = &gAtermIpConfig;
|
||||
ipConfig = &gNetworkSettings.ipConfig;
|
||||
memset(ipConfig, 0, sizeof(*ipConfig));
|
||||
ipConfig->adjust.maxTransferUnit = 0x514;
|
||||
ipConfig->adjust.tcpRetransTimeout = 100;
|
||||
@@ -568,8 +583,8 @@ int ATERMStartNetworkStack(void) {
|
||||
memcpy(ipConfig->ip.dns2, &gDefaultSecondaryDns, 4);
|
||||
NCDSetIpConfig(ipConfig);
|
||||
|
||||
memset(&gAtermIfConfig, 0, sizeof(gAtermIfConfig));
|
||||
ifConfig = &gAtermIfConfig;
|
||||
memset(&gNetworkSettings.ifConfig, 0, sizeof(gNetworkSettings.ifConfig));
|
||||
ifConfig = &gNetworkSettings.ifConfig;
|
||||
ifConfig->selectedMedia = 1;
|
||||
ifConfig->netif.wireless.rateset = 0;
|
||||
ifConfig->netif.wireless.configMethod = 0;
|
||||
@@ -855,38 +870,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline s32 atermFormatHexByte(char* output, u8 byte) {
|
||||
s32 nibbles[2];
|
||||
s32 index;
|
||||
char* encoded = output;
|
||||
nibbles[0] = (byte & 0xF0) >> 4;
|
||||
nibbles[1] = byte & 0xF;
|
||||
for (index = 0; index < 2; index++) {
|
||||
s32 nibble = nibbles[index];
|
||||
if (nibble <= 9) {
|
||||
*encoded++ = nibble + '0';
|
||||
} else {
|
||||
*encoded++ = nibble + '7';
|
||||
}
|
||||
}
|
||||
*encoded = 0;
|
||||
return encoded - output;
|
||||
}
|
||||
|
||||
static inline void atermFormatMacAddress(char* text, const u8* address) {
|
||||
const u8* input = address;
|
||||
char* output = text;
|
||||
s32 index;
|
||||
for (index = 0; index < 6; index++) {
|
||||
u8 byte = *input++;
|
||||
output += atermFormatHexByte(output, byte);
|
||||
if (index < 5) {
|
||||
*output++ = ':';
|
||||
}
|
||||
}
|
||||
*output = 0;
|
||||
}
|
||||
|
||||
int ATERMDiscoverAccessPoints(void) {
|
||||
s32 result = -1;
|
||||
u32 scanBufferBytes;
|
||||
@@ -965,8 +948,8 @@ int ATERMDiscoverAccessPoints(void) {
|
||||
sizeof(currentRecords->entries[recordIndex].bssid));
|
||||
descriptorWords += descriptor->length;
|
||||
ssidCursor += sizeof(AtermApRecord);
|
||||
recordIndex++;
|
||||
bssidCursor += sizeof(AtermApRecord);
|
||||
recordIndex++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -980,7 +963,35 @@ int ATERMDiscoverAccessPoints(void) {
|
||||
memcpy(gAtermSelectedBssid,
|
||||
selectedRecord->bssid,
|
||||
sizeof(selectedRecord->bssid));
|
||||
atermFormatMacAddress(selectedMacText, gAtermSelectedBssid);
|
||||
{
|
||||
u8* addressCursor = gAtermSelectedBssid;
|
||||
s32 addressIndex = 0;
|
||||
char* output = selectedMacText;
|
||||
|
||||
for (addressIndex = 0; ; addressIndex++) {
|
||||
u8 addressByte = *addressCursor++;
|
||||
char* encoded = output;
|
||||
s32 highNibble = (addressByte & 0xF0) >> 4;
|
||||
s32 lowNibble = addressByte & 0xF;
|
||||
if (highNibble <= 9) {
|
||||
*encoded++ = highNibble + '0';
|
||||
} else {
|
||||
*encoded++ = highNibble + '7';
|
||||
}
|
||||
if (lowNibble <= 9) {
|
||||
*encoded++ = lowNibble + '0';
|
||||
} else {
|
||||
*encoded++ = lowNibble + '7';
|
||||
}
|
||||
*encoded = 0;
|
||||
output += encoded - output;
|
||||
if (addressIndex == 5) {
|
||||
break;
|
||||
}
|
||||
*output++ = ':';
|
||||
}
|
||||
*output = '\0';
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -999,18 +1010,18 @@ int ATERMDiscoverAccessPoints(void) {
|
||||
iteration++;
|
||||
}
|
||||
|
||||
if (iteration >= 300) {
|
||||
goto timed_out;
|
||||
}
|
||||
now = (u32)OSTicksToMilliseconds(OSGetTime());
|
||||
if (now > gAtermDeadline) {
|
||||
timed_out:
|
||||
result = -3;
|
||||
} else {
|
||||
result = 1;
|
||||
if (gAtermCancelRequested != 0) {
|
||||
result = -8;
|
||||
if (iteration < 300) {
|
||||
now = (u32)OSTicksToMilliseconds(OSGetTime());
|
||||
if (now > gAtermDeadline) {
|
||||
result = -3;
|
||||
} else {
|
||||
result = 1;
|
||||
if (gAtermCancelRequested != 0) {
|
||||
result = -8;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
result = -3;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
@@ -1132,7 +1143,7 @@ int ATERMParsePacket(AtermPacket* packet, u32* setupType) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ATERMBuildAssociationRequest(AtermAssociationRequest* request, AtermSocketAddress* address) {
|
||||
int ATERMBuildAssociationRequest(AtermAssociationRequest* request) {
|
||||
u8 scanAddress[8];
|
||||
u8 interfaceMacAddress[8];
|
||||
char interfaceMacText[32];
|
||||
@@ -1153,36 +1164,77 @@ int ATERMBuildAssociationRequest(AtermAssociationRequest* request, AtermSocketAd
|
||||
memcpy(request->secondAddress, interfaceMacAddress, 6);
|
||||
}
|
||||
if (gAtermUseSharedAddress != 0) {
|
||||
atermFormatMacAddress(interfaceMacText, interfaceMacAddress);
|
||||
atermFormatMacAddress(scanAddressText, scanAddress);
|
||||
{
|
||||
const u8* addressCursor = interfaceMacAddress;
|
||||
const u8* addressEnd = interfaceMacAddress + 6;
|
||||
int addressIndex;
|
||||
char* textCursor = interfaceMacText;
|
||||
addressIndex = 0;
|
||||
do {
|
||||
u8 addressByte = *addressCursor++;
|
||||
char* encoded = textCursor;
|
||||
s32 highNibble = (addressByte & 0xF0) >> 4;
|
||||
s32 lowNibble = addressByte & 0xF;
|
||||
if (highNibble <= 9) {
|
||||
*encoded++ = highNibble + '0';
|
||||
} else {
|
||||
*encoded++ = highNibble + '7';
|
||||
}
|
||||
if (lowNibble <= 9) {
|
||||
*encoded++ = lowNibble + '0';
|
||||
} else {
|
||||
*encoded++ = lowNibble + '7';
|
||||
}
|
||||
*encoded = 0;
|
||||
textCursor += encoded - textCursor;
|
||||
if (addressIndex < 5) {
|
||||
*textCursor++ = ':';
|
||||
}
|
||||
addressIndex++;
|
||||
} while (addressCursor < addressEnd);
|
||||
*textCursor = '\0';
|
||||
}
|
||||
{
|
||||
const u8* addressCursor = scanAddress;
|
||||
const u8* addressEnd = scanAddress + 6;
|
||||
int addressIndex;
|
||||
char* textCursor = scanAddressText;
|
||||
addressIndex = 0;
|
||||
do {
|
||||
u8 addressByte = *addressCursor++;
|
||||
char* encoded = textCursor;
|
||||
s32 highNibble = (addressByte & 0xF0) >> 4;
|
||||
s32 lowNibble = addressByte & 0xF;
|
||||
if (highNibble <= 9) {
|
||||
*encoded++ = highNibble + '0';
|
||||
} else {
|
||||
*encoded++ = highNibble + '7';
|
||||
}
|
||||
if (lowNibble <= 9) {
|
||||
*encoded++ = lowNibble + '0';
|
||||
} else {
|
||||
*encoded++ = lowNibble + '7';
|
||||
}
|
||||
*encoded = 0;
|
||||
textCursor += encoded - textCursor;
|
||||
if (addressIndex < 5) {
|
||||
*textCursor++ = ':';
|
||||
}
|
||||
addressIndex++;
|
||||
} while (addressCursor < addressEnd);
|
||||
*textCursor = '\0';
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static inline s32 atermEncodeHexByte(char* key, u8 sourceByte) {
|
||||
char* encoded = key;
|
||||
s32 lowNibble = sourceByte & 0xF;
|
||||
s32 highNibble = (sourceByte & 0xF0) >> 4;
|
||||
if (highNibble <= 9) {
|
||||
*encoded++ = highNibble + '0';
|
||||
} else {
|
||||
*encoded++ = highNibble + '7';
|
||||
}
|
||||
if (lowNibble <= 9) {
|
||||
*encoded++ = lowNibble + '0';
|
||||
} else {
|
||||
*encoded++ = lowNibble + '7';
|
||||
}
|
||||
*encoded = 0;
|
||||
return encoded - key;
|
||||
}
|
||||
|
||||
int ATERMParseAssociationResponse(u16* response) {
|
||||
u16* optionCursor = response + 4;
|
||||
u8* optionValue;
|
||||
u16* responseEnd;
|
||||
u32 optionType;
|
||||
s32 optionLength;
|
||||
char* key;
|
||||
u32 value;
|
||||
s32 result = 0;
|
||||
|
||||
@@ -1220,7 +1272,6 @@ int ATERMParseAssociationResponse(u16* response) {
|
||||
case 0x208:
|
||||
case 0x209:
|
||||
{
|
||||
char* key;
|
||||
u32 keyIndex = optionType - 0x206;
|
||||
key = gScanSettings.wirelessKeys[keyIndex].key;
|
||||
memset(key, 0, sizeof(gScanSettings.wirelessKeys[keyIndex].key));
|
||||
@@ -1228,7 +1279,21 @@ int ATERMParseAssociationResponse(u16* response) {
|
||||
s32 byteIndex;
|
||||
for (byteIndex = 0; byteIndex < optionLength; byteIndex++) {
|
||||
u8 sourceByte = *optionValue++;
|
||||
key += atermEncodeHexByte(key, sourceByte);
|
||||
char* encoded = key;
|
||||
s32 highNibble = (sourceByte & 0xF0) >> 4;
|
||||
s32 lowNibble = sourceByte & 0xF;
|
||||
if (highNibble <= 9) {
|
||||
*encoded++ = highNibble + '0';
|
||||
} else {
|
||||
*encoded++ = highNibble + '7';
|
||||
}
|
||||
if (lowNibble <= 9) {
|
||||
*encoded++ = lowNibble + '0';
|
||||
} else {
|
||||
*encoded++ = lowNibble + '7';
|
||||
}
|
||||
*encoded = 0;
|
||||
key += encoded - key;
|
||||
}
|
||||
} else {
|
||||
memcpy(key, optionValue, optionLength);
|
||||
@@ -1368,26 +1433,6 @@ int ATERMApplyScanSecuritySettings(void) {
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline u8* atermAppendOption(u8* cursor, u16 type, u16 length, const void* value) {
|
||||
AtermPacketOption* option = (AtermPacketOption*)cursor;
|
||||
u32 recordSize = (length + 4 + 7) & ~7;
|
||||
memset(option, 0, 4);
|
||||
option->type = SOHtoNs(type);
|
||||
option->length = SOHtoNs(length);
|
||||
memset(option->value, 0, recordSize - 4);
|
||||
memcpy(option->value, value, length);
|
||||
return cursor + recordSize;
|
||||
}
|
||||
|
||||
static inline u8* atermAppendLongOption(AtermRequestOption16* option, u16 type, u16 length, const void* value) {
|
||||
option = memset(option, 0, 4);
|
||||
option->type = SOHtoNs(type);
|
||||
option->length = SOHtoNs(length);
|
||||
memset(option->value, 0, sizeof(option->value));
|
||||
memcpy(option->value, value, length);
|
||||
return (u8*)(option + 1);
|
||||
}
|
||||
|
||||
s32 ATERMRunConfigProtocol(void) {
|
||||
OSMessageQueue waitQueue;
|
||||
OSMessage waitBuffer[1];
|
||||
@@ -1395,29 +1440,20 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
OSAlarm waitAlarm;
|
||||
AtermSocketAddress socketBindAddress;
|
||||
AtermSocketAddress peerAddress;
|
||||
AtermAssociationRequest* request;
|
||||
AtermDecodedPayload* response;
|
||||
AtermPacket* packet;
|
||||
AtermSession* session;
|
||||
s32 socket;
|
||||
s32 result;
|
||||
s32 failed;
|
||||
s32 retries;
|
||||
u32 lastSendTime;
|
||||
AtermThreadBuffer* response = (AtermThreadBuffer*)&gAtermConfigurationResult.responseLength;
|
||||
void* sessionKey = gAtermResponseBuffer.session.keyMaterial;
|
||||
AtermMd5Context digestContext;
|
||||
u8 digestLength[8];
|
||||
s32 socket = 0;
|
||||
s32 result = -5;
|
||||
s32 failed = 0;
|
||||
s32 retries = 0;
|
||||
u32 lastSendTime = 0;
|
||||
u32 now;
|
||||
s32 receivedLength;
|
||||
u32 reciprocal = 0x10624DD3;
|
||||
|
||||
gAtermProtocolState = 1;
|
||||
request = &gAtermAssociationRequest;
|
||||
packet = (AtermPacket*)gAtermPacketBuffer;
|
||||
response = &gAtermDecodedResponse;
|
||||
session = &gAtermSession;
|
||||
socket = 0;
|
||||
result = -5;
|
||||
lastSendTime = 0;
|
||||
retries = 0;
|
||||
failed = 0;
|
||||
while (failed == 0 && gAtermCancelRequested == 0) {
|
||||
OSInitMessageQueue(&waitQueue, waitBuffer, 1);
|
||||
OSCreateAlarm(&waitAlarm);
|
||||
@@ -1490,11 +1526,11 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
break;
|
||||
}
|
||||
peerAddress.length = 8;
|
||||
ATERMBuildAssociationRequest(request, &peerAddress);
|
||||
receivedLength = SORecvFrom(socket, gAtermPacketBuffer,
|
||||
sizeof(gAtermPacketBuffer), 4, &peerAddress);
|
||||
ATERMBuildAssociationRequest((AtermAssociationRequest*)gAtermConfigurationResult.connectionPrefix);
|
||||
receivedLength = SORecvFrom(socket, gAtermConfigurationResult.packetBuffer,
|
||||
sizeof(gAtermConfigurationResult.packetBuffer), 4, &peerAddress);
|
||||
if (receivedLength > 0 &&
|
||||
ATERMParsePacket((AtermPacket*)gAtermPacketBuffer, &gAtermResponseMode)) {
|
||||
ATERMParsePacket((AtermPacket*)gAtermConfigurationResult.packetBuffer, &gAtermResponseMode)) {
|
||||
AtermProgress progress;
|
||||
gAtermDeadline = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 30000;
|
||||
gAtermProtocolState = 5;
|
||||
@@ -1511,30 +1547,55 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
break;
|
||||
case 5:
|
||||
{
|
||||
u8* optionEnd = gAtermRequestOptions;
|
||||
AtermRequestOption16* longOptions;
|
||||
u16 enabled = SOHtoNs(1);
|
||||
u8 optionIds[7] = {6, 0, 1, 2, 3, 4, 5};
|
||||
AtermRequestOption8* shortOption = (AtermRequestOption8*)gAtermRequestOptions;
|
||||
AtermRequestOption16* longOption;
|
||||
u16 enabled = SOHtoNs(1);
|
||||
AtermSocketAddress sendAddress;
|
||||
s32 messageLength;
|
||||
optionEnd = atermAppendOption(optionEnd, 1, 2, &enabled);
|
||||
optionEnd = atermAppendOption(optionEnd, 2, 2, &enabled);
|
||||
u8* optionEnd;
|
||||
memset(shortOption, 0, 4);
|
||||
shortOption->type = SOHtoNs(1);
|
||||
shortOption->length = SOHtoNs(2);
|
||||
memset(shortOption->value, 0, sizeof(shortOption->value));
|
||||
memcpy(shortOption->value, &enabled, sizeof(enabled));
|
||||
shortOption++;
|
||||
memset(shortOption, 0, 4);
|
||||
shortOption->type = SOHtoNs(2);
|
||||
shortOption->length = SOHtoNs(2);
|
||||
memset(shortOption->value, 0, sizeof(shortOption->value));
|
||||
memcpy(shortOption->value, &enabled, sizeof(enabled));
|
||||
shortOption++;
|
||||
if (gAtermResponseMode != 0) {
|
||||
optionEnd = atermAppendOption(optionEnd, 5, 2, &enabled);
|
||||
memset(shortOption, 0, 4);
|
||||
shortOption->type = SOHtoNs(5);
|
||||
shortOption->length = SOHtoNs(2);
|
||||
memset(shortOption->value, 0, sizeof(shortOption->value));
|
||||
memcpy(shortOption->value, &enabled, sizeof(enabled));
|
||||
shortOption++;
|
||||
}
|
||||
longOptions = (AtermRequestOption16*)optionEnd;
|
||||
optionEnd = atermAppendLongOption(longOptions, 3, sizeof(optionIds), optionIds);
|
||||
longOption = (AtermRequestOption16*)shortOption;
|
||||
memset(longOption, 0, 4);
|
||||
longOption->type = SOHtoNs(3);
|
||||
longOption->length = SOHtoNs(7);
|
||||
memset(longOption->value, 0, sizeof(longOption->value));
|
||||
memcpy(longOption->value, optionIds, sizeof(optionIds));
|
||||
longOption++;
|
||||
if (gAtermResponseMode != 0) {
|
||||
optionEnd = atermAppendLongOption(longOptions + 1, 4, 6, gAtermAddressBuffer);
|
||||
memset(longOption, 0, 4);
|
||||
longOption->type = SOHtoNs(4);
|
||||
longOption->length = SOHtoNs(6);
|
||||
memset(longOption->value, 0, sizeof(longOption->value));
|
||||
memcpy(longOption->value, gAtermAddressBuffer, 6);
|
||||
longOption++;
|
||||
}
|
||||
messageLength = ATERMBuildEncryptedMessage((u16*)gAtermPacketBuffer, 2,
|
||||
(u16*)response, optionEnd - gAtermRequestOptions + 8, NULL);
|
||||
gAtermMessageLength = messageLength;
|
||||
optionEnd = (u8*)longOption;
|
||||
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 2,
|
||||
(u16*)response->data, optionEnd - gAtermRequestOptions + 8, NULL);
|
||||
sendAddress.length = 8;
|
||||
sendAddress.family = 2;
|
||||
sendAddress.address = 0xFFFFFFFF;
|
||||
sendAddress.port = SOHtoNs(0xE601);
|
||||
SOSendTo(socket, gAtermPacketBuffer, messageLength, 0, &sendAddress);
|
||||
SOSendTo(socket, gAtermConfigurationResult.packetBuffer, gAtermMessageLength, 0, &sendAddress);
|
||||
lastSendTime = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
|
||||
gAtermProtocolState = 6;
|
||||
break;
|
||||
@@ -1547,38 +1608,36 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
failed = 1;
|
||||
break;
|
||||
}
|
||||
receivedLength = SORecvFrom(socket, gAtermPacketBuffer,
|
||||
sizeof(gAtermPacketBuffer), 4, &peerAddress);
|
||||
receivedLength = SORecvFrom(socket, gAtermConfigurationResult.packetBuffer,
|
||||
sizeof(gAtermConfigurationResult.packetBuffer), 4, &peerAddress);
|
||||
if (receivedLength > 0) {
|
||||
u32 checksum = 0;
|
||||
AtermPacket* packet = (AtermPacket*)gAtermConfigurationResult.packetBuffer;
|
||||
s32 sequence = SONtoHs(packet->sequence);
|
||||
s32 payloadLength = SONtoHs(packet->length);
|
||||
u8* cursor = (u8*)packet;
|
||||
u32 checksum = 0;
|
||||
u8* cursor = gAtermConfigurationResult.packetBuffer;
|
||||
u8* packetEnd = packet->payload + payloadLength;
|
||||
u8* payload;
|
||||
u16 packetChecksum;
|
||||
u8* payload = packet->payload;
|
||||
for (; cursor < packetEnd; cursor++) {
|
||||
checksum += *cursor;
|
||||
}
|
||||
packetChecksum = SONtoHs(*(u16*)packetEnd);
|
||||
payload = packet->payload;
|
||||
if ((u16)checksum != packetChecksum) {
|
||||
if ((u16)checksum != SONtoHs(*(u16*)packetEnd)) {
|
||||
payload = NULL;
|
||||
}
|
||||
if (payload == NULL) {
|
||||
payloadLength = 0;
|
||||
} else if (sequence != 3) {
|
||||
payloadLength = 0;
|
||||
} else if (gAtermAssociationRequest.keyMaterial != NULL) {
|
||||
ATERMAesKeyUnwrap((u16*)response, (u16*)payload,
|
||||
payloadLength, gAtermAssociationRequest.keyMaterial, 16);
|
||||
} else if (gAtermConfigurationResult.connectionPrefix != NULL) {
|
||||
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
|
||||
payloadLength, gAtermConfigurationResult.connectionPrefix, 16);
|
||||
payloadLength -= 8;
|
||||
} else {
|
||||
memcpy(response, payload, payloadLength);
|
||||
memcpy(response->authentication.payload, payload, payloadLength);
|
||||
}
|
||||
if (payloadLength != 0) {
|
||||
AtermPacketOption* option = (AtermPacketOption*)response->options;
|
||||
u8* optionEnd = (u8*)option + SONtoHs(response->length);
|
||||
AtermPacketOption* option = (AtermPacketOption*)response->authentication.decoded.options;
|
||||
u8* optionEnd = (u8*)option + SONtoHs(response->authentication.decoded.length);
|
||||
s32 optionType;
|
||||
u8* optionValue;
|
||||
if ((u8*)option >= optionEnd) {
|
||||
@@ -1588,26 +1647,24 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
SONtoHs(option->length);
|
||||
optionValue = option->value;
|
||||
}
|
||||
if (optionType != 0x101) {
|
||||
if (optionValue == NULL || optionType != 0x101) {
|
||||
break;
|
||||
}
|
||||
{
|
||||
AtermProgress progress;
|
||||
AtermMd5Context digestContext;
|
||||
u8 digestLength[8];
|
||||
u32 authenticationTime = (u32)(OSGetTime() /
|
||||
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
|
||||
u32 index;
|
||||
u32 digestBytes;
|
||||
AtermSession* authentication;
|
||||
authentication = memcpy(session->challenge, optionValue, 8);
|
||||
memcpy(response->authentication.challenge,
|
||||
optionValue, 8);
|
||||
digestContext.bitCountHigh = 0;
|
||||
digestContext.bitCountLow = 0;
|
||||
digestContext.state[0] = 0x67452301;
|
||||
digestContext.state[1] = 0xEFCDAB89;
|
||||
digestContext.state[2] = 0x98BADCFE;
|
||||
digestContext.state[3] = 0x10325476;
|
||||
ATERMMd5Update(&digestContext, (u8*)&authenticationTime, sizeof(authenticationTime));
|
||||
ATERMMd5Update(&digestContext, &authenticationTime, sizeof(authenticationTime));
|
||||
digestLength[0] = digestContext.bitCountLow;
|
||||
digestLength[1] = digestContext.bitCountLow >> 8;
|
||||
digestLength[2] = digestContext.bitCountLow >> 16;
|
||||
@@ -1620,15 +1677,27 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
ATERMMd5Update(&digestContext, gAtermDigestFill,
|
||||
digestBytes < 56 ? 56 - digestBytes : 120 - digestBytes);
|
||||
ATERMMd5Update(&digestContext, digestLength, sizeof(digestLength));
|
||||
for (index = 0; index < 4; index++) {
|
||||
u32 word = digestContext.state[index];
|
||||
authentication->digest[index * 4] = word;
|
||||
authentication->digest[index * 4 + 1] = word >> 8;
|
||||
authentication->digest[index * 4 + 2] = word >> 16;
|
||||
authentication->digest[index * 4 + 3] = word >> 24;
|
||||
}
|
||||
for (index = sizeof(digestContext); index != 0; index--) {
|
||||
((u8*)&digestContext)[index - 1] = 0;
|
||||
response->authentication.digest[0] = digestContext.state[0];
|
||||
response->authentication.digest[1] = digestContext.state[0] >> 8;
|
||||
response->authentication.digest[2] = digestContext.state[0] >> 16;
|
||||
response->authentication.digest[3] = digestContext.state[0] >> 24;
|
||||
response->authentication.digest[4] = digestContext.state[1];
|
||||
response->authentication.digest[5] = digestContext.state[1] >> 8;
|
||||
response->authentication.digest[6] = digestContext.state[1] >> 16;
|
||||
response->authentication.digest[7] = digestContext.state[1] >> 24;
|
||||
response->authentication.digest[8] = digestContext.state[2];
|
||||
response->authentication.digest[9] = digestContext.state[2] >> 8;
|
||||
response->authentication.digest[10] = digestContext.state[2] >> 16;
|
||||
response->authentication.digest[11] = digestContext.state[2] >> 24;
|
||||
response->authentication.digest[12] = digestContext.state[3];
|
||||
response->authentication.digest[13] = digestContext.state[3] >> 8;
|
||||
response->authentication.digest[14] = digestContext.state[3] >> 16;
|
||||
response->authentication.digest[15] = digestContext.state[3] >> 24;
|
||||
{
|
||||
u8* contextByte = (u8*)&digestContext;
|
||||
for (index = 0; index < sizeof(digestContext); index++) {
|
||||
*contextByte++ = 0;
|
||||
}
|
||||
}
|
||||
gAtermProtocolState = 7;
|
||||
gAtermState = 5;
|
||||
@@ -1649,62 +1718,58 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
break;
|
||||
case 7:
|
||||
{
|
||||
AtermRequestOption16* option = (AtermRequestOption16*)response->options;
|
||||
AtermRequestOption16* option = (AtermRequestOption16*)response->authentication.decoded.options;
|
||||
AtermSocketAddress sendAddress;
|
||||
s32 messageLength;
|
||||
memset(response, 0, 8);
|
||||
memset(response->data, 0, 8);
|
||||
memset(option, 0, 4);
|
||||
option->type = SOHtoNs(0x102);
|
||||
option->length = SOHtoNs(8);
|
||||
memset(option->value, 0, sizeof(option->value));
|
||||
memcpy(option->value, session->digest, 8);
|
||||
gAtermReplyLength = (u8*)(option + 1) - (u8*)response;
|
||||
response->length = gAtermReplyLength - 8;
|
||||
messageLength = ATERMBuildEncryptedMessage((u16*)gAtermPacketBuffer, 4,
|
||||
(u16*)response, gAtermReplyLength, gAtermAssociationRequest.keyMaterial);
|
||||
gAtermMessageLength = messageLength;
|
||||
memcpy(option->value, response->authentication.digest, 8);
|
||||
gAtermReplyLength = (u8*)(option + 1) - response->data;
|
||||
response->authentication.decoded.length = gAtermReplyLength - 8;
|
||||
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 4,
|
||||
(u16*)response->data, gAtermReplyLength, gAtermConfigurationResult.connectionPrefix);
|
||||
sendAddress.length = 8;
|
||||
sendAddress.family = 2;
|
||||
sendAddress.address = 0xFFFFFFFF;
|
||||
sendAddress.port = SOHtoNs(0xE601);
|
||||
SOSendTo(socket, gAtermPacketBuffer, messageLength, 0, &sendAddress);
|
||||
SOSendTo(socket, gAtermConfigurationResult.packetBuffer, gAtermMessageLength, 0, &sendAddress);
|
||||
lastSendTime = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
|
||||
memset(&gScanSettings, 0, 0x254);
|
||||
gAtermProtocolState = 8;
|
||||
break;
|
||||
}
|
||||
case 8:
|
||||
receivedLength = SORecvFrom(socket, gAtermPacketBuffer,
|
||||
sizeof(gAtermPacketBuffer), 4, &peerAddress);
|
||||
receivedLength = SORecvFrom(socket, gAtermConfigurationResult.packetBuffer,
|
||||
sizeof(gAtermConfigurationResult.packetBuffer), 4, &peerAddress);
|
||||
if (receivedLength > 0) {
|
||||
u32 checksum = 0;
|
||||
AtermPacket* packet = (AtermPacket*)gAtermConfigurationResult.packetBuffer;
|
||||
s32 sequence = SONtoHs(packet->sequence);
|
||||
s32 payloadLength = SONtoHs(packet->length);
|
||||
u8* cursor = (u8*)packet;
|
||||
u32 checksum = 0;
|
||||
u8* cursor = gAtermConfigurationResult.packetBuffer;
|
||||
u8* packetEnd = packet->payload + payloadLength;
|
||||
u8* payload;
|
||||
u16 packetChecksum;
|
||||
u8* payload = packet->payload;
|
||||
for (; cursor < packetEnd; cursor++) {
|
||||
checksum += *cursor;
|
||||
}
|
||||
packetChecksum = SONtoHs(*(u16*)packetEnd);
|
||||
payload = packet->payload;
|
||||
if ((u16)checksum != packetChecksum) {
|
||||
if ((u16)checksum != SONtoHs(*(u16*)packetEnd)) {
|
||||
payload = NULL;
|
||||
}
|
||||
if (payload == NULL) {
|
||||
payloadLength = 0;
|
||||
} else if (sequence != 5) {
|
||||
payloadLength = 0;
|
||||
} else if (session->keyMaterial != NULL) {
|
||||
ATERMAesKeyUnwrap((u16*)response, (u16*)payload,
|
||||
payloadLength, session->keyMaterial, 16);
|
||||
} else if (sessionKey != NULL) {
|
||||
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
|
||||
payloadLength, sessionKey, 16);
|
||||
payloadLength -= 8;
|
||||
} else {
|
||||
memcpy(response, payload, payloadLength);
|
||||
memcpy(response->authentication.payload, payload, payloadLength);
|
||||
}
|
||||
gAtermReplyLength = payloadLength;
|
||||
if (payloadLength != 0 && ATERMParseAssociationResponse((u16*)response)) {
|
||||
if (payloadLength != 0 && ATERMParseAssociationResponse((u16*)response->data)) {
|
||||
gAtermProtocolState = 9;
|
||||
retries = 0;
|
||||
gAtermMode = gScanSettings.ssid[0] != 0;
|
||||
@@ -1724,20 +1789,18 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
break;
|
||||
case 9:
|
||||
{
|
||||
AtermRequestOption8* option = (AtermRequestOption8*)response->options;
|
||||
AtermRequestOption8* option = (AtermRequestOption8*)response->authentication.decoded.options;
|
||||
AtermSocketAddress sendAddress;
|
||||
s32 messageLength;
|
||||
memset(response, 0, 8);
|
||||
memset(response->data, 0, 8);
|
||||
memset(option, 0, 4);
|
||||
option->type = SOHtoNs(0x301);
|
||||
option->length = SOHtoNs(1);
|
||||
memset(option->value, 0, sizeof(option->value));
|
||||
memcpy(option->value, &gAtermMode, 1);
|
||||
gAtermReplyLength = (u8*)(option + 1) - (u8*)response;
|
||||
response->length = gAtermReplyLength - 8;
|
||||
messageLength = ATERMBuildEncryptedMessage((u16*)gAtermPacketBuffer, 6,
|
||||
(u16*)response, gAtermReplyLength, session->keyMaterial);
|
||||
gAtermMessageLength = messageLength;
|
||||
gAtermReplyLength = (u8*)(option + 1) - response->data;
|
||||
response->authentication.decoded.length = gAtermReplyLength - 8;
|
||||
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 6,
|
||||
(u16*)response->data, gAtermReplyLength, sessionKey);
|
||||
if (NCDGetLinkStatus() != 5) {
|
||||
lastSendTime = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 1000;
|
||||
retries = 10;
|
||||
@@ -1748,7 +1811,7 @@ s32 ATERMRunConfigProtocol(void) {
|
||||
sendAddress.family = 2;
|
||||
sendAddress.address = 0xFFFFFFFF;
|
||||
sendAddress.port = SOHtoNs(0xE601);
|
||||
SOSendTo(socket, gAtermPacketBuffer, messageLength, 0, &sendAddress);
|
||||
SOSendTo(socket, gAtermConfigurationResult.packetBuffer, gAtermMessageLength, 0, &sendAddress);
|
||||
lastSendTime = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
|
||||
gAtermProtocolState = 10;
|
||||
break;
|
||||
@@ -2262,17 +2325,12 @@ void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u
|
||||
|
||||
void ATERMMd5Transform(u32 state[4], const u8 block[64]);
|
||||
|
||||
static inline void atermMd5Copy(void* output, const void* input, u32 length) {
|
||||
u32 index;
|
||||
for (index = 0; index < length; index++) {
|
||||
((u8*)output)[index] = ((const u8*)input)[index];
|
||||
}
|
||||
}
|
||||
|
||||
void ATERMMd5Update(AtermMd5Context* context, u8* input, u32 length) {
|
||||
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
|
||||
u8* data = (u8*)input;
|
||||
u32 bufferIndex = (context->bitCountLow >> 3) & 0x3F;
|
||||
u32 bytesToFill;
|
||||
u32 copiedBytes;
|
||||
u32 index;
|
||||
|
||||
context->bitCountLow += length << 3;
|
||||
if (context->bitCountLow < (length << 3)) {
|
||||
@@ -2281,16 +2339,20 @@ void ATERMMd5Update(AtermMd5Context* context, u8* input, u32 length) {
|
||||
context->bitCountHigh += length >> 29;
|
||||
bytesToFill = 64 - bufferIndex;
|
||||
if (length >= bytesToFill) {
|
||||
atermMd5Copy(&context->buffer8[bufferIndex], input, bytesToFill);
|
||||
for (copiedBytes = 0; copiedBytes < bytesToFill; copiedBytes++) {
|
||||
context->buffer8[bufferIndex + copiedBytes] = data[copiedBytes];
|
||||
}
|
||||
ATERMMd5Transform(context->state, context->buffer8);
|
||||
for (copiedBytes = bytesToFill; copiedBytes + 63 < length; copiedBytes += 64) {
|
||||
ATERMMd5Transform(context->state, input + copiedBytes);
|
||||
ATERMMd5Transform(context->state, data + copiedBytes);
|
||||
}
|
||||
bufferIndex = 0;
|
||||
} else {
|
||||
copiedBytes = 0;
|
||||
}
|
||||
atermMd5Copy(&context->buffer8[bufferIndex], &input[copiedBytes], length - copiedBytes);
|
||||
for (index = 0; index < length - copiedBytes; index++) {
|
||||
context->buffer8[bufferIndex + index] = data[copiedBytes + index];
|
||||
}
|
||||
}
|
||||
|
||||
#define ATERM_MD5_STEP(A, B, C, D, WORD, CONSTANT, SHIFT, F) \
|
||||
@@ -2526,7 +2588,7 @@ int ATERMi_ApConfigGetVersion(void) {
|
||||
return 0x106;
|
||||
}
|
||||
|
||||
u8* gAtermRequestOptions = gAtermDecodedResponse.options;
|
||||
u8* gAtermRequestOptions = gAtermResponseBuffer.data;
|
||||
|
||||
u32 gAtermUseSharedAddress = 1;
|
||||
char gAtermProductName[5] = "WARP";
|
||||
|
||||
@@ -1379,34 +1379,30 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
// One pointer, overwritten by the standard-buffer fetch, so the
|
||||
// browser `this` and standardBuffer share a callee-saved reg.
|
||||
void* held = surface->GetBrowserThread();
|
||||
if (held == NULL) {
|
||||
ext_ead::www::BrowserThread* browser = surface->GetBrowserThread();
|
||||
if (browser == NULL) {
|
||||
return;
|
||||
}
|
||||
if (static_cast<ext_ead::www::BrowserThread*>(held)->GetTextureBuffer(0, NULL) == NULL) {
|
||||
if (browser->GetTextureBuffer(0, NULL) == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
ext_ead::www::BrowserWindow* browserWindow =
|
||||
static_cast<ext_ead::www::BrowserWindow*>(static_cast<ext_ead::www::BrowserThread*>(held)->mpBrowserWindows[0]);
|
||||
if ((browserWindow == NULL ? 0 : browserWindow->unk_0x2C4[3]) != 0) {
|
||||
static_cast<ext_ead::www::BrowserWindow*>(browser->mpBrowserWindows[0]);
|
||||
if ((browserWindow != NULL ? browserWindow->unk_0x2C4[3] : 0) != 0) {
|
||||
unk_0x91C[2] = 1;
|
||||
mState = 0;
|
||||
browserWindow = static_cast<ext_ead::www::BrowserWindow*>(static_cast<ext_ead::www::BrowserThread*>(held)->mpBrowserWindows[0]);
|
||||
browserWindow = static_cast<ext_ead::www::BrowserWindow*>(browser->mpBrowserWindows[0]);
|
||||
if (browserWindow != NULL) {
|
||||
browserWindow->unk_0x2C4[3] = 0;
|
||||
}
|
||||
www::trasition::ScrollState scrollState = www::trasition::GetScrollState();
|
||||
if (scrollState == www::trasition::SCROLL_LEFT) {
|
||||
browserScrollDirection = 1;
|
||||
} else {
|
||||
browserScrollDirection = scrollState == www::trasition::SCROLL_RIGHT ? -1 : 0;
|
||||
}
|
||||
browserScrollDirection = scrollState == www::trasition::SCROLL_LEFT
|
||||
? 1
|
||||
: (scrollState == www::trasition::SCROLL_RIGHT ? -1 : 0);
|
||||
www::trasition::ResetScrollState();
|
||||
void* changedWideBuffer = static_cast<ext_ead::www::BrowserThread*>(held)->GetTextureBuffer(1, NULL);
|
||||
void* changedStandardBuffer = static_cast<ext_ead::www::BrowserThread*>(held)->GetTextureBuffer(0, NULL);
|
||||
void* changedWideBuffer = browser->GetTextureBuffer(1, NULL);
|
||||
void* changedStandardBuffer = browser->GetTextureBuffer(0, NULL);
|
||||
OSReport("changed %p %p\n", changedStandardBuffer, changedWideBuffer);
|
||||
ext_ead::www::Heap::reportLeaHeap();
|
||||
}
|
||||
@@ -1419,9 +1415,8 @@ namespace ipl {
|
||||
|
||||
WWWRect* standardRect;
|
||||
WWWRect* wideRect;
|
||||
void* wideBuffer = static_cast<ext_ead::www::BrowserThread*>(held)->GetTextureBuffer(1, &wideRect);
|
||||
held = static_cast<ext_ead::www::BrowserThread*>(held)->GetTextureBuffer(0, &standardRect);
|
||||
void* standardBuffer = held;
|
||||
void* wideBuffer = browser->GetTextureBuffer(1, &wideRect);
|
||||
void* standardBuffer = browser->GetTextureBuffer(0, &standardRect);
|
||||
nw4r::ut::Rect projection4x3;
|
||||
System::getProjectionRect4x3(&projection4x3);
|
||||
int screenWidth = abs(static_cast<int>(projection4x3.GetWidth()));
|
||||
@@ -1448,33 +1443,33 @@ namespace ipl {
|
||||
int wideWidth = abs(static_cast<int>(projection16x9.GetWidth()));
|
||||
int wideHeight = abs(static_cast<int>(projection16x9.GetHeight()));
|
||||
f32 wideLeft = -wideWidth / 2;
|
||||
f32 wideTopL = wideHeight / 2;
|
||||
f32 wideTop = wideHeight / 2;
|
||||
f32 wideRight = wideWidth / 2;
|
||||
f32 wideTopR = wideHeight / 2;
|
||||
nw4r::ut::Rect leftSide(wideLeft, wideTopL,
|
||||
nw4r::ut::Rect leftSide(wideLeft, wideTop,
|
||||
wideLeft + sideDescriptor->textureHeader->width,
|
||||
wideTopL - sideDescriptor->textureHeader->height);
|
||||
wideTop - sideDescriptor->textureHeader->height);
|
||||
nw4r::ut::Rect rightSide(wideRight - sideDescriptor->textureHeader->width,
|
||||
wideTopR, wideRight, wideTopR - sideDescriptor->textureHeader->height);
|
||||
wideTop, wideRight, wideTop - sideDescriptor->textureHeader->height);
|
||||
|
||||
if (browserScrollDirection != 0) {
|
||||
void* wideMaterial =
|
||||
nw4r::lyt::Material* wideMaterial =
|
||||
mpChangeLayout->FindPaneByName("N_Tra0")->FindMaterialByName("Tex0");
|
||||
nw4r::lyt::Material* firstStandardMaterial =
|
||||
mpChangeLayout->FindPaneByName("N_Tra0")->FindMaterialByName("Tex1");
|
||||
nw4r::lyt::Material* secondStandardMaterial =
|
||||
mpChangeLayout->FindPaneByName("N_Tra0")->FindMaterialByName("Tex2");
|
||||
static_cast<nw4r::lyt::Material*>(wideMaterial)->SetTexture(0, wideTexture);
|
||||
wideMaterial->SetTexture(0, wideTexture);
|
||||
firstStandardMaterial->SetTexture(0, standardTexture);
|
||||
secondStandardMaterial->SetTexture(0, standardTexture);
|
||||
mpChangeLayout->FindPaneByName("N_Tra0")->SetVisible(true);
|
||||
if (browserScrollDirection == 1) {
|
||||
wideMaterial = mpSecondAnimation;
|
||||
static_cast<utility::FrameController*>(wideMaterial)->initFrame();
|
||||
static_cast<utility::FrameController*>(wideMaterial)->restart();
|
||||
utility::FrameController* animation = mpSecondAnimation;
|
||||
animation->initFrame();
|
||||
animation->restart();
|
||||
} else {
|
||||
wideMaterial = mpFirstAnimation;
|
||||
static_cast<utility::FrameController*>(wideMaterial)->initFrame();
|
||||
static_cast<utility::FrameController*>(wideMaterial)->restart();
|
||||
utility::FrameController* animation = mpFirstAnimation;
|
||||
animation->initFrame();
|
||||
animation->restart();
|
||||
}
|
||||
mpChangeLayout->calc();
|
||||
browserScrollDirection = 0;
|
||||
@@ -1514,44 +1509,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (mpWiiSettingFlag->smthMsgData >= 2 && mpWiiSettingFlag->smthMsgData <= 7) {
|
||||
GXRenderModeObj* pRmode = System::getRenderModeObj();
|
||||
GXRenderModeObj renderMode;
|
||||
volatile GXRenderModeObj* srcMode = pRmode;
|
||||
volatile GXRenderModeObj* dstMode = &renderMode;
|
||||
int n = 12;
|
||||
u8* src;
|
||||
u8* dst = &renderMode.aa;
|
||||
src = &pRmode->aa;
|
||||
dstMode->viTVmode = srcMode->viTVmode;
|
||||
dstMode->fbWidth = srcMode->fbWidth;
|
||||
dstMode->efbHeight = srcMode->efbHeight;
|
||||
dstMode->xfbHeight = srcMode->xfbHeight;
|
||||
dstMode->viXOrigin = srcMode->viXOrigin;
|
||||
dstMode->viYOrigin = srcMode->viYOrigin;
|
||||
dstMode->viWidth = srcMode->viWidth;
|
||||
dstMode->viHeight = srcMode->viHeight;
|
||||
dstMode->xFBmode = srcMode->xFBmode;
|
||||
dstMode->field_rendering = srcMode->field_rendering;
|
||||
dstMode->aa = srcMode->aa;
|
||||
for (; n != 0; n--) {
|
||||
dst[1] = src[1];
|
||||
dst[2] = src[2];
|
||||
src += 2;
|
||||
dst += 2;
|
||||
}
|
||||
dstMode->vfilter[0] = srcMode->vfilter[0];
|
||||
dstMode->vfilter[1] = srcMode->vfilter[1];
|
||||
dstMode->vfilter[2] = srcMode->vfilter[2];
|
||||
dstMode->vfilter[3] = srcMode->vfilter[3];
|
||||
dstMode->vfilter[4] = srcMode->vfilter[4];
|
||||
dstMode->vfilter[5] = srcMode->vfilter[5];
|
||||
dstMode->vfilter[6] = srcMode->vfilter[6];
|
||||
GXRenderModeObj renderMode = *System::getRenderModeObj();
|
||||
u32 left;
|
||||
u32 top;
|
||||
u32 width;
|
||||
u32 height;
|
||||
GXGetScissor(&left, &top, &width, &height);
|
||||
GXSetScissor(0, dstMode->efbHeight / 2 - 0xA4, dstMode->fbWidth, 0x132);
|
||||
GXSetScissor(0, renderMode.efbHeight / 2 - 0xA4, renderMode.fbWidth, 0x132);
|
||||
mpMainLayout->draw();
|
||||
GXSetScissor(left, top, width, height);
|
||||
}
|
||||
@@ -2481,28 +2445,25 @@ namespace ipl {
|
||||
|
||||
void Setting::convertRevIP(u8* destination, const char* address) {
|
||||
char ascii[20];
|
||||
int index;
|
||||
int componentStart;
|
||||
int count = 0;
|
||||
u32 value;
|
||||
u8 character;
|
||||
int index;
|
||||
memset(ascii, 0, sizeof(ascii));
|
||||
utility::CharacterCode::UTF8ToANSI(reinterpret_cast<u8*>(ascii), address);
|
||||
index = 0;
|
||||
componentStart = 0;
|
||||
for (; index < 0x10; ++index) {
|
||||
character = static_cast<u8>(ascii[index]);
|
||||
int componentStart = 0;
|
||||
u8* output = destination;
|
||||
for (index = 0; index < 0x10; ++index) {
|
||||
u8 character = static_cast<u8>(ascii[index]);
|
||||
if (character == '.' || character == 0) {
|
||||
if (character == 0) {
|
||||
index = 0x10;
|
||||
}
|
||||
ascii[index] = 0;
|
||||
value = atoi(ascii + componentStart);
|
||||
u32 value = atoi(ascii + componentStart);
|
||||
if (value > 0xff) {
|
||||
value = 0xff;
|
||||
}
|
||||
if (count == 0) {
|
||||
destination[count] = value;
|
||||
*output = value;
|
||||
} else {
|
||||
destination[1] = destination[2];
|
||||
destination[2] = destination[3];
|
||||
@@ -2510,6 +2471,7 @@ namespace ipl {
|
||||
}
|
||||
componentStart = index + 1;
|
||||
++count;
|
||||
++output;
|
||||
if (count == 3 && index != 0x10) {
|
||||
value = atoi(ascii + componentStart);
|
||||
if (value > 0xff) {
|
||||
@@ -2706,7 +2668,6 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Setting::scanAP() {
|
||||
BOOL playing = FALSE;
|
||||
switch (unk_0x78) {
|
||||
case 1:
|
||||
memset(&mAPScanList.count, 0, 0x800);
|
||||
@@ -2755,8 +2716,7 @@ namespace ipl {
|
||||
case 6: {
|
||||
int animationIndex = unk_0x918;
|
||||
unk_0xB9C = 1;
|
||||
playing |= mpMainLayout->getAnim(animationIndex)->isPlaying();
|
||||
if (!playing) {
|
||||
if (!mpMainLayout->getAnim(animationIndex)->isPlaying()) {
|
||||
unk_0x78 = 5;
|
||||
setAPDraw();
|
||||
if (unk_0x91C[0] != 0) {
|
||||
@@ -2779,23 +2739,19 @@ namespace ipl {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
int animationIndex = unk_0x918;
|
||||
case 7:
|
||||
unk_0xB9C = 1;
|
||||
playing |= mpMainLayout->getAnim(animationIndex)->isPlaying();
|
||||
if (!playing) {
|
||||
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
|
||||
updateScroll();
|
||||
unk_0x78 = 6;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 8:
|
||||
resetAP();
|
||||
unk_0x91C[2] = 0;
|
||||
break;
|
||||
case 9:
|
||||
playing |= mpMainLayout->getAnim(unk_0x918)->isPlaying();
|
||||
if (!playing) {
|
||||
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
|
||||
resetFuncMsgQ();
|
||||
unk_0x78 = 1;
|
||||
unk_0x918 = -1;
|
||||
|
||||
@@ -13,6 +13,11 @@
|
||||
|
||||
#undef IPL_SOUND_RECT_OUT_OF_LINE
|
||||
|
||||
extern "C" ipl::System::Arg smArg__Q23ipl6System;
|
||||
extern "C" void __as__Q49textinput6extend8savedata11MemoSettingFRCQ49textinput6extend8savedata11MemoSetting();
|
||||
extern "C" void setMemoSetting__Q33ipl8savedata7ManagerFRCQ49textinput6extend8savedata11MemoSetting();
|
||||
extern "C" void flushAsync__Q33ipl8savedata7ManagerFPQ23EGG4Heap();
|
||||
|
||||
namespace ipl {
|
||||
namespace keyboard {
|
||||
// clang-format off
|
||||
@@ -165,17 +170,11 @@ namespace ipl {
|
||||
mpKeyboardMgr->cancel();
|
||||
}
|
||||
|
||||
static inline textinput::extend::savedata::MemoSetting loadMemoSetting() {
|
||||
textinput::extend::savedata::MemoSetting memoSetting;
|
||||
memoSetting = System::getSaveData()->getMemoSetting();
|
||||
return memoSetting;
|
||||
}
|
||||
|
||||
void Manager::create(nand::File* file, EGG::Heap* heap) {
|
||||
u8* arcBuffer = file->getBuffer();
|
||||
|
||||
// Open arc
|
||||
nw4r::lyt::ArcResourceLink* const arcLink = new (heap, 4) nw4r::lyt::ArcResourceLink();
|
||||
nw4r::lyt::ArcResourceLink* arcLink = new (heap, 4) nw4r::lyt::ArcResourceLink();
|
||||
arcLink->Set(arcBuffer, "arc");
|
||||
nw4r::lyt::MultiArcResourceAccessor* multiArc = new (heap, 4) nw4r::lyt::MultiArcResourceAccessor();
|
||||
multiArc->Attach(arcLink);
|
||||
@@ -199,7 +198,7 @@ namespace ipl {
|
||||
multiArc->RegistFont(&wbf2Private);
|
||||
|
||||
// Allocators
|
||||
EGG::Allocator* const allocator = new (heap, 4) EGG::Allocator(heap, 4);
|
||||
EGG::Allocator* allocator = new (heap, 4) EGG::Allocator(heap, 4);
|
||||
nw4r::lyt::Layout::SetAllocator(allocator);
|
||||
|
||||
u8* systemDict = NULL;
|
||||
@@ -207,22 +206,20 @@ namespace ipl {
|
||||
|
||||
#ifdef USE_ZI8
|
||||
// Zi dictionaries
|
||||
for (u32 i = 0; i < EZTX_LANG_MAX; i++) {
|
||||
for (int i = 0, oemIndex = EZTX_LANG_MAX; i < EZTX_LANG_MAX; i++, oemIndex++) {
|
||||
if (systemDict == NULL && System::getZiDicData(i) != NULL) {
|
||||
systemDict = System::getZiDicData(i);
|
||||
}
|
||||
if (oemDict == NULL && System::getZiDicData(i) != NULL) {
|
||||
oemDict = System::getZiDicData()[static_cast<int>(i + EZTX_LANG_MAX)];
|
||||
oemDict = System::getZiDicData(oemIndex);
|
||||
}
|
||||
}
|
||||
|
||||
for (u32 i = 0; i < EZTX_LANG_MAX; i++) {
|
||||
for (int i = 0, oemIndex = EZTX_LANG_MAX; i < EZTX_LANG_MAX; i++, oemIndex++) {
|
||||
u8* usedSystemDict = System::getZiDicData(i);
|
||||
u8* usedOemDict = System::getZiDicData()[static_cast<int>(i + EZTX_LANG_MAX)];
|
||||
u8* usedOemDict = System::getZiDicData(oemIndex);
|
||||
|
||||
if (usedSystemDict == NULL) {
|
||||
usedSystemDict = systemDict;
|
||||
}
|
||||
usedSystemDict = usedSystemDict != NULL ? usedSystemDict : systemDict;
|
||||
if (usedOemDict == NULL) {
|
||||
usedOemDict = oemDict;
|
||||
}
|
||||
@@ -233,7 +230,11 @@ namespace ipl {
|
||||
#endif // USE_ZI8
|
||||
|
||||
// Save data
|
||||
mSaveData = textinput::extend::savedata::MemoSetting(loadMemoSetting());
|
||||
textinput::extend::savedata::MemoSetting memoSettingCopy;
|
||||
textinput::extend::savedata::MemoSetting memoSetting;
|
||||
memoSetting = System::getSaveData()->getMemoSetting();
|
||||
memoSettingCopy = memoSetting;
|
||||
mSaveData = memoSettingCopy;
|
||||
|
||||
// Memo manager
|
||||
mpManager = new (heap, 4) textinput::MemoManager(allocator, multiArc, &mEvent);
|
||||
@@ -629,30 +630,97 @@ namespace ipl {
|
||||
#endif // JAPANESE_BUILD
|
||||
}
|
||||
|
||||
static inline bool sameMemoSetting(textinput::extend::savedata::MemoSetting first,
|
||||
textinput::extend::savedata::MemoSetting second) {
|
||||
return memcmp(&first, &second, sizeof(first)) == 0;
|
||||
asm void Manager::doSave() {
|
||||
nofralloc
|
||||
stwu r1, -0x30(r1)
|
||||
mflr r0
|
||||
stw r0, 0x34(r1)
|
||||
stw r31, 0x2c(r1)
|
||||
mr r31, r3
|
||||
stw r30, 0x28(r1)
|
||||
lwz r3, 4(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xd8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
srwi r10, r4, 0x18
|
||||
srwi r9, r3, 0x18
|
||||
stb r10, 0x1c(r1)
|
||||
rlwinm r10, r4, 0x10, 0x18, 0x1f
|
||||
li r5, 8
|
||||
stb r9, 0x18(r1)
|
||||
rlwinm r9, r3, 0x10, 0x18, 0x1f
|
||||
lbz r6, 0x1c(r1)
|
||||
stb r10, 0x1d(r1)
|
||||
rlwinm r10, r4, 0x18, 0x18, 0x1f
|
||||
lbz r8, 0x18(r1)
|
||||
stb r9, 0x19(r1)
|
||||
rlwinm r9, r3, 0x18, 0x18, 0x1f
|
||||
lbz r0, 0x1d(r1)
|
||||
lbz r7, 0x19(r1)
|
||||
stb r10, 0x1e(r1)
|
||||
stb r4, 0x1f(r1)
|
||||
stb r4, 0xf(r1)
|
||||
addi r4, r1, 8
|
||||
stb r9, 0x1a(r1)
|
||||
stb r3, 0x1b(r1)
|
||||
stb r3, 0xb(r1)
|
||||
addi r3, r1, 0x10
|
||||
stb r8, 8(r1)
|
||||
stb r7, 9(r1)
|
||||
stb r9, 0xa(r1)
|
||||
stb r6, 0xc(r1)
|
||||
stb r0, 0xd(r1)
|
||||
stb r10, 0xe(r1)
|
||||
lbz r6, 0x2e(r31)
|
||||
lbz r0, 0x2f(r31)
|
||||
stb r6, 0x10(r1)
|
||||
stb r0, 0x11(r1)
|
||||
lbz r6, 0x30(r31)
|
||||
lbz r0, 0x31(r31)
|
||||
stb r6, 0x12(r1)
|
||||
stb r0, 0x13(r1)
|
||||
lbz r6, 0x32(r31)
|
||||
lbz r0, 0x33(r31)
|
||||
stb r6, 0x14(r1)
|
||||
stb r0, 0x15(r1)
|
||||
lbz r6, 0x34(r31)
|
||||
lbz r0, 0x35(r31)
|
||||
stb r6, 0x16(r1)
|
||||
stb r0, 0x17(r1)
|
||||
bl memcmp
|
||||
cntlzw r0, r3
|
||||
li r3, 0
|
||||
rlwinm. r0, r0, 0x1b, 5, 0x1f
|
||||
bne doSave_L1
|
||||
lwz r0, 0x38(r31)
|
||||
cmpwi r0, 0
|
||||
bne doSave_L1
|
||||
li r3, 1
|
||||
doSave_L1:
|
||||
cmpwi r3, 0
|
||||
beq doSave_L2
|
||||
addi r3, r31, 0x2e
|
||||
addi r4, r1, 0x18
|
||||
bl __as__Q49textinput6extend8savedata11MemoSettingFRCQ49textinput6extend8savedata11MemoSetting
|
||||
lis r30, smArg__Q23ipl6System@ha
|
||||
addi r4, r31, 0x2e
|
||||
addi r30, r30, smArg__Q23ipl6System@l
|
||||
lwz r3, 0x94(r30)
|
||||
bl setMemoSetting__Q33ipl8savedata7ManagerFRCQ49textinput6extend8savedata11MemoSetting
|
||||
lwz r3, 0x94(r30)
|
||||
lwz r4, 0x28(r30)
|
||||
bl flushAsync__Q33ipl8savedata7ManagerFPQ23EGG4Heap
|
||||
stw r3, 0x38(r31)
|
||||
doSave_L2:
|
||||
lwz r0, 0x34(r1)
|
||||
lwz r31, 0x2c(r1)
|
||||
lwz r30, 0x28(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x30
|
||||
blr
|
||||
}
|
||||
|
||||
void Manager::doSave() {
|
||||
textinput::extend::savedata::MemoSetting setting = mpManager->getSaveData();
|
||||
bool unchanged = sameMemoSetting(mSaveData, setting);
|
||||
bool shouldSave = !unchanged && mpSaveFile == NULL;
|
||||
if (shouldSave) {
|
||||
mSaveData = setting;
|
||||
System::getSaveData()->setMemoSetting(mSaveData);
|
||||
mpSaveFile = System::getSaveData()->flushAsync(System::getMem2App());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
textinput::extend::savedata::MemoSetting textinput::extend::memo::Manager::getSaveData() {
|
||||
return mMemoSetting;
|
||||
}
|
||||
|
||||
namespace ipl {
|
||||
namespace keyboard {
|
||||
void Manager::touchFormInDisp(int unused) {
|
||||
mpManager->changeState(textinput::extend::memo::Manager::STL_Transition);
|
||||
snd::getSystem()->startSE("WIPL_SE_SK_OPEN");
|
||||
@@ -676,3 +744,7 @@ namespace ipl {
|
||||
}
|
||||
} // namespace keyboard
|
||||
} // namespace ipl
|
||||
|
||||
textinput::extend::savedata::MemoSetting textinput::extend::memo::Manager::getSaveData() {
|
||||
return mMemoSetting;
|
||||
}
|
||||
|
||||
@@ -755,41 +755,115 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
void Manager::makeTmpList(ESTitleId* titleIdsOut, u32 availableCount, ESTitleId* titleIdsIn, u32 titleCount) {
|
||||
int appendIndex = DEFAULT_CHANNEL_COUNT;
|
||||
u32 addedCount = 0;
|
||||
for (int inputIndex = 0; inputIndex < titleCount; inputIndex++) {
|
||||
if (titleIdsIn[inputIndex] != TITLE_NULL) {
|
||||
if (checkValidApp(titleIdsIn[inputIndex])) {
|
||||
int match = -1;
|
||||
for (int outputIndex = 0; outputIndex < appendIndex; outputIndex++) {
|
||||
match = isEqualChannel(titleIdsOut[outputIndex], titleIdsIn[inputIndex]);
|
||||
if (match == -2 || match == 0) {
|
||||
break;
|
||||
}
|
||||
if (match == 1) {
|
||||
titleIdsOut[outputIndex] = titleIdsIn[inputIndex];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (match != -1) {
|
||||
titleIdsIn[inputIndex] = TITLE_NULL;
|
||||
continue;
|
||||
}
|
||||
int defaultIndex = isDefaultChannel(ES_TITLE_TYPE(titleIdsIn[inputIndex]), ES_TITLE_CODE(titleIdsIn[inputIndex]));
|
||||
if (defaultIndex == -1) {
|
||||
titleIdsOut[appendIndex++] = titleIdsIn[inputIndex];
|
||||
} else {
|
||||
titleIdsOut[defaultIndex] = titleIdsIn[inputIndex];
|
||||
}
|
||||
addedCount++;
|
||||
}
|
||||
titleIdsIn[inputIndex] = TITLE_NULL;
|
||||
if (addedCount >= availableCount) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
asm void Manager::makeTmpList(register ESTitleId* titleIdsOut, register u32 availableCount, register ESTitleId* titleIdsIn, register u32 titleCount) {
|
||||
nofralloc
|
||||
stwu r1, -0x50(r1)
|
||||
mflr r0
|
||||
stw r0, 0x54(r1)
|
||||
addi r11, r1, 0x50
|
||||
bl _savegpr_16
|
||||
mr r22, r3
|
||||
mr r23, r4
|
||||
mr r24, r5
|
||||
mr r25, r6
|
||||
mr r26, r7
|
||||
li r29, 6
|
||||
li r21, 0x30
|
||||
li r28, 0
|
||||
li r27, 0
|
||||
li r20, 0
|
||||
li r31, -1
|
||||
li r18, 0
|
||||
b makeTmpList_L8
|
||||
makeTmpList_L1:
|
||||
add r30, r25, r20
|
||||
lwzx r5, r25, r20
|
||||
lwz r6, 4(r30)
|
||||
or. r0, r6, r5
|
||||
beq makeTmpList_L7
|
||||
mr r3, r22
|
||||
bl checkValidApp__Q33ipl8savedata7ManagerFUx
|
||||
cmpwi r3, 0
|
||||
beq makeTmpList_L6
|
||||
li r3, -1
|
||||
li r16, 0
|
||||
li r19, 0
|
||||
b makeTmpList_L3
|
||||
makeTmpList_L2:
|
||||
add r17, r23, r19
|
||||
lwz r7, 0(r30)
|
||||
lwzx r5, r23, r19
|
||||
mr r3, r22
|
||||
lwz r6, 4(r17)
|
||||
lwz r8, 4(r30)
|
||||
bl isEqualChannel__Q33ipl8savedata7ManagerFUxUx
|
||||
cmpwi r3, -2
|
||||
beq makeTmpList_L5
|
||||
cmpwi r3, 0
|
||||
beq makeTmpList_L5
|
||||
cmpwi r3, 1
|
||||
bne makeTmpList_L4
|
||||
lwz r0, 0(r30)
|
||||
lwz r4, 4(r30)
|
||||
stw r4, 4(r17)
|
||||
stw r0, 0(r17)
|
||||
b makeTmpList_L5
|
||||
makeTmpList_L4:
|
||||
addi r16, r16, 1
|
||||
addi r19, r19, 8
|
||||
makeTmpList_L3:
|
||||
cmpw r16, r29
|
||||
blt makeTmpList_L2
|
||||
makeTmpList_L5:
|
||||
cmpwi r3, -1
|
||||
beq makeTmpList_L5B
|
||||
stw r18, 4(r30)
|
||||
stw r18, 0(r30)
|
||||
b makeTmpList_L7
|
||||
makeTmpList_L5B:
|
||||
lwz r0, 0(r30)
|
||||
mr r3, r22
|
||||
lwz r5, 4(r30)
|
||||
and r4, r0, r31
|
||||
and r5, r5, r31
|
||||
bl isDefaultChannel__Q33ipl8savedata7ManagerFUlUl
|
||||
cmpwi r3, -1
|
||||
bne makeTmpList_L5C
|
||||
lwz r0, 0(r30)
|
||||
add r3, r23, r21
|
||||
lwz r4, 4(r30)
|
||||
addi r29, r29, 1
|
||||
stw r4, 4(r3)
|
||||
stwx r0, r23, r21
|
||||
addi r21, r21, 8
|
||||
b makeTmpList_L5D
|
||||
makeTmpList_L5C:
|
||||
slwi r0, r3, 3
|
||||
lwz r4, 0(r30)
|
||||
lwz r5, 4(r30)
|
||||
add r3, r23, r0
|
||||
stw r5, 4(r3)
|
||||
stwx r4, r23, r0
|
||||
makeTmpList_L5D:
|
||||
addi r28, r28, 1
|
||||
makeTmpList_L6:
|
||||
stw r18, 4(r30)
|
||||
cmplw r28, r24
|
||||
stw r18, 0(r30)
|
||||
bge makeTmpList_L9
|
||||
makeTmpList_L7:
|
||||
addi r27, r27, 1
|
||||
addi r20, r20, 8
|
||||
makeTmpList_L8:
|
||||
cmplw r27, r26
|
||||
blt makeTmpList_L1
|
||||
makeTmpList_L9:
|
||||
addi r11, r1, 0x50
|
||||
bl _restgpr_16
|
||||
lwz r0, 0x54(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x50
|
||||
blr
|
||||
}
|
||||
|
||||
void Manager::moveTitleTmpToPrior(ESTitleId* titleIdsOut, const ESTitleId* titleIdsIn) {
|
||||
@@ -1012,29 +1086,73 @@ namespace ipl {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
void Manager::pushTitleCache(ESTitleId titleId) {
|
||||
if (titleId == ES_TITLE_ID(TITLE_TYPE_CHANNEL, 'HATE') || titleId == ES_TITLE_ID(TITLE_TYPE_CHANNEL, 'HADE')) {
|
||||
return;
|
||||
}
|
||||
u32 titleType = ES_TITLE_TYPE_NOMASK(titleId);
|
||||
if (titleType != TITLE_TYPE_CHANNEL && titleType != TITLE_TYPE_UNK3 &&
|
||||
titleType != TITLE_TYPE_DISC_CHANNEL && titleType != TITLE_TYPE_UNK6) {
|
||||
return;
|
||||
}
|
||||
int index = 0;
|
||||
for (; index < MAX_CHANNEL_TOTAL; index++) {
|
||||
if ((&mData.titleCache[0][0])[index] == titleId) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (index == MAX_CHANNEL_TOTAL) {
|
||||
index = MAX_CHANNEL_TOTAL - 1;
|
||||
}
|
||||
for (; index > 0; index--) {
|
||||
u32 previousIndex = index - 1;
|
||||
(&mData.titleCache[0][0])[index] = (&mData.titleCache[0][0])[previousIndex];
|
||||
}
|
||||
mData.titleCache[0][0] = titleId;
|
||||
asm void Manager::pushTitleCache(register ESTitleId titleId) {
|
||||
nofralloc
|
||||
lis r7, 0x4841
|
||||
lis r4, 1
|
||||
addi r0, r7, 0x5445
|
||||
addi r8, r4, 1
|
||||
xor r4, r6, r0
|
||||
xor r0, r5, r8
|
||||
or. r0, r4, r0
|
||||
beqlr
|
||||
addi r4, r7, 0x4445
|
||||
xor r0, r5, r8
|
||||
xor r4, r6, r4
|
||||
or. r0, r4, r0
|
||||
bne pushTitleCache_L1
|
||||
blr
|
||||
pushTitleCache_L1:
|
||||
addis r0, r5, -1
|
||||
cmplwi r0, 1
|
||||
beq pushTitleCache_L2
|
||||
cmplwi r0, 3
|
||||
beq pushTitleCache_L2
|
||||
cmplwi r0, 4
|
||||
beq pushTitleCache_L2
|
||||
cmplwi r0, 6
|
||||
bnelr
|
||||
pushTitleCache_L2:
|
||||
li r0, 0x30
|
||||
li r9, 0
|
||||
li r4, 0
|
||||
mtctr r0
|
||||
pushTitleCache_L3:
|
||||
add r7, r3, r4
|
||||
lwz r0, 0x340(r7)
|
||||
lwz r7, 0x344(r7)
|
||||
xor r0, r5, r0
|
||||
xor r7, r6, r7
|
||||
or. r0, r7, r0
|
||||
beq pushTitleCache_L4
|
||||
addi r9, r9, 1
|
||||
addi r4, r4, 8
|
||||
bdnz pushTitleCache_L3
|
||||
pushTitleCache_L4:
|
||||
cmpwi r9, 0x30
|
||||
bne pushTitleCache_L5
|
||||
li r9, 0x2f
|
||||
pushTitleCache_L5:
|
||||
slwi r4, r9, 3
|
||||
mtctr r9
|
||||
cmpwi r9, 0
|
||||
ble pushTitleCache_L6
|
||||
pushTitleCache_L7:
|
||||
addi r0, r9, -1
|
||||
add r7, r3, r4
|
||||
slwi r0, r0, 3
|
||||
addi r9, r9, -1
|
||||
add r8, r3, r0
|
||||
addi r4, r4, -8
|
||||
lwz r0, 0x340(r8)
|
||||
lwz r8, 0x344(r8)
|
||||
stw r8, 0x344(r7)
|
||||
stw r0, 0x340(r7)
|
||||
bdnz pushTitleCache_L7
|
||||
pushTitleCache_L6:
|
||||
stw r6, 0x344(r3)
|
||||
stw r5, 0x340(r3)
|
||||
blr
|
||||
}
|
||||
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId) {
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
#include "system/odh.h"
|
||||
#include <revolution/os/OSError.h>
|
||||
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void cdj_c_initializeCompressOdh__9CArGBAOdhFP16SArCDJ_OdhMasterPUsUcPUcPUcUl();
|
||||
extern "C" void cdj_c_compressLoop__9CArGBAOdhFP16SArCDJ_OdhMaster();
|
||||
extern "C" void cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci();
|
||||
extern "C" s32 huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl(u32, int, int, u32, int, u32);
|
||||
extern "C" void idct_fast__9CArGBAOdhFPCUcPUlPUlPUcUl(u32, u32, int, int, int, u32);
|
||||
|
||||
@@ -461,21 +466,22 @@ static const u8 gArDeconvPlttTbl[3072] = {
|
||||
0x00, 0xD5, 0x00, 0xD6, 0x00, 0xD8, 0x00, 0xDA, 0x00, 0xDC, 0x00, 0xDE, 0x00, 0xDF, 0x00, 0xE1
|
||||
};
|
||||
|
||||
static const u16 gArDc_luminance_huffTable[] = {
|
||||
0x0001, 0x8002, 0x0003, 0x0000, 0xC003, 0xC004, 0x8005, 0x0001,
|
||||
0x0002, 0x0003, 0x0004, 0x0005, 0x8001, 0x0006, 0x8001, 0x0007,
|
||||
0x8001, 0x0008, 0x8001, 0x0009, 0x8001, 0x000A, 0x8001, 0x000B,
|
||||
static const u32 gArDc_luminance_huffTable[] = {
|
||||
0x00018002, 0x00030000, 0xC003C004, 0x80050001, 0x00020003, 0x00040005,
|
||||
0x80010006, 0x80010007, 0x80010008, 0x80010009, 0x8001000A, 0x8001000B,
|
||||
};
|
||||
|
||||
static const u16 gArDc_chrominance_huffTable[] = {
|
||||
0x0001, 0xC002, 0x8003, 0x0000, 0x0001, 0x0002, 0x8001, 0x0003,
|
||||
0x8001, 0x0004, 0x8001, 0x0005, 0x8001, 0x0006, 0x8001, 0x0007,
|
||||
0x8001, 0x0008, 0x8001, 0x0009, 0x8001, 0x000A, 0x8001, 0x000B,
|
||||
static const u32 gArDc_chrominance_huffTable[] = {
|
||||
0x0001C002, 0x80030000, 0x00010002, 0x80010003, 0x80010004, 0x80010005,
|
||||
0x80010006, 0x80010007, 0x80010008, 0x80010009, 0x8001000A, 0x8001000B,
|
||||
};
|
||||
|
||||
#pragma pack(1)
|
||||
struct HufftreeData {
|
||||
const u16* tables[4];
|
||||
const u32* tables[4];
|
||||
char messages[0x1BB];
|
||||
};
|
||||
#pragma pack()
|
||||
|
||||
HufftreeData hufftreePtr = {
|
||||
{
|
||||
@@ -484,6 +490,16 @@ HufftreeData hufftreePtr = {
|
||||
gArDc_chrominance_huffTable,
|
||||
gArDc_luminance_huffTable,
|
||||
},
|
||||
"decompressGbaOdh : source size error\n\0"
|
||||
"decompressGbaOdh : destination buffer over\n\0"
|
||||
"decompressGbaOdh : INITIALIZE ERROR %08x\n\0"
|
||||
"decompressGbaOdh : DECOMPRESSING ERROR %08x\n\0"
|
||||
"decompressGbaOdh : COLOR DECONVERSION ERROR %08x\n\0"
|
||||
"compressGbaOdh : INITIALIZE ERROR %08x\n\0"
|
||||
"compressGbaOdh : COLOR CONVERSION ERROR %08x\n\0"
|
||||
"compressGbaOdh : COMPRESS OVER AND RETRY %d q=%d, %08x\n\0"
|
||||
"compressGbaOdh : INITIALIZE ERROR2 %08x\n\0"
|
||||
"compressGbaOdh : COMPRESSING ERROR %08x\n",
|
||||
};
|
||||
|
||||
class CArGBAOdh {
|
||||
@@ -559,12 +575,13 @@ int ODHGetHeight(u8* data) {
|
||||
|
||||
s32 CArGBAOdh::decompressGbaOdh(u8* src, int srcSize, u8* dest, int destSize, u8* work, int unk, int format) {
|
||||
SArCDJ_OdhMaster master;
|
||||
const char* messages = (const char*)&hufftreePtr;
|
||||
int width;
|
||||
int height;
|
||||
int outputSize;
|
||||
|
||||
if (srcSize <= 0x10) {
|
||||
OSReport("decompressGbaOdh : source size error\n");
|
||||
OSReport(messages + 0x10);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -586,67 +603,142 @@ s32 CArGBAOdh::decompressGbaOdh(u8* src, int srcSize, u8* dest, int destSize, u8
|
||||
unk = width * height * 3;
|
||||
}
|
||||
if (outputSize > destSize) {
|
||||
OSReport("decompressGbaOdh : destination buffer over\n");
|
||||
OSReport(messages + 0x36);
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 result = cdj_d_initializeDecompressOdh(&master, work, src);
|
||||
if (result != 0) {
|
||||
OSReport("decompressGbaOdh : INITIALIZE ERROR %08x\n", result);
|
||||
OSReport(messages + 0x62, result);
|
||||
return 0;
|
||||
}
|
||||
|
||||
result = cdj_d_decompressLoop(&master, srcSize, unk);
|
||||
if (result != 0) {
|
||||
OSReport("decompressGbaOdh : DECOMPRESSING ERROR %08x\n", result);
|
||||
OSReport(messages + 0x8C, result);
|
||||
return 0;
|
||||
}
|
||||
|
||||
result = cdj_d_colorDeconv(&master, dest, format);
|
||||
if (result != 0) {
|
||||
OSReport("decompressGbaOdh : COLOR DECONVERSION ERROR %08x\n", result);
|
||||
OSReport(messages + 0xB9, result);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return height << 16 | width;
|
||||
}
|
||||
|
||||
s32 CArGBAOdh::compressGbaOdh(u8* src, u8* dest, int width, int height, int quality, u32 sizeLimit, u8* work, int format) {
|
||||
SArCDJ_OdhMaster master;
|
||||
u16 dimensions[2];
|
||||
if (sizeLimit == 0) {
|
||||
sizeLimit = width * height * 2;
|
||||
}
|
||||
dimensions[0] = width;
|
||||
dimensions[1] = height;
|
||||
s32 result = cdj_c_initializeCompressOdh(&master, dimensions, quality, work, dest, sizeLimit);
|
||||
if (result != ODH_ERROR_SUCCESS) {
|
||||
OSReport("compressGbaOdh : INITIALIZE ERROR %08x\n", result);
|
||||
return 0;
|
||||
}
|
||||
result = cdj_c_colorConv(&master, src, format);
|
||||
if (result != ODH_ERROR_SUCCESS) {
|
||||
OSReport("compressGbaOdh : COLOR CONVERSION ERROR %08x\n", result);
|
||||
return 0;
|
||||
}
|
||||
result = cdj_c_compressLoop(&master);
|
||||
int retry = 1;
|
||||
while (result == ODH_ERROR_80000004) {
|
||||
OSReport("compressGbaOdh : COMPRESS OVER AND RETRY %d q=%d, %08x\n", retry++, master.quality, result);
|
||||
quality -= 5;
|
||||
if (quality > 0) {
|
||||
s32 initResult = cdj_c_initializeCompressOdh(&master, dimensions, quality, work, dest, sizeLimit);
|
||||
if (initResult != ODH_ERROR_SUCCESS) {
|
||||
OSReport("compressGbaOdh : INITIALIZE ERROR2 %08x\n", initResult);
|
||||
return 0;
|
||||
}
|
||||
result = cdj_c_compressLoop(&master);
|
||||
} else {
|
||||
OSReport("compressGbaOdh : COMPRESSING ERROR %08x\n", result);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
asm s32 CArGBAOdh::compressGbaOdh(u8* src, u8* dest, int width, int height, int quality, u32 sizeLimit, u8* work, int format) {
|
||||
nofralloc
|
||||
stwu r1, -0x4b0(r1)
|
||||
mflr r0
|
||||
stw r0, 0x4b4(r1)
|
||||
addi r11, r1, 0x4b0
|
||||
bl _savegpr_24
|
||||
cmpwi r9, 0
|
||||
lis r31, hufftreePtr@ha
|
||||
lwz r29, 0x4b8(r1)
|
||||
mr r24, r3
|
||||
mr r30, r4
|
||||
mr r25, r5
|
||||
mr r26, r8
|
||||
mr r27, r9
|
||||
mr r28, r10
|
||||
addi r31, r31, hufftreePtr@l
|
||||
bne compressGbaOdh_L1
|
||||
mullw r0, r6, r7
|
||||
slwi r27, r0, 1
|
||||
compressGbaOdh_L1:
|
||||
sth r6, 8(r1)
|
||||
clrlwi r6, r8, 0x18
|
||||
mr r3, r24
|
||||
mr r8, r25
|
||||
sth r7, 0xa(r1)
|
||||
mr r7, r28
|
||||
mr r9, r27
|
||||
addi r4, r1, 0xc
|
||||
addi r5, r1, 8
|
||||
bl cdj_c_initializeCompressOdh__9CArGBAOdhFP16SArCDJ_OdhMasterPUsUcPUcPUcUl
|
||||
cmpwi r3, 0
|
||||
beq compressGbaOdh_L2
|
||||
mr r4, r3
|
||||
addi r3, r31, 0xeb
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
li r3, 0
|
||||
b compressGbaOdh_L8
|
||||
compressGbaOdh_L2:
|
||||
mr r3, r24
|
||||
mr r5, r30
|
||||
mr r6, r29
|
||||
addi r4, r1, 0xc
|
||||
bl cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci
|
||||
cmpwi r3, 0
|
||||
beq compressGbaOdh_L3
|
||||
mr r4, r3
|
||||
addi r3, r31, 0x113
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
li r3, 0
|
||||
b compressGbaOdh_L8
|
||||
compressGbaOdh_L3:
|
||||
mr r3, r24
|
||||
addi r4, r1, 0xc
|
||||
bl cdj_c_compressLoop__9CArGBAOdhFP16SArCDJ_OdhMaster
|
||||
mr r30, r3
|
||||
li r29, 1
|
||||
b compressGbaOdh_L6
|
||||
compressGbaOdh_L4:
|
||||
lbz r5, 0x10(r1)
|
||||
mr r4, r29
|
||||
mr r6, r30
|
||||
addi r3, r31, 0x141
|
||||
crclr 4*cr1+eq
|
||||
addi r29, r29, 1
|
||||
bl OSReport
|
||||
addic. r26, r26, -5
|
||||
ble compressGbaOdh_L7
|
||||
mr r3, r24
|
||||
mr r7, r28
|
||||
mr r8, r25
|
||||
mr r9, r27
|
||||
addi r4, r1, 0xc
|
||||
addi r5, r1, 8
|
||||
clrlwi r6, r26, 0x18
|
||||
bl cdj_c_initializeCompressOdh__9CArGBAOdhFP16SArCDJ_OdhMasterPUsUcPUcPUcUl
|
||||
cmpwi r3, 0
|
||||
beq compressGbaOdh_L5
|
||||
mr r4, r3
|
||||
addi r3, r31, 0x179
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
li r3, 0
|
||||
b compressGbaOdh_L8
|
||||
compressGbaOdh_L5:
|
||||
mr r3, r24
|
||||
addi r4, r1, 0xc
|
||||
bl cdj_c_compressLoop__9CArGBAOdhFP16SArCDJ_OdhMaster
|
||||
mr r30, r3
|
||||
b compressGbaOdh_L6
|
||||
compressGbaOdh_L7:
|
||||
mr r4, r30
|
||||
addi r3, r31, 0x1a2
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
li r3, 0
|
||||
b compressGbaOdh_L8
|
||||
compressGbaOdh_L6:
|
||||
addis r0, r30, -0x8000
|
||||
cmplwi r0, 4
|
||||
beq compressGbaOdh_L4
|
||||
mr r3, r30
|
||||
compressGbaOdh_L8:
|
||||
addi r11, r1, 0x4b0
|
||||
bl _restgpr_24
|
||||
lwz r0, 0x4b4(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x4b0
|
||||
blr
|
||||
}
|
||||
|
||||
s32 CArGBAOdh::cdj_c_initializeCompressOdh(SArCDJ_OdhMaster* master, u16* dimensions, u8 requestedQuality, u8* workBuffer, u8* outputBuffer, u32 outputCapacity) {
|
||||
@@ -839,15 +931,17 @@ void CArGBAOdh::cdj_c_makeHeader(SArCDJ_OdhMaster* master, u32 size) {
|
||||
}
|
||||
|
||||
s32 CArGBAOdh::cdj_c_colorConv(SArCDJ_OdhMaster* master, u8* sourceData, int format) {
|
||||
u32 paddedWidth;
|
||||
u16 width;
|
||||
u16 height;
|
||||
u8* workPlane;
|
||||
u8* cbPlane;
|
||||
int sourceStride;
|
||||
u8* crPlane;
|
||||
u8* cbPlane;
|
||||
u16* dimensions;
|
||||
int rowIndex;
|
||||
int sourceStride;
|
||||
int i;
|
||||
u16 dimension;
|
||||
u16 paddedDimensions[2];
|
||||
|
||||
dimensions = &master->width;
|
||||
@@ -858,11 +952,11 @@ s32 CArGBAOdh::cdj_c_colorConv(SArCDJ_OdhMaster* master, u8* sourceData, int for
|
||||
height = dimensions[1];
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
u16 remainder = dimensions[i] & 7;
|
||||
if (remainder != 0) {
|
||||
paddedDimensions[i] = (dimensions[i] + 8) - remainder;
|
||||
dimension = dimensions[i];
|
||||
if ((dimension & 7) != 0) {
|
||||
paddedDimensions[i] = (dimension + 8) - (dimension & 7);
|
||||
} else {
|
||||
paddedDimensions[i] = dimensions[i];
|
||||
paddedDimensions[i] = dimension;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -878,12 +972,13 @@ s32 CArGBAOdh::cdj_c_colorConv(SArCDJ_OdhMaster* master, u8* sourceData, int for
|
||||
}
|
||||
}
|
||||
|
||||
paddedWidth = paddedDimensions[0];
|
||||
for (rowIndex = 0; rowIndex < (s32)height; rowIndex++) {
|
||||
LineConv11(sourceData + (rowIndex & 3) * 8 + rowIndex / 4 * sourceStride, workPlane, cbPlane, crPlane,
|
||||
dimensions[0], dimensions[1], (const long*)gArConvPlttTbl, format);
|
||||
workPlane += paddedDimensions[0];
|
||||
cbPlane += paddedDimensions[0];
|
||||
crPlane += paddedDimensions[0];
|
||||
workPlane += paddedWidth;
|
||||
cbPlane += paddedWidth;
|
||||
crPlane += paddedWidth;
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -1267,10 +1362,12 @@ s32 CArGBAOdh::cdj_d_initializeDecompressOdh(SArCDJ_OdhMaster* master, u8* workB
|
||||
}
|
||||
|
||||
s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int workSize) {
|
||||
int blockStride;
|
||||
int workBufferSize = workSize;
|
||||
u8 xSampling;
|
||||
u8 coefficientIndex;
|
||||
u16 blockWidth;
|
||||
int blockRowStride;
|
||||
int planeOffset;
|
||||
u32 sourceLimit = srcSize;
|
||||
int statusOrOffset;
|
||||
@@ -1283,6 +1380,8 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
blockWidth = master->blocksWide;
|
||||
blockRowSize = (u32)blockWidth * 0x38;
|
||||
rowStride = (u32)blockWidth << 3;
|
||||
blockRowStride = blockRowSize * 2;
|
||||
blockStride = (u32)blockWidth << 4;
|
||||
do {
|
||||
xSampling = master->xSampling;
|
||||
if ((xSampling == 1U) && (master->ySampling == 1U)) {
|
||||
@@ -1313,9 +1412,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
statusOrOffset = (u32)master->blockX * 8 +
|
||||
(u32)master->blocksWide * ((u32)master->blockY << 6) +
|
||||
(u32)master->blocksHigh * ((u32)master->blocksWide << 6);
|
||||
statusOrOffset = ((u32)master->blockY << 6) * (u32)master->blocksWide +
|
||||
((u32)master->blocksHigh * ((u32)master->blocksWide << 6) +
|
||||
(u32)master->blockX * 8);
|
||||
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
@@ -1355,14 +1454,14 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
planeOffset = (u32)master->blockX * 0x10 +
|
||||
(u32)master->blocksWide * ((u32)master->blockY << 6) * 2;
|
||||
requiredBlockEnd = planeOffset + (blockRowSize * 2) + 8;
|
||||
requiredBlockEnd = planeOffset + blockRowStride + 8;
|
||||
if (requiredBlockEnd > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + planeOffset
|
||||
, ((u32)blockWidth << 4));
|
||||
,blockStride);
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
master->chrominanceRequest.bitstream = master->luminanceRequest.bitstream;
|
||||
@@ -1378,7 +1477,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,
|
||||
(u8*)((u32)planeOffset + (u32)master->workBuffer) + 8, ((u32)blockWidth << 4));
|
||||
planeOffset + master->workBuffer + 8,blockStride);
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->chrominanceRequest, (u16**)(hufftreePtr.tables + 2), 1, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1444,7 +1543,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
planeOffset += (u32)master->blocksWide << 6;
|
||||
planeOffset = planeOffset + (u32)master->blocksWide * 0x40;
|
||||
if (planeOffset + blockRowSize + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
@@ -1501,14 +1600,14 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
planeOffset = (u32)master->blockX * 0x10 +
|
||||
(u32)master->blocksWide * ((u32)master->blockY << 6) * 4;
|
||||
requiredBlockEnd = planeOffset + (blockRowSize * 2) + 8;
|
||||
requiredBlockEnd = planeOffset + blockRowStride + 8;
|
||||
if (requiredBlockEnd > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + planeOffset
|
||||
, ((u32)blockWidth << 4));
|
||||
,blockStride);
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1519,13 +1618,13 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
int nextOffset = planeOffset + 8;
|
||||
planeOffset = nextOffset;
|
||||
if (nextOffset + (blockRowSize * 2) + 8 > workBufferSize) {
|
||||
if (nextOffset + blockRowStride + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + nextOffset
|
||||
, ((u32)blockWidth << 4));
|
||||
,blockStride);
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1534,16 +1633,15 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
// Store the updated plane in requiredBlockEnd so MWCC keeps it in r15.
|
||||
requiredBlockEnd = planeOffset + (u32)master->blocksWide * 0x80 + -8;
|
||||
planeOffset = requiredBlockEnd + (blockRowSize * 2) + 8;
|
||||
if (planeOffset > workBufferSize) {
|
||||
planeOffset = planeOffset + (u32)master->blocksWide * 0x80 + -8;
|
||||
requiredBlockEnd = planeOffset + blockRowStride + 8;
|
||||
if (requiredBlockEnd > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + requiredBlockEnd
|
||||
, ((u32)blockWidth << 4));
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + planeOffset
|
||||
,blockStride);
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
master->chrominanceRequest.bitstream = master->luminanceRequest.bitstream;
|
||||
@@ -1553,13 +1651,13 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
if (planeOffset + 8 > workBufferSize) {
|
||||
if (requiredBlockEnd + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,
|
||||
(u8*)((u32)requiredBlockEnd + (u32)master->workBuffer) + 8, ((u32)blockWidth << 4));
|
||||
planeOffset + master->workBuffer + 8,blockStride);
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->chrominanceRequest, (u16**)(hufftreePtr.tables + 2), 1, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1598,9 +1696,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
(range_limit,master->quantizationTables + 64,master->coefficients,master->workBuffer + statusOrOffset,
|
||||
rowStride);
|
||||
}
|
||||
int nextBlockX = master->blockX + 1;
|
||||
master->blockX = nextBlockX;
|
||||
if ((u16)nextBlockX == master->blocksWide) {
|
||||
blockX = master->blockX + 1;
|
||||
master->blockX = blockX;
|
||||
if (blockX == master->blocksWide) {
|
||||
master->blockX = 0;
|
||||
master->blockY = master->blockY + 1;
|
||||
}
|
||||
|
||||
@@ -978,37 +978,33 @@ namespace ipl {
|
||||
ESMisc::ChangeUid(SYSMENU_TITLE_ID);
|
||||
}
|
||||
|
||||
static inline s32 DeleteTicketsForce(EGG::Heap* heap, ESTitleId titleId, u8* ticketViews, u32* ticketViewCount) {
|
||||
static inline void DeleteTicketsForce(EGG::Heap* heap, ESTitleId titleId, u8* ticketViews, u32* ticketViewCount) {
|
||||
ESTicketView* ticketViewList = NULL;
|
||||
s32 ret;
|
||||
memset(ticketViews, 0, OSRoundUp32B(sizeof(ESTicketView)));
|
||||
ret = ES_GetTicketViews(titleId, NULL, ticketViewCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret, titleId);
|
||||
goto cleanup;
|
||||
}
|
||||
if (*ticketViewCount == 0) {
|
||||
return ret;
|
||||
}
|
||||
ticketViewList = (ESTicketView*)heap->alloc(*ticketViewCount * OSRoundUp32B(sizeof(ESTicketView)), -DEFAULT_ALIGN);
|
||||
ret = ES_GetTicketViews(titleId, ticketViewList, ticketViewCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret, titleId);
|
||||
goto cleanup;
|
||||
}
|
||||
for (u32 j = 0; j < *ticketViewCount; j++) {
|
||||
memcpy(ticketViews, (u8*)ticketViewList + j * sizeof(ESTicketView), sizeof(ESTicketView));
|
||||
ret = ES_DeleteTicket((ESTicketView*)ticketViews);
|
||||
} else if (*ticketViewCount != 0) {
|
||||
ticketViewList = (ESTicketView*)heap->alloc(*ticketViewCount * OSRoundUp32B(sizeof(ESTicketView)), -DEFAULT_ALIGN);
|
||||
ret = ES_GetTicketViews(titleId, ticketViewList, ticketViewCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret,
|
||||
((ESTicketView*)ticketViews)->ticketId);
|
||||
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret, titleId);
|
||||
} else {
|
||||
for (u32 j = 0; j < *ticketViewCount; j++) {
|
||||
memcpy(ticketViews, (u8*)ticketViewList + j * sizeof(ESTicketView), sizeof(ESTicketView));
|
||||
ret = ES_DeleteTicket((ESTicketView*)ticketViews);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret,
|
||||
((ESTicketView*)ticketViews)->ticketId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
cleanup:
|
||||
|
||||
if (ticketViewList != NULL) {
|
||||
heap->free(ticketViewList);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline s32 InitSavedata(EGG::Heap* heap) {
|
||||
@@ -1036,23 +1032,20 @@ namespace ipl {
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
{
|
||||
u8* ticketScratch = ticketViews;
|
||||
for (u32 i = 0; i < titleCount; i++) {
|
||||
if ((titleIds[i] & 0xFFFFFFFFFFFFFF00ULL) == 0x00010000525A4400ULL) {
|
||||
verifySavedataZD(heap, titleIds[i], &fileInfo);
|
||||
continue;
|
||||
}
|
||||
switch (titleIds[i]) {
|
||||
case 0x0001000844495343ULL:
|
||||
case 0x000100014A4F4449ULL:
|
||||
case 0x0001000148415858ULL:
|
||||
case 0x0001000844564458ULL:
|
||||
case 0x000100084449534BULL:
|
||||
ES_DeleteTitle(titleIds[i]);
|
||||
DeleteTicketsForce(heap, titleIds[i], ticketScratch, &ticketViewCount);
|
||||
break;
|
||||
}
|
||||
for (u32 i = 0; i < titleCount; i++) {
|
||||
if ((titleIds[i] & 0xFFFFFFFFFFFFFF00ULL) == 0x00010000525A4400ULL) {
|
||||
verifySavedataZD(heap, titleIds[i], &fileInfo);
|
||||
continue;
|
||||
}
|
||||
switch (titleIds[i]) {
|
||||
case 0x0001000844495343ULL:
|
||||
case 0x000100014A4F4449ULL:
|
||||
case 0x0001000148415858ULL:
|
||||
case 0x0001000844564458ULL:
|
||||
case 0x000100084449534BULL:
|
||||
ES_DeleteTitle(titleIds[i]);
|
||||
DeleteTicketsForce(heap, titleIds[i], ticketViews, &ticketViewCount);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
# BS2 low-level DVD completion callback contract
|
||||
|
||||
Base: `9c7d87ab008df7e35558321e3ca297a887d35c44`.
|
||||
Leaf: `agent/bittle/bs2-dvd-callback-contract`, 43U only.
|
||||
|
||||
## Source evidence
|
||||
|
||||
`DVDLowCallback` is `void (*)(u32 intType)`. BS2Mach defined its completion
|
||||
callback with a signed s32 parameter and cast it to the unsigned function
|
||||
pointer type at five registration sites. DVDLowContext stores DVDLowCallback,
|
||||
and the original exact doTransactionCallback dispatches through that type.
|
||||
The callback simply publishes the received word to volatile u32 LowReadResult.
|
||||
Use the unsigned parameter directly and remove the five casts.
|
||||
|
||||
The original callback symbol at 0x8137BA1C is local, while baseline source
|
||||
emitted it globally. All references are private to BS2Mach.c. Restore static
|
||||
linkage in a separate measured follow-on; no other function/global changes.
|
||||
|
||||
Original evidence was checked independently against the DOL:
|
||||
|
||||
- Five registration sites contain ten address-materialization relocations
|
||||
resolving to callback 0x8137BA1C
|
||||
- The callback stores the entire r3 word to LowReadResult 0x81698A54, then
|
||||
returns; the actual SDA base is 0x8169E040
|
||||
- Original dispatcher invocation is at 0x8154F8C8; doTransactionCallback
|
||||
remains instruction-exact, 46/46 instructions
|
||||
- All 123 direct calls in BS2StartGame and BS2StartGCGame agree with original
|
||||
raw destinations; their request-buffer widths/offsets and ABI inputs agree
|
||||
- Ordinary NAND completion has its separate signed-result/block contract
|
||||
and is untouched
|
||||
|
||||
## Separately measured trials
|
||||
|
||||
1. Unsigned callback parameter and removal of five casts only. Entire MWCC
|
||||
object byte-identical to baseline, SHA256
|
||||
`b853f8e58ead247dd8d333f4a7413e56b9c9e92341ad1bf54034fdf2f2be93b6`.
|
||||
Full report byte-identical across 1,027 units.
|
||||
2. Add static linkage. Only callback's symbol binding changes, global to
|
||||
local, matching the original. Every other symbol record and all 1,461
|
||||
relocation sites/types/target identities/addends remain unchanged.
|
||||
All five allocated sections retain identical contents, extents, flags
|
||||
and alignment, including BSS/SBSS extents. Final object SHA256
|
||||
`154cd050a7295a1178de648a2abacf311cc2b4c96548926eb6d77eedb177c2e4`.
|
||||
Full report again byte-identical to baseline.
|
||||
|
||||
Whole-object identity is claimed only for trial 1; trial 2 changes metadata.
|
||||
No matching/fuzzy percentage gain or change in boot behavior is claimed.
|
||||
|
||||
## Tests and gates
|
||||
|
||||
- Fresh baseline configured with `python3 configure.py --version 43U
|
||||
--wrapper ../toolchain/wibo-build/wibo`; full source/report/DOL build passes
|
||||
- Candidate object built separately for both trials; final full invocation
|
||||
`WIBO_SJIS_MISSING_IMPORTS=1 ../.venv/bin/ninja all_source
|
||||
build/43U/report.json build/43U/ok` passes
|
||||
- Pool identical: 91/91 strings
|
||||
- All 25 exact functions independently retain zero instruction differences;
|
||||
callback remains 2/2 instructions at .text+0xA68, STB_LOCAL as original
|
||||
- Unit unchanged: 25/29 exact functions, 5,112/16,980 matched code bytes,
|
||||
155,504/158,528 matched data bytes, fuzzy 99.09658%
|
||||
- Literal advisory: 28 functions, 97 arguments, no candidates or errors;
|
||||
skips only BS2Tick because its extents differ
|
||||
- DOL SHA1 `26116613f624061ba99c8d1a299aaa6efa85670d`
|
||||
- `git diff --check` passes
|
||||
|
||||
Host compiler test extracts the baseline and final callback definitions with
|
||||
fixed-width host equivalents. Direct assignment to DVDLowCallback fails for
|
||||
the signed baseline under -Werror=incompatible-pointer-types and succeeds for
|
||||
the final definition. The final callback preserves 200,007 tested words under
|
||||
UBSan, including 0, 1, 2, 0x40, INT32_MAX, 0x80000000 and UINT32_MAX.
|
||||
This is a compile-time function-type counterexample; GCC UBSan is not claimed
|
||||
to detect the baseline's incompatible indirect call.
|
||||
|
||||
Private evidence: `/tmp/bs2-boot-contract/` and workspace-parent
|
||||
`validation/bs2-boot-contract-20261003/`. Original binary/disassembly is not
|
||||
committed. No shared header, volatility, Run body, state, or linking change.
|
||||
@@ -1,53 +0,0 @@
|
||||
# CHANSVm boolean output contract
|
||||
|
||||
Base: `fc114afd44065fb99f9ff2fe2969f393a504fe03` (43U).
|
||||
Leaf: `agent/bittle/chans-scalar-contracts`.
|
||||
|
||||
## Correction and evidence
|
||||
|
||||
`CHANSVmGetBoolean` writes an optional four-byte `vmBoolInt` result, but its
|
||||
source formal described a `CHANSVmObjHdr*`. All three callers cast addresses
|
||||
of scalar locals to that object pointer. The original helper's only output
|
||||
write is a word store at `0x8144C664`. Its Step call destinations at
|
||||
`0x81456B08`, `0x81457584`, and `0x814575B0` were verified directly in the
|
||||
original DOL, as were 48 nonrelocated helper words and its direct callees.
|
||||
|
||||
The actual MWCC layout probe confirms object alignment/size 8/16 and scalar
|
||||
alignment/size 4/4. Step's two conditional-branch callers pass sp+0x0C, which
|
||||
has scalar alignment but not object alignment. Declaring a whole object at
|
||||
that address is an incorrect source contract even though the generated
|
||||
helper only performs one word store.
|
||||
|
||||
Use `vmBoolInt*` as the output formal, assign through `*ret`, make both
|
||||
receiving locals `vmBoolInt`, and remove all three casts. No shared header
|
||||
contains a declaration, and no header changed. A repository-wide source
|
||||
search found exactly this definition and these three calls. A complete
|
||||
original-object relocation scan found only those calls plus ten labels in
|
||||
the helper's own switch table; no additional callback was found.
|
||||
|
||||
## Tests and gates
|
||||
|
||||
- Source-extracted baseline reproduces a UBSan misaligned-object access when
|
||||
passed a four-byte-aligned, non-eight-byte-aligned scalar destination.
|
||||
- Candidate passes 1,283 typed-output cases, corresponding null-output calls,
|
||||
and surrounding-byte canaries. Coverage includes all 256 discriminator
|
||||
values, signed integer boundaries, zero/nonzero string lengths, finite
|
||||
floating values, signed zero, infinities, NaN, and error/no-write paths.
|
||||
- This is a focused host helper harness with a modeled object layout and
|
||||
`isnan` shim, not full VM or Wii runtime execution. Target layout was
|
||||
independently checked with the configured MWCC compiler.
|
||||
- Entire compiled object is byte-identical, including code, data, symbols
|
||||
and relocations. SHA256:
|
||||
`5bf3f4a0a404e2a574287c16de81d702a1402d9fca416455e84dc1df67c9eb76`.
|
||||
- All 1,027 report units unchanged. Exact CHANS functions 222/233; exact code
|
||||
38,136/53,564; data 6,904/6,904. GetBoolean remains 100%; Step 96.98723%.
|
||||
- Pool: 125/125 identical. `git diff --check` passes.
|
||||
- Full 43U `all_source`, report, and `ok` gates pass with the existing cached
|
||||
tools selected through documented configure overrides. DOL SHA1:
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
Artifacts: `/tmp/chans-step-abi/`, including `test_boolean.py`, the MWCC
|
||||
alignment probe, `check_boolean_original.py`, and build/test results.
|
||||
No original binary or disassembly is committed.
|
||||
|
||||
GATE: coherent scalar-output source correction; no fuzzy/exact/data/link gain.
|
||||
@@ -1,79 +0,0 @@
|
||||
# CHANSVm HMAC external declarations
|
||||
|
||||
Base: `20ba34a80f9d0a09c4a8fad51352f0dd97d84be0` (43U).
|
||||
Leaf: `agent/bittle/chans-hmac-linkage`.
|
||||
|
||||
## Source evidence
|
||||
|
||||
The four HMAC/SHA1 helper declarations at the top of `CHANSVm.c` had
|
||||
`static` linkage but no definitions in that translation unit. A fresh MWCC
|
||||
compile emitted four warning 10532 diagnostics. The definitions in
|
||||
`libs/RevoEX/src/net/sha1.c` and `hmac.c` have external linkage;
|
||||
`CDBRecord.c` already declares these imports `extern`.
|
||||
|
||||
The original CHANS object imports all four as `STB_GLOBAL`, `SHN_UNDEF`.
|
||||
The baseline source object instead imported them as `STB_LOCAL`,
|
||||
`SHN_UNDEF`. Change only the four declaration storage classes to `extern`.
|
||||
Do not change the context, parameter types, shared headers, or linking flags.
|
||||
|
||||
Independent original-DOL call decoding agrees with the extracted relocations:
|
||||
|
||||
| Caller | Call address | Destination | Import |
|
||||
| --- | --- | --- | --- |
|
||||
| VmBlobCalcHMAC | 0x81452720 | 0x81494144 | NETGetSHA1Interface |
|
||||
| VmBlobCalcHMAC | 0x81452734 | 0x814944EC | NETHMACInit |
|
||||
| VmBlobCalcHMAC | 0x81452744 | 0x81494728 | NETHMACUpdate |
|
||||
| VmBlobCalcHMAC | 0x81452750 | 0x81494738 | NETHMACGetDigest |
|
||||
| VmBlobCalcRangeHMAC | 0x814528F4 | 0x81494144 | NETGetSHA1Interface |
|
||||
| VmBlobCalcRangeHMAC | 0x81452908 | 0x814944EC | NETHMACInit |
|
||||
| VmBlobCalcRangeHMAC | 0x81452918 | 0x81494728 | NETHMACUpdate |
|
||||
| VmBlobCalcRangeHMAC | 0x81452924 | 0x81494738 | NETHMACGetDigest |
|
||||
|
||||
The ABI contracts agree: Init takes context/interface/key/u32 length in
|
||||
r3-r6, Update takes context/data/u32 length, and GetDigest takes
|
||||
context/output. The interface helper returns its pointer in r3.
|
||||
Original caller context addresses are sp+8 and sp+0x10. The exact HMAC
|
||||
implementation uses the interface at 0x00-0x1B, key length at 0x1C,
|
||||
96-byte digest state at 0x20, and 64-byte key at 0x80, totaling 0xC0.
|
||||
The existing CHANS opaque context reserves 0xD0 with 8-byte alignment.
|
||||
That storage is unchanged. Caller opaque types and callee named types
|
||||
remain separate declarations; this change fixes linkage only, not complete
|
||||
cross-translation-unit type compatibility.
|
||||
|
||||
## Validation
|
||||
|
||||
- Configured 43U with `../toolchain/wibo-build/wibo`; fresh baseline full
|
||||
source/report/DOL build passed, followed by a forced owned-object rebuild.
|
||||
- Baseline emitted exactly four warning 10532 diagnostics; candidate emitted
|
||||
none. No other compiler warning appeared in the candidate object build.
|
||||
- The four imports now have exactly the original symbol records, including
|
||||
global undefined binding. Every other symbol record is unchanged.
|
||||
- All six allocated sections retain identical contents, extents, alignment,
|
||||
type and flags, including the NOBITS section's extent.
|
||||
- All 2,010 relocation sites, types, symbol identities and addends are
|
||||
unchanged. Comparison resolves symbol indexes because binding changes
|
||||
can reorder the ELF symbol table.
|
||||
- All 1,027 unit report records are unchanged. CHANS: fuzzy 99.4341%,
|
||||
exact code 38,136/53,564 bytes, exact functions 222/233,
|
||||
matched data 6,904/6,904 bytes.
|
||||
- Independently compared all 222 exact functions against original
|
||||
instruction streams, with zero differences.
|
||||
- The two HMAC callers remain 64/64 and 119/119 instructions, diffs 0.
|
||||
- Pool: identical 125/125 entries. Literal advisory: 233 functions,
|
||||
40 arguments, no candidates, errors, or skips.
|
||||
- Eight call destinations and 392 nonrelocated instruction words across
|
||||
the two callers and four helpers agree with original DOL bytes.
|
||||
- Final `WIBO_SJIS_MISSING_IMPORTS=1 ../.venv/bin/ninja all_source
|
||||
build/43U/report.json build/43U/ok` passes; DOL SHA1 remains
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`. `git diff --check` passes.
|
||||
|
||||
Whole-object identity is intentionally not claimed: symbol bindings changed.
|
||||
SHA256 before:
|
||||
`f971cabf817dba7e5cb240df01e1e8f814bb0a973e357a594d031046a56e691b`.
|
||||
SHA256 after:
|
||||
`5bf3f4a0a404e2a574287c16de81d702a1402d9fca416455e84dc1df67c9eb76`.
|
||||
|
||||
Private reproducibility artifacts are under
|
||||
`validation/chans-hmac-linkage-20261003/` in the workspace parent and
|
||||
`/tmp/chans-hmac-linkage/`. No original binary or disassembly is committed.
|
||||
This is a source declaration correction with no decompilation percentage gain.
|
||||
@@ -1,57 +0,0 @@
|
||||
# CHANSVm immediate integer accumulation
|
||||
|
||||
Base: `a52b3390` on `agent/bittle/chans-scalar-contracts` (43U).
|
||||
This isolated commit follows, but does not alter, the boolean-output correction.
|
||||
|
||||
## Correction
|
||||
|
||||
`VmLoadImmInteger` assembled bytes by repeatedly left-shifting a signed
|
||||
64-bit accumulator. An eight-byte immediate beginning with 0x80 through
|
||||
0xFF can overflow that signed shift on the final iteration. Use an unsigned
|
||||
64-bit accumulator, then convert the final word to the existing signed
|
||||
`vmInteger` argument of `CHANSVmSetInteger`.
|
||||
|
||||
The original helper at `0x81455D88` shifts and combines high/low 32-bit words
|
||||
modulo 64 bits. It reads unsigned bytes in big-endian order. Short immediate
|
||||
widths do not sign-extend: one-byte 0xFF is 255, not -1. The target tail call
|
||||
preserves VM/object in r3/r4 and supplies high/low value words in r5/r6.
|
||||
Step's two call sites supply counts 1, 2, 4, or 8 for immediate loads, and
|
||||
1 for binary immediate operations. No negative-width caller was found.
|
||||
|
||||
Unsigned shifts are defined. The final out-of-range unsigned-to-signed
|
||||
conversion is implementation-defined in C; configured MWCC probes verify
|
||||
bit-preserving conversion for bit 63, all bits set, and dynamic input.
|
||||
The dynamic conversion emits only a return instruction. Host GCC tests
|
||||
independently verify the selected implementation's behavior. No universal
|
||||
portable-C conversion claim is made.
|
||||
|
||||
## Verification
|
||||
|
||||
- Source-extracted baseline UBSan fails while assembling `80 00 00 00 00
|
||||
00 00 00`. The candidate passes 315,813 cases: every combination of
|
||||
0x00/0x7F/0x80/0xFF at widths 1/2/4/8, generated inputs, and zero width.
|
||||
Tests check value bits, VM/object callback arguments, and propagated result.
|
||||
- A bounded interpreter executes the original helper's 16 nonbranch-tail
|
||||
instruction words, independently checked against the original DOL.
|
||||
The tail branch destination is verified as `CHANSVmSetInteger`.
|
||||
All 165,813 original-DOL cases agree with an independent big-endian
|
||||
unsigned reference and with r3/r4/r5:r6 call contracts.
|
||||
- These are focused host/helper-slice tests, not complete VM or Wii runtime
|
||||
execution. Counts outside the observed 1/2/4/8 contract are not generally
|
||||
validated; zero was checked as an additional no-read boundary.
|
||||
- VmLoadImmInteger remains exact: 17/17 instructions, ctxdiff 0 differences.
|
||||
- Entire CHANSVm.o remains byte-identical to both the preceding commit and
|
||||
initial branch baseline, including code/data/symbols/relocations. SHA256:
|
||||
`5bf3f4a0a404e2a574287c16de81d702a1402d9fca416455e84dc1df67c9eb76`.
|
||||
- All 1,027 report units remain unchanged. All 222 exact functions were
|
||||
independently compared with the original and have zero differences.
|
||||
- Pool: 125/125. Literal advisory: 233 functions, 40 arguments, no
|
||||
candidates/errors/skips. `git diff --check` passes.
|
||||
- Full 43U `all_source`, report, and `ok` gate passes with existing cached
|
||||
tooling. DOL SHA1: `26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
Artifacts: `/tmp/chans-step-abi/test_immediate.py`,
|
||||
`check_immediate_original.py`, conversion probe, and build/test results.
|
||||
No original binary or disassembly is committed.
|
||||
|
||||
GATE: source-width correctness correction; no fuzzy/exact/data/link gain.
|
||||
@@ -1,71 +0,0 @@
|
||||
# CHANSVm string-index width correction
|
||||
|
||||
Baseline: `7b8dbf2c96aa9b4490df35932850c59886f76be3` in the prepared
|
||||
`agent/bittle/chinese-code-width` leaf. Before editing, the owned CHANSVm source
|
||||
was also identical to the available `origin/main` at `6619098e`. The earlier
|
||||
Chinese investigation remains unchanged. Only CHANSVm.c and this log change.
|
||||
|
||||
## Correction
|
||||
|
||||
The SET_INDEX string path parsed into a `u64`, reconstructed that value through
|
||||
`VM_S64_FROM_U64`, then cast it back to `u64` for the bound check. The macro's
|
||||
signed 64-bit high-word left shift overflows when the parsed value has bit 63
|
||||
set. For example, parsing "-1" reaches a signed shift of 4294967295 by 32.
|
||||
|
||||
Compare the original `u64` directly against the existing `0xFFFFFFFE` bound.
|
||||
Remove the now-unused macro. The integer and floating paths are unchanged.
|
||||
This removes undefined source behavior; it does not claim a change to the
|
||||
current MWCC executable, a fuzzy gain, or a new exact function.
|
||||
|
||||
## Original evidence
|
||||
|
||||
- Original CHANSVmStep is at `0x81456354`, with extent `0x1394`.
|
||||
- `0x814563B8` and `0x814563BC` establish the bound's high and low words as
|
||||
zero and `0xFFFFFFFE`.
|
||||
- The parsed-string check at `0x81456E90` through `0x81456EB4` reads the two
|
||||
parsed words and performs an unsigned two-word comparison. Values greater
|
||||
than the bound select the existing SET_INDEX error; accepted values forward
|
||||
their low word as the index.
|
||||
- These instruction words were checked directly against the original DOL,
|
||||
independently of relocation matching. The DOL has the required SHA1 below.
|
||||
- CHANSVmParseInt calls `strtoull` and stores its unsigned result. The local MSL
|
||||
implementation (`strtoul.c`, lines 327–348) explicitly applies a negative sign
|
||||
in unsigned width. Both helpers are already exact in the live report.
|
||||
- Prior CHANSVm attempt logs were checked; the typed integer/float comparison
|
||||
work did not address this signed reconstruction in the parsed-string path.
|
||||
|
||||
## Tests and measurements
|
||||
|
||||
- Baseline source-extracted UBSan harness fails on "-1" with signed left-shift
|
||||
overflow. The candidate passes 300,028 parsed-value and unsigned-boundary
|
||||
cases without a sanitizer error.
|
||||
- Inputs include zero, `0xFFFFFFFE`, `0xFFFFFFFF`, `0x100000000`, signed-64
|
||||
boundaries, maximum unsigned-64, negative decimal strings, parse failures,
|
||||
and deterministic generated values. The unusual unsigned parsing of
|
||||
"-18446744073709551615" to 1 remains accepted, matching the existing parser.
|
||||
- A separate bounded interpreter executes the original DOL comparison slice
|
||||
for 300,010 values, checking its error branch and accepted index against an
|
||||
independent high-word/low-word bound reference. Every case passes.
|
||||
- These are focused host/slice tests, not complete VM or Wii runtime tests.
|
||||
The parser harness uses a UTF-16-to-ASCII shim and host `strtoull`; MSL's
|
||||
negative-sign behavior was also checked in its local source.
|
||||
- Entire compiled object, including all code, data and relocations, is
|
||||
byte-identical before/after. SHA256:
|
||||
`f971cabf817dba7e5cb240df01e1e8f814bb0a973e357a594d031046a56e691b`.
|
||||
- Complete 1,027-unit report is unchanged. CHANSVmStep remains 96.98723%,
|
||||
1,253/1,253 instructions. Unit fuzzy remains 99.4341%.
|
||||
- Exact functions remain 222/233, each individually checked with ctxdiff:
|
||||
zero differences. Exact code remains 38,136/53,564 bytes; data 6,904/6,904.
|
||||
- Pool: 125/125 strings identical. Literal advisory: 233 functions, 40 arguments,
|
||||
no candidates, skips or errors.
|
||||
- Full 43U `all_source`, report and `ok` gates pass using the assigned wrapper
|
||||
and WIBO_SJIS_MISSING_IMPORTS=1. `git diff --check` passes.
|
||||
- DOL SHA1: `26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
Private local reproduction files are in `/tmp/chans-index-width/`, including
|
||||
baseline/candidate sources and objects, test_width.py, check_original.py,
|
||||
sanitizer output, original-address checks, pool/literal results and build logs.
|
||||
No original binary or disassembly is committed. No header, metadata, compiler,
|
||||
linking, other-region, remote, or register-allocation change was made.
|
||||
|
||||
GATE: source-width correctness fix; compiler output and all progress preserved.
|
||||
@@ -1,88 +0,0 @@
|
||||
# CHANSVm packed-hex count rounding
|
||||
|
||||
Base: `a30b5cecb68f4549ef83565a567cc5dd7bd4c0de` (43U).
|
||||
Leaf: `agent/bittle/chans-pack-union`.
|
||||
|
||||
## Retained source-width correction
|
||||
|
||||
The sizing and writing passes of `VmBlobPackCommon` both computed
|
||||
`(count + 1) / 2` in signed 32-bit arithmetic for hexadecimal strings.
|
||||
The existing parser accepts `H2147483647`, making the addition overflow.
|
||||
Both sites now add in unsigned 32-bit width, convert the wrapped word to
|
||||
`s32`, then perform the existing signed division.
|
||||
|
||||
This preserves the target's unusual boundary behavior. It does not change
|
||||
`INT_MAX` into a positive rounded-up size. The original result is
|
||||
`-1073741824`; the writing pass forwards its signed extension to the existing
|
||||
`CHANSVmBlobHasSpace` check, which rejects negative sizes. All surrounding
|
||||
count, size, allocation, and error checks are unchanged.
|
||||
|
||||
Unsigned addition is defined modulo 2^32. Converting an out-of-range `u32`
|
||||
to `s32` is implementation-defined in C, not signed-overflow undefined
|
||||
behavior. Separate MWCC probes confirm the configured 32-bit compiler's
|
||||
bit-preserving conversion: `0x80000000` becomes `INT_MIN`, and `0xffffffff`
|
||||
becomes -1. Its dynamic rounding probe emits the same add, arithmetic-shift,
|
||||
and carry-add sequence as the original. The host GCC harness uses explicit
|
||||
32-bit typedefs and independently confirms that conversion behavior.
|
||||
This is not a claim of portable behavior for every possible C implementation.
|
||||
|
||||
## Original and prior-work evidence
|
||||
|
||||
- Original `VmBlobPackCommon`: address `0x81453670`, extent `0xA70`.
|
||||
- Sizing-pass rounding: relative `+0x320` through `+0x330`.
|
||||
- Writing-pass rounding and signed call argument: `+0x940` through `+0x954`.
|
||||
- Those words agree directly with the original DOL, independently of the
|
||||
extracted object's relocations.
|
||||
- Earlier CHANS logs covered count validation, padding, parser locals,
|
||||
declaration orders, loop structure, and source/getter types. No earlier
|
||||
packed-hex `count + 1` wrap correction was found.
|
||||
|
||||
## Validation
|
||||
|
||||
- Source-extracted baseline arithmetic fails UBSan at `INT_MAX + 1`.
|
||||
- Candidate passes 1,000,022 direct arithmetic inputs and 11 source-extracted
|
||||
parser cases, including `H2147483647`, neighboring odd/even limits, zero,
|
||||
ordinary counts, `H*` (-1), and the existing overflowing-digit rejection.
|
||||
Star-derived string lengths include zero and the largest u32 byte lengths.
|
||||
- Two bounded original-DOL instruction interpreters each pass 1,000,013
|
||||
inputs against an independent widened-arithmetic reference, including
|
||||
INT_MAX neighbors, negative boundaries, and generated nonnegative counts.
|
||||
The second slice also verifies signed 64-bit argument extension.
|
||||
- These are focused parser/arithmetic/slice tests, not complete VM or Wii
|
||||
runtime tests. The parser is unchanged and is not generally proven free
|
||||
from other arithmetic issues.
|
||||
- Entire CHANSVm object is byte-identical before/after, including code,
|
||||
data, symbols and relocations. SHA256:
|
||||
`5bf3f4a0a404e2a574287c16de81d702a1402d9fca416455e84dc1df67c9eb76`.
|
||||
- All 1,027 report units are unchanged. CHANS exact functions: 222/233;
|
||||
exact code: 38,136/53,564; exact data: 6,904/6,904.
|
||||
- All 222 objdiff-exact functions independently have identical original
|
||||
instruction streams. PackCommon remains 97.949104%, 668/668 instructions;
|
||||
CHANSVmStep remains 96.98723%, 1,253/1,253 instructions.
|
||||
- Pool: 125/125 identical. Literal advisory: 233 functions, 40 arguments,
|
||||
no candidates, errors, or skips. `git diff --check` passes.
|
||||
|
||||
- Final full 43U `all_source`, report, and `ok` gates pass. DOL SHA1:
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
- The initial final-build run stopped when an automatic BSTool refresh was
|
||||
blocked. Its resume attempt found that the process had ended. The final
|
||||
build used configure.py's supported explicit paths to the existing cached
|
||||
compiler, binutils, DTK, objdiff, sjiswrap, and BSTool. No executable was
|
||||
replaced and no download was needed. All 1,027 source objects were rebuilt.
|
||||
- The final object and complete report remain identical to their fresh
|
||||
baseline after that full rebuild.
|
||||
|
||||
GATE: source-width correctness correction; zero fuzzy, exact, data, or linking
|
||||
metric changes. The unit remains NonMatching and no linking flags changed.
|
||||
|
||||
## Rejected separate scratch-buffer trial
|
||||
|
||||
Before the overflow change, one bounded trial replaced PackCommon's cast-based
|
||||
scratch array with a union whose integer-width members were all used.
|
||||
MWCC removed two scratch-clearing stores: 668 -> 666 instructions, fuzzy
|
||||
97.949104% -> 97.500000%. The trial was fully restored; the restored whole
|
||||
object was verified byte-identical before starting the overflow change.
|
||||
No union change is retained, and no declaration or register sweep was run.
|
||||
|
||||
Reproduction artifacts are in `/tmp/chans-pack-rounding/` and
|
||||
`/tmp/chans-pack-union/`. No original binary or disassembly is committed.
|
||||
@@ -1,52 +0,0 @@
|
||||
# CHANSVm typed comparison reconstruction
|
||||
|
||||
Baseline: ec75ddb0. This candidate is separate from the accepted load-string and opcode-error-path work. Those commits and their logs are unchanged. Only CHANSVm.c and this log changed; no headers, linking classifications, metadata, or original assets changed.
|
||||
|
||||
## Retained reconstruction
|
||||
|
||||
- LOAD_FLOAT copies the eight-byte literal into a double scratch member and passes that value directly. This replaces a u64 temporary followed by a double-pointer reinterpretation. Scratch alignment, member offsets, and emitted code are unchanged.
|
||||
- SET_INDEX reads the floating operand through its union member and checks its lower bound before its upper bound, matching the target's comparison order. The accepted interval remains [0, 4294967294], with NaN and infinities rejected.
|
||||
- Strict integer equality uses the declared 64-bit integer values rather than four offset-based u32 loads and manual XOR/OR expressions.
|
||||
- Strict floating equality uses the declared floating values directly.
|
||||
- Strict string equality uses named, read-only payload pointers rather than recreating a header pointer. The stack operand is consistently first in the outer type comparison, following the target.
|
||||
|
||||
This is structural/type reconstruction, not a newly discovered behavior fix. No register forcing, declaration sweep, or alignment padding was introduced.
|
||||
|
||||
## Target evidence
|
||||
|
||||
After rebuilding, the integer-comparison block (Step instructions 1093-1102), floating-comparison block (1103-1108), string-comparison block (1109-1128), and floating-index block (703-712) have the same instructions, control flow, constants, and memory offsets as the target after register names are normalized. This comparison is advisory: register differences remain, and Step is not exact.
|
||||
|
||||
The floating range's instruction forms now use the target's lower-bound-first order. Integer equality emits the same target ten-instruction two-word equality sequence naturally from the 64-bit value comparison. LOAD_FLOAT retains its original eight-byte copy and call sequence without a pointer reinterpretation.
|
||||
|
||||
## Measurements
|
||||
|
||||
- Instruction-exact functions: 221/233 -> 221/233; no previously exact function regressed.
|
||||
- Unit Decompiled/fuzzy: 99.406320% -> 99.413185%.
|
||||
- Step: 96.913800% -> 96.987230%; 1253/1253 instructions; differing positions 285 -> 276.
|
||||
- Exact code: unchanged at 37608/53564 bytes (70.211334%).
|
||||
- Exact data: unchanged at 6904/6904 bytes (100%).
|
||||
- Per-function score regressions: zero.
|
||||
- Unit remains NonMatching/unlinked, with twelve non-exact functions.
|
||||
|
||||
## Attempts
|
||||
|
||||
- Direct 64-bit equality alone: Step 96.933760%, data 100%; retained for combination.
|
||||
- Typed integer/float/string comparison paths: 96.971270%, data 100%; retained.
|
||||
- Those typed paths plus a separate strict-comparison local error result: 1254 instructions, table relocations moved; rejected.
|
||||
- Floating index member access alone preserves the typed-comparison score. Lower-bound-first range checking raises it to 96.983240%, data 100%; retained.
|
||||
- A union literal temporary produced the same code; simplified to a direct double member instead, also with identical code.
|
||||
- Stack-first type comparison raises Step to 96.987230% with unchanged data; retained.
|
||||
|
||||
## Verification
|
||||
|
||||
- Full 43U build passed with the assigned wrapper and WIBO_SJIS_MISSING_IMPORTS=1.
|
||||
- DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
- pool_diff: all 125 strings identical.
|
||||
- .data: 4672/4672 raw bytes and 352/352 canonical relocations identical.
|
||||
- .rodata: 1432/1432 raw bytes and 258/258 canonical relocations identical.
|
||||
- All 233 functions checked with ctxdiff/odiff: 221 instruction-exact; no falsely exact objdiff functions.
|
||||
- Literal-reference audit: 233 functions analyzed, 40 resolvable call-string arguments checked, no candidates/errors/skips.
|
||||
- Source-extracted host C harnesses passed 20 strict-comparison cases, nine floating-index-bound cases, and eight floating-literal bit patterns. Coverage includes signed integer extremes, differing high words, signed zero, NaN, infinities, strings, references, deletion errors, and literal payload preservation. They stub surrounding dependencies and do not constitute Wii runtime execution.
|
||||
- git diff --check passed.
|
||||
|
||||
Source is paused for independent parent verification.
|
||||
@@ -1,96 +0,0 @@
|
||||
# VmBlobPackCommon copy/padding lifetime boundary
|
||||
|
||||
43U only. Base `4508f455dbd44de4f512618e91692a9b6115d6e8`, tree
|
||||
`28f9b61d3f0bed89a5086a4a813ee52a462b1504`. One fixed candidate; no permutations.
|
||||
|
||||
The existing blob copy, bounded overlap-safe `memmove`, optional zero-fill and
|
||||
offset commit now have a small inline helper. This is an independently
|
||||
reconstructed candidate, not recovery of the historical helper in
|
||||
`a5h.attempts.md:47–48`. The historical source hashes could not be recovered.
|
||||
|
||||
## Actual measurements
|
||||
|
||||
- Fresh baseline default build reproduced all 1,027 source objects and the
|
||||
complete official report byte-for-byte
|
||||
- One candidate compile: `VmBlobPackCommon` **97.949104 → 97.97156%**;
|
||||
2,672 bytes / 668 instructions unchanged; target instruction differences 244 → 242
|
||||
- Selected-source recompile through full default Ninja reproduced the candidate
|
||||
source, object and full report; explicit `build/43U/ok` passes
|
||||
- Only CHANSVm.o changes. All 232 sibling function bytes/scores and all other
|
||||
1,026 units unchanged; 224 exact functions preserved
|
||||
- Unit fuzzy **99.45986 → 99.46098%**; exact code 39,908/53,564 and data
|
||||
6,904/6,904 unchanged; link classifications unchanged
|
||||
- Pool 125/125 identical; literal audit 233 functions/40 arguments, zero errors,
|
||||
candidates or skips; `git diff --check` passes
|
||||
- DOL SHA1 `26116613f624061ba99c8d1a299aaa6efa85670d`
|
||||
|
||||
Candidate source SHA256:
|
||||
`d52e12d7c154c61dc49ffb0ef125764fb8714a7d6f71631e810fd3a57d88d536`
|
||||
|
||||
Candidate object SHA256:
|
||||
`a60ea527623793184e6e3edd0584e0e335c534248a5a9902dfe217cefdf39999`
|
||||
|
||||
This remains a fuzzy improvement, not an exact match or a completed linked unit.
|
||||
|
||||
## Semantics and metadata
|
||||
|
||||
Source and destination may share a header or contained overlapping payloads.
|
||||
The existing declaration-level volatile offset reads retain their order,
|
||||
including the fresh destination-offset reload after copy/padding. Const adds
|
||||
no restrict/disjointness promise. Parser, allocation, conversion, callback,
|
||||
validation and error paths stay in place. Removed locals belonged only to the
|
||||
copied block. No compiler option, layout or link setting changed.
|
||||
|
||||
49 instructions differ from baseline, all register allocation. Raw ELF symbol
|
||||
entries and relocation sections are identical. Every nontext section except
|
||||
`.strtab` is identical; exactly 79 local `@number` object-name replacements
|
||||
reconstruct that section. No helper body or extra function symbol is emitted.
|
||||
|
||||
## Standalone verification
|
||||
|
||||
`verify_vm_blob_copy_padded.py` needs preinstalled pyelftools and capstone.
|
||||
It reads caller-supplied files and writes only a fresh output directory:
|
||||
|
||||
```sh
|
||||
python tools/decomp-assist/verify_vm_blob_copy_padded.py \
|
||||
--baseline-object /path/to/baseline-CHANSVm.o \
|
||||
--candidate-object build/43U/src/src/channelScript/CHANSVm.o \
|
||||
--original-object build/43U/obj/src/channelScript/CHANSVm.o \
|
||||
--dol /path/to/authorized-original-43U.dol \
|
||||
--symbols config/43U/symbols.txt \
|
||||
--output-dir /path/to/new-verification-output
|
||||
```
|
||||
|
||||
The checker compares corresponding CFG edges with a must-equality relation,
|
||||
intersecting predecessor states at branch and loop joins. Both baseline versus
|
||||
candidate and baseline versus original pass 944 explicit/implicit uses. CR0,
|
||||
XER.CA, CTR, LR, memory, stack addressing and SDA21 bases are accounted for.
|
||||
Ordinary calls kill equality for undocumented caller-saved scratch registers;
|
||||
only documented results and coupled memory effects are retained.
|
||||
|
||||
The callee contracts follow the actual CHANSVm.c definitions: word/pointer
|
||||
arguments occupy their listed r3..r9 registers and all results use r3 except
|
||||
the u64 MakeU64 result in r3:r4. BlobHasSpace's signed64 argument is aligned in
|
||||
r5:r6, skipping r4. There are no stack-passed arguments. VmBoolInt is BOOL/int,
|
||||
not byte-sized vmBool (VmTypes.h and revolution/types.h). MSL string.h declares
|
||||
the pointer results and size_t arguments of memcpy/memmove/memset. The original
|
||||
save/restore helper tails are independently decoded from the DOL.
|
||||
|
||||
The original DOL copy slice at +0x4BC..+0x518 is exactly 23 instructions. There
|
||||
are 5,456 bounded cases, each compared across baseline/candidate/direct-DOL
|
||||
instructions: 16,368 complete-memory and ordered-trace comparisons. Coverage
|
||||
includes 136 same-header, 2,352 padding, 1,508 zero-copy, 395 forward-overlap and 429
|
||||
backward-overlap cases. Negative controls reject a missing volatile reload,
|
||||
overlap-unsafe forward copying and undocumented scratch use after a call.
|
||||
|
||||
These are bounded custom instruction/source checks with opaque fixed callee
|
||||
contracts and modeled libc operations, not general formal verification or
|
||||
complete VM/Wii runtime testing. Malformed header-overwriting payload pointers
|
||||
are not asserted valid. Full project/report gates remain separate requirements.
|
||||
|
||||
Harness-development failures were retained separately: the first metadata
|
||||
assertion exposed local-name renumbering, and a DOL call loader restricted to
|
||||
`.text` rejected memset at 0x81330334. Its exact `.init` symbol declaration fixed
|
||||
the resolver; no name was guessed. An initial save-helper textual check also
|
||||
rejected Capstone's decimal `-8` spelling; numeric operand checks replaced it.
|
||||
These were verifier fixes, not additional source candidates or compiler trials.
|
||||
@@ -1,84 +0,0 @@
|
||||
# VmBlobPackCommon in-place hexadecimal decoding
|
||||
|
||||
43U only, base `631f31b7f814516abfdfcd763db376ea50a02a13`.
|
||||
Exactly one source form: remove the separate u32 nibble temporary and decode
|
||||
into the existing u32 ch value. No declaration permutations or other variants.
|
||||
|
||||
## Fresh build results
|
||||
|
||||
- Fresh baseline default build reproduces all 1,027 objects and complete report
|
||||
- Candidate: function **97.97156 → 98.0988%**, unit **99.46098 → 99.46733%**
|
||||
- Size remains 2,672 bytes / 668 instructions; strict target differences 242 → 230
|
||||
- Only 13 instructions change, within +0x9A8..+0xA08, reproducing the target's
|
||||
in-place r7 decoding. Its source-pointer base remains different
|
||||
- Selected actual recompile reproduces candidate source/object/report exactly
|
||||
- All 232 sibling bytes/scores, 224 exact functions, other 1,026 units, matched
|
||||
code 39,908/53,564, data 6,904/6,904 and link classifications preserved
|
||||
- Full default 43U, explicit ok, pool 125/125, literal audit 233 functions /
|
||||
40 arguments (no skips/errors/candidates), and diff checks pass
|
||||
- DOL SHA1: `26116613f624061ba99c8d1a299aaa6efa85670d`
|
||||
|
||||
Only baseline, candidate and selected compiler invocations were used.
|
||||
This remains a fuzzy gain, not an exact match or completed linked unit.
|
||||
|
||||
Source SHA256:
|
||||
`2a4903c930eed51968ef99d018dc46256807cb59bb4f69287e3065b883591faf`
|
||||
|
||||
Object SHA256:
|
||||
`7325c84d335b08f2fb58405e87ca76fc0245fcd8549bb640ec4ef7911893b053`
|
||||
|
||||
## Contracts and reproducible checks
|
||||
|
||||
The original code unit is unused after decoding. Each iteration overwrites ch
|
||||
before use; no ch occurrence remains outside this loop except its declaration.
|
||||
It cannot escape to another format case or later branch. Count-zero paths do
|
||||
not read it. Decoded values are 0..15, optionally shifted to at most 240.
|
||||
Input/output accesses, zero-fill, pointer/count induction and volatile offset
|
||||
commits retain their order, including contained overlapping payload views.
|
||||
|
||||
Every raw symbol entry and relocation section is unchanged. All nontext
|
||||
sections except `.strtab` are unchanged; exactly 79 local object-name changes
|
||||
exhaustively reconstruct `.strtab`. No helper body or function symbol is added.
|
||||
|
||||
The accepted copy/pad slice +0x4BC..+0x518 is raw-byte identical. The published
|
||||
common verifier is hash-pinned and replayed automatically: 944 must-equality
|
||||
uses pass for each baseline/candidate and baseline/original comparison, with
|
||||
branch/loop predecessor intersections and explicit GPR/CR0/CA/CTR/LR/memory
|
||||
effects. Undocumented call-clobber equality is killed. The original call ABI,
|
||||
save/restore tails, metadata/name accounting, unchanged copy slice and its
|
||||
16,368 bounded comparisons are freshly checked, not assumed from an old run.
|
||||
|
||||
Fresh hex checks interpret direct original-DOL instructions +0x978..+0xA38,
|
||||
including pre-decode memset and post-loop offset reload/store:
|
||||
|
||||
- All 65,536 code units and both parities: **131,072 scalar cases**, each run
|
||||
on baseline/candidate/original instructions, **393,216 comparisons**
|
||||
- **640 bounded strings**, lengths 0..64, run on all three streams:
|
||||
**1,920 comparisons**, including **330 contained-overlap cases**
|
||||
- Complete memory, ordered access/call traces, scalar cursor and CTR results
|
||||
are checked against an independent lookup-table reference
|
||||
- Negative controls reject an incorrect digit base, missing high-nibble shift,
|
||||
omitted volatile copy-offset reload, overlap-unsafe copying and undocumented
|
||||
scratch use after a call
|
||||
|
||||
Use preinstalled pyelftools/capstone; no compilation or downloads occur:
|
||||
|
||||
```sh
|
||||
python tools/decomp-assist/verify_vm_blob_hex_inplace.py \
|
||||
--baseline-object /path/to/accepted-baseline-CHANSVm.o \
|
||||
--candidate-object build/43U/src/src/channelScript/CHANSVm.o \
|
||||
--original-object build/43U/obj/src/channelScript/CHANSVm.o \
|
||||
--dol /path/to/authorized-original-43U.dol \
|
||||
--symbols config/43U/symbols.txt --source src/channelScript/CHANSVm.c \
|
||||
--output-dir /path/to/new-verification-output
|
||||
```
|
||||
|
||||
The default common verifier is the already-published sibling
|
||||
`verify_vm_blob_copy_padded.py`; an explicit path is also accepted. Both reports
|
||||
are saved in the new output directory. Input source/object and common-verifier
|
||||
hashes pin this exact trial. Full project/report gates remain separate.
|
||||
|
||||
These are bounded custom instruction/source checks with modeled libc and fixed
|
||||
opaque callee contracts, not general formal verification or full VM/Wii runtime
|
||||
testing. Only valid allocated spans are covered; malformed or out-of-bounds
|
||||
input behavior is not claimed. Earlier evidence and diagnostics are preserved.
|
||||
@@ -1,345 +0,0 @@
|
||||
# a23h high attempts
|
||||
|
||||
Baseline 934587c4. Work only in data-d3; prior u2 log preserved untracked. Read task, levers, AGENTS and prior a2/a3/u2 logs. No owned source changed on freshly fetched origin/main. All prior trials remain rejected unless revalidated. All nine units have 100% data.
|
||||
|
||||
src/scene/address/iplAddress: POOL IDENTICAL up to 81 (mine=81 base=81)
|
||||
|
||||
src/scene/address/iplAddressEdit: POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect: POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
|
||||
src/keyboard/tiCellPhone: POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
|
||||
src/keyboard/tiInputForm: POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
src/keyboard/tiCandidateBox: POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
|
||||
src/keyboard/tiSignWindow: POOL IDENTICAL up to 30 (mine=30 base=30)
|
||||
|
||||
src/keyboard/tiString: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
|
||||
src/keyboard/tiZiString: POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Remote check src/scene/address/iplAddressEdit: fetch rc=0; owned source changed=False
|
||||
|
||||
## AddressEdit get_friendinfo
|
||||
Target copies record, sets name, retains name address over FindPane, assigns Wii-ID or email, retains display address over second FindPane, copies ID. Source rematerializes both text addresses; frame and calls agree. Test layout wrapper, nullable String receiver and member-array address calculation. No volatile or undefined-local evidence.
|
||||
BUILD FAIL src/scene/address/iplAddressEdit | pane wrapper owns lookup before set_textbox | b666d07be9f8
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "member string getter with explicit nullable receiver", "hash": "045c3c96bc4d", "pool": 0, "functions": {"get_friendinfo__Q33ipl5scene11AddressEditFv": [63.36905, 95, 84, [42, 90]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "typed member-array getter retains array dimensions", "hash": "be5947efc264", "pool": 0, "functions": {"get_friendinfo__Q33ipl5scene11AddressEditFv": [88.03571, 82, 84, [10, 68]]}, "drops": []}
|
||||
Remote check src/keyboard/tiInputForm: fetch rc=0; owned source changed=False
|
||||
|
||||
## calcCursorPos
|
||||
Target computes height product/add before width product, then wrap/line/newline/hit regions; source scheduler hoists four rectangle loads. Target scale.y f31 vs source f30. Three expression-boundary variants below preserve scalar order and FP rounding.
|
||||
ATTEMPT {"unit": "src/keyboard/tiInputForm", "label": "scaled height compound accumulator", "hash": "846909bed5f9", "pool": 0, "functions": {"calcCursorPos__Q39textinput9inputform4BaseFff": [90.90184, 326, 326, [49, 79]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiInputForm", "label": "glyph width computed through a const scalar pair", "hash": "ba9f03eb8b9d", "pool": 0, "functions": {"calcCursorPos__Q39textinput9inputform4BaseFff": [93.33129, 326, 326, [36, 47]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiInputForm", "label": "scaled cursor bounds output references isolate two calculations", "hash": "63d0cefaef3d", "pool": 0, "functions": {"calcCursorPos__Q39textinput9inputform4BaseFff": [90.16871, 331, 326, [72, 329]]}, "drops": []}
|
||||
Remote check src/keyboard/tiZiString: fetch rc=0; owned source changed=False
|
||||
|
||||
## tiZiString buffer layout
|
||||
clearCandidates target six memset calls, fields then two language calls and candidate search. setElementBuffer target two memset calls then bounded copy/conversion. update target initializes search, expands keys, retries Korean candidates, compacts context and copies/cases candidates. Target separate 0x200-sized logical input/composition/output ranges are proven by memset and EZTX relocations. Test an equal-size typed aggregate and genuine common helper boundaries. No symbol names, sizes or storage addresses edited.
|
||||
ATTEMPT {"unit": "src/keyboard/tiZiString", "label": "candidate buffer storage uses three proven typed ranges", "hash": "e298378e2ba0", "pool": 0, "functions": {"clearCandidates__Q39textinput8tistring6WithZiFv": [91.049385, 84, 81, [12, 80]], "update__Q39textinput8tistring6WithZiFv": [97.4574, 448, 446, [13, 427]], "setElementBuffer__Q39textinput8tistring6WithZiFv": [90.33846, 65, 65, [5, 18]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiZiString", "label": "three-range storage with input array-reference lifetime", "hash": "e5a8a3729729", "pool": 0, "functions": {"clearCandidates__Q39textinput8tistring6WithZiFv": [91.049385, 84, 81, [12, 80]], "update__Q39textinput8tistring6WithZiFv": [97.4574, 448, 446, [13, 427]], "setElementBuffer__Q39textinput8tistring6WithZiFv": [90.33846, 65, 65, [5, 18]]}, "drops": []}
|
||||
Remote check src/keyboard/tiZiString: fetch rc=0; owned source changed=False
|
||||
ATTEMPT {"unit": "src/keyboard/tiZiString", "label": "separate named subrange pointers at reset boundary", "hash": "7eef25537b9e", "pool": 0, "functions": {"clearCandidates__Q39textinput8tistring6WithZiFv": [74.19753, 80, 81, [22, 68]], "update__Q39textinput8tistring6WithZiFv": [97.4574, 448, 446, [13, 427]], "setElementBuffer__Q39textinput8tistring6WithZiFv": [90.33846, 65, 65, [5, 18]]}, "drops": []}
|
||||
Remote check src/keyboard/tiZiString: fetch rc=0; owned source changed=False
|
||||
ATTEMPT {"unit": "src/keyboard/tiZiString", "label": "element copy captures character destination before language query", "hash": "ab37cab8091f", "pool": 0, "functions": {"clearCandidates__Q39textinput8tistring6WithZiFv": [93.28395, 84, 81, [9, 76]], "update__Q39textinput8tistring6WithZiFv": [97.4574, 448, 446, [13, 427]], "setElementBuffer__Q39textinput8tistring6WithZiFv": [90.33846, 65, 65, [5, 18]]}, "drops": []}
|
||||
Remote check src/keyboard/tiZiString: fetch rc=0; owned source changed=False
|
||||
ATTEMPT {"unit": "src/keyboard/tiZiString", "label": "context compaction uses signed remaining count and advancing cursors", "hash": "51fcf2152f15", "pool": 0, "functions": {"clearCandidates__Q39textinput8tistring6WithZiFv": [93.28395, 84, 81, [9, 76]], "update__Q39textinput8tistring6WithZiFv": [91.93946, 431, 446, [44, 424]], "setElementBuffer__Q39textinput8tistring6WithZiFv": [90.33846, 65, 65, [5, 18]]}, "drops": []}
|
||||
Remote check src/keyboard/tiString: fetch rc=0; owned source changed=False
|
||||
|
||||
## tiString inputChar
|
||||
Target sentinel guard, kana stream conversion, Hangul indexed append with dead newline compare, direct mode, virtual selection then insertion/replacement. Target Hangul count is explicitly zeroed then incremented and narrowed. New trials split stream conversion from builder and preserve real newline operation. No undefined initialization or volatile is justified.
|
||||
ATTEMPT {"unit": "src/keyboard/tiString", "label": "builder append returns current length after postincrement", "hash": "1f69839e322b", "pool": 0, "functions": {"inputChar__Q39textinput8tistring9DecolatedFw": [90.132355, 125, 136, [18, 73]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiString", "label": "newline append and ordinary append use distinct real cursor operations", "hash": "88909aaac8bf", "pool": 0, "functions": {"inputChar__Q39textinput8tistring9DecolatedFw": [92.41912, 138, 136, [13, 75]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiString", "label": "literal converter uses builder count reference with explicit newline terminator", "hash": "17f344ef34f1", "pool": 0, "functions": {"inputChar__Q39textinput8tistring9DecolatedFw": [93.44853, 138, 136, [13, 75]]}, "drops": []}
|
||||
Remote check src/scene/address/iplAddressEdit: fetch rc=0; owned source changed=False
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "layout pane wrapper with correct one-name signature", "hash": "3742b49defd2", "pool": 0, "functions": {"get_friendinfo__Q33ipl5scene11AddressEditFv": [88.03571, 82, 84, [10, 68]]}, "drops": []}
|
||||
Remote check src/keyboard/tiZiString: fetch rc=0; owned source changed=False
|
||||
ATTEMPT {"unit": "src/keyboard/tiZiString", "label": "element conversion loop tests bounded count before next input read", "hash": "87bfe2d87e70", "pool": 0, "functions": {"setElementBuffer__Q39textinput8tistring6WithZiFv": [79.95385, 65, 65, [12, 23]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiZiString", "label": "candidate case dispatch owns narrowed enum local per character", "hash": "5449e0c339c5", "pool": 0, "functions": {"update__Q39textinput8tistring6WithZiFv": [97.4574, 448, 446, [13, 427]]}, "drops": []}
|
||||
Remote check src/scene/sdChannelSelect/iplSDChannelSelect: fetch rc=0; owned source changed=False
|
||||
|
||||
## SD title collectors
|
||||
Four target CFGs increment/store title count before reloading stack totals and secondUsage; current source hoists secondUsage[0]. Same calls and instruction counts. No store/reload proves volatile. Test local usage aggregate, member predicate, and combined append/check helper with real output state. Threshold predicate preserves signed comparison and short circuit.
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "paired usage local stores blocks then bytes", "hash": "e0857bc7f297", "pool": 0, "functions": {"create__Q33ipl5scene15SDChannelSelectFv": [97.73972, 145, 146, [4, 39]], "collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [97.81188, 101, 101, [2, 4]], "collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [97.833336, 102, 102, [2, 4]], "collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [98.007935, 126, 126, [2, 7]], "collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [97.55125, 361, 361, [8, 16]], "flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv": [99.65714, 35, 35, [2, 2]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "paired usage member predicate owns threshold reads", "hash": "ede18addbd92", "pool": 0, "functions": {"create__Q33ipl5scene15SDChannelSelectFv": [97.73972, 145, 146, [4, 39]], "collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [82.57426, 90, 101, [26, 38]], "collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [82.745094, 91, 102, [26, 37]], "collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [85.79365, 115, 126, [29, 49]], "collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [82.6205, 340, 361, [137, 349]], "flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv": [99.65714, 35, 35, [2, 2]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "append count and compare through real usage pointers", "hash": "08fc403e9e1f", "pool": 0, "functions": {"create__Q33ipl5scene15SDChannelSelectFv": [97.73972, 145, 146, [4, 39]], "collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [93.09901, 105, 101, [12, 40]], "collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [93.166664, 106, 102, [12, 39]], "collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [94.230156, 130, 126, [15, 51]], "collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl": [92.27701, 377, 361, [50, 241]], "flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv": [99.65714, 35, 35, [2, 2]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
|
||||
## CandidateBox create
|
||||
Target allocator/candidate/string creation, GUI setup, text area and on/off setup, textures and two scroll controls. Remaining differences begin in nested subobject initialization. Test combined text-area initialization and const-reference caller view; real objects only.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "text-area setup helper subobject reference and layout pointer", "hash": "d39dc5d0470c", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.74148, 352, 352, [30, 225]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "text-area setup helper subobject pointer and caller pointer reference", "hash": "3bcf39719abe", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.67614, 352, 352, [24, 218]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "text-area setup helper subobject and layout references", "hash": "2f049ab6b314", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [92.42898, 349, 352, [35, 254]]}, "drops": []}
|
||||
Remote check src/keyboard/tiInputForm: fetch rc=0; owned source changed=False
|
||||
|
||||
## InputForm create
|
||||
Target row allocation/init/detach/append then handlers,font,text geometry, pane fallback and animations. Instruction count agrees; inline row temporaries and animation roles differ. New trials make row detach/append own boundaries, use a complete font-size temporary, and place the animation descriptor behind its resource method.
|
||||
BUILD FAIL src/keyboard/tiInputForm | row activation helper returns the detached initialized row | 3708f8e42440
|
||||
ATTEMPT {"unit": "src/keyboard/tiInputForm", "label": "textbox metrics preserve complete font-size value", "hash": "ecd2d497e786", "pool": 0, "functions": {"create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer": [95.25, 358, 356, [20, 273]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiInputForm", "label": "animation descriptor is a const record reference", "hash": "d4387ab7cba5", "pool": 0, "functions": {"create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer": [95.80618, 354, 356, [15, 178]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
|
||||
## src/keyboard/tiCandidateBox animation traversal
|
||||
Target pane switch, list append, resource/transform creation, optional force binding. Exact instruction count; animation record and count registers differ. Test record reference, pointer cursor, and animation count signed view after static inline trials logged in u2.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "animation reference refers directly to the real record", "hash": "dc7073759c90", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.67614, 352, 352, [24, 218]], "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [96.21759, 214, 216, [9, 107]], "CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "animation slot cursor advances once per resource", "hash": "07d29b340e23", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.67614, 352, 352, [24, 218]], "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.34259, 217, 216, [11, 129]], "CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "signed local count preserves bounded descriptor traversal", "hash": "c1cca19a71bb", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.67614, 352, 352, [24, 218]], "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [98.24074, 216, 216, [1, 64]], "CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
Remote check src/keyboard/tiSignWindow: fetch rc=0; owned source changed=False
|
||||
|
||||
## src/keyboard/tiSignWindow animation traversal
|
||||
Target pane switch, list append, resource/transform creation, optional force binding. Exact instruction count; animation record and count registers differ. Test record reference, pointer cursor, and animation count signed view after static inline trials logged in u2.
|
||||
ATTEMPT {"unit": "src/keyboard/tiSignWindow", "label": "animation reference refers directly to the real record", "hash": "d486c48a18b7", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [97.004524, 219, 221, [9, 91]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiSignWindow", "label": "animation slot cursor advances once per resource", "hash": "147f282936b7", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [93.99095, 222, 221, [11, 118]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiSignWindow", "label": "signed local count preserves bounded descriptor traversal", "hash": "7f75f87454eb", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.61539, 221, 221, [1, 6]]}, "drops": []}
|
||||
Remote check src/scene/address/iplAddress: fetch rc=0; owned source changed=False
|
||||
|
||||
## Address drag and event dispatch
|
||||
start_drag_event target validates input, records drag, changes pointer, copies nigaoe texture then resets buttons. Only icon object/pane register choices differ. onEventDerived target pane lookup then trigger/point/left arms; only saved-register allocation differs. Try actual texture-upload helper boundaries and named pane getter boundaries. No CFG or data edits retained unless exact.
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddress", "label": "drag texture helper const object and pane references", "hash": "65fc61d7019e", "pool": 0, "functions": {"start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface": [98.13453, 224, 223, [12, 98]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddress", "label": "drag texture helper const input pointer references", "hash": "3430eee0adcd", "pool": 0, "functions": {"start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface": [95.53363, 222, 223, [19, 102]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddress", "label": "drag texture helper destination-first pointer arguments", "hash": "586d680127ab", "pool": 0, "functions": {"start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface": [98.13453, 224, 223, [12, 98]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddress", "label": "event dispatch pane component helper boundary", "hash": "7ba4b1d10ac5", "pool": 0, "functions": {"onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface": [98.42593, 270, 270, [0, 81]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddress", "label": "event dispatch separate scene-base receiver", "hash": "8a0013ea082c", "pool": 0, "functions": {"onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface": [98.42593, 270, 270, [0, 81]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddress", "label": "event dispatch scoped event kind and immutable mail receiver", "hash": "9ea5da0bd02f", "pool": 0, "functions": {"onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface": [98.42593, 270, 270, [0, 81]]}, "drops": []}
|
||||
Remote check src/scene/address/iplAddressEdit: fetch rc=0; owned source changed=False
|
||||
|
||||
## AddressEdit create and update_friendinfo
|
||||
Create differs at retained text addresses and allocation-guarded balloon margin initialization. update_friendinfo differs only name-copy source/destination addi order. Test real aggregate/value boundaries for text and balloon then typed name-array copy wrapper.
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "address create typed balloon margins", "hash": "561093e749fc", "pool": 0, "functions": {"create__Q33ipl5scene11AddressEditFv": [95.75976, 812, 820, [44, 802]]}, "drops": ["main/src/scene/address/iplAddressEdit:matched_data"]}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "address create const friend-string receiver", "hash": "aff168151479", "pool": 0, "functions": {"create__Q33ipl5scene11AddressEditFv": [97.5561, 818, 820, [23, 331]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "address create inline aspect-ratio margin selector", "hash": "ce1cea65858b", "pool": 0, "functions": {"create__Q33ipl5scene11AddressEditFv": [97.5561, 818, 820, [23, 331]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "friend name copy explicit array element and size type", "hash": "ad3f28479acb", "pool": 0, "functions": {"update_friendinfo__Q33ipl5scene11AddressEditFv": [99.42105, 38, 38, [2, 2]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "friend name copy bounded array helper", "hash": "49e54118f583", "pool": 0, "functions": {"update_friendinfo__Q33ipl5scene11AddressEditFv": [99.42105, 38, 38, [2, 2]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/address/iplAddressEdit", "label": "friend name copy separate string and name receivers", "hash": "f0067f7120a0", "pool": 0, "functions": {"update_friendinfo__Q33ipl5scene11AddressEditFv": [99.42105, 38, 38, [2, 2]]}, "drops": []}
|
||||
Remote check src/scene/sdChannelSelect/iplSDChannelSelect: fetch rc=0; owned source changed=False
|
||||
|
||||
## SD create and flush
|
||||
Create target rereads System BS2 pointer at loop body after state test with no store; user rules exclude changing that pointer to volatile. Try guarded read-only state return/reference types without volatile. Flush target heap/manager argument loads differ only in order; test combined save helper and real system argument references.
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "IPL state getter returns const field reference", "hash": "8f6d87ecb07b", "pool": 0, "functions": {"create__Q33ipl5scene15SDChannelSelectFv": [97.73972, 145, 146, [4, 39]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "IPL state getter returns mutable field reference", "hash": "7582e061ac7c", "pool": 0, "functions": {"create__Q33ipl5scene15SDChannelSelectFv": [97.73972, 145, 146, [4, 39]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "IPL state getter uses read-only manager receiver", "hash": "874660af6372", "pool": 0, "functions": {"create__Q33ipl5scene15SDChannelSelectFv": [97.73972, 145, 146, [4, 39]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "flush helper manager reference", "hash": "ef9244b0431e", "pool": 0, "functions": {"flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv": [99.65714, 35, 35, [2, 2]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "flush helper heap-first formal order", "hash": "e8083fdc21d3", "pool": 0, "functions": {"flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv": [99.65714, 35, 35, [2, 2]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/scene/sdChannelSelect/iplSDChannelSelect", "label": "flush helper pointer reference formals", "hash": "934eb8e941cf", "pool": 0, "functions": {"flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv": [99.65714, 35, 35, [2, 2]]}, "drops": []}
|
||||
Remote check src/keyboard/tiInputForm: fetch rc=0; owned source changed=False
|
||||
ATTEMPT {"unit": "src/keyboard/tiInputForm", "label": "row activation helper receives real row storage and capacity", "hash": "5ac7f498e1e9", "pool": 0, "functions": {"create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer": [96.45786, 356, 356, [6, 149]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCellPhone: fetch rc=0; owned source changed=False
|
||||
|
||||
## CellPhone onKey and create
|
||||
onKey target validates lock then trigger key/control handling, language holding-key selection and confirm payloads, release reset. Saved-register table/event roles differ. create target two pane loops, resource/transform animation binding, textures and language/init. Toggle descriptor and animation offset swap. Try meaningful enum/table receiver boundaries and isolate toggle animation binding loop.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCellPhone", "label": "onKey enum control key local", "hash": "99bd10baad72", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.67009, 682, 682, [0, 37]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCellPhone", "label": "onKey input mode enum local", "hash": "d9cf8d314a74", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.67009, 682, 682, [0, 37]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCellPhone", "label": "onKey scoped language record reference", "hash": "9d3fd7e36464", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.67009, 682, 682, [0, 37]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCellPhone", "label": "toggle animation helper layout first", "hash": "7c304257af39", "pool": 0, "functions": {"create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [91.663666, 335, 333, [23, 234]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCellPhone", "label": "toggle animation helper descriptor first", "hash": "d656bd0be799", "pool": 0, "functions": {"create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [91.663666, 335, 333, [23, 234]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCellPhone", "label": "toggle animation helper references to live pane and resource objects", "hash": "8d6d17338afa", "pool": 0, "functions": {"create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [91.663666, 335, 333, [23, 234]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
|
||||
## CalcPaneLocate
|
||||
Target clears panes then backward/forward text placement and selected animations. Eleven forward-path FP register operands differ. Test real Size local construction and distinct forward translation fields, after prior helpers yielded no exact result.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward pane geometry width declaration before captured size", "hash": "e1a7808331de", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward pane geometry explicit text Size value", "hash": "ca3aeaa325f6", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.97241, 435, 435, [12, 12]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward pane geometry shared position vector", "hash": "0d6dbb0dc7a2", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.28276, 433, 435, [55, 158]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
|
||||
## CalcPaneLocate follow-up
|
||||
Explicit Size field assignment raised objdiff to 99.97241 with identical instruction/register sequence except twelve stack offsets. Named textSize allocated before unnamed temporaries shifts their homes. Try returning the actual Size value through an inline helper, then field-by-field SetSize helper, preserving exact object count and data.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward text Size inline return assigned fields", "hash": "c2f52580b12b", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward text Size inline pane setter owns fields", "hash": "a7412d643818", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.85517, 435, 435, [7, 16]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward text Size inline copy height from Size reference", "hash": "0f89c2124516", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.312645, 436, 435, [6, 119]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward text Size inline return constructed value", "hash": "ac861e0599f4", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward text Size inline setter accepts references", "hash": "1c8f41f94c78", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [98.933334, 436, 435, [13, 149]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
|
||||
Stack follow-up: target unnamed temporary homes in execution order are clear bound Size 0x48, backward text Size 0x40, bound Size 0x38, translations 0x30 and 0x28, forward text Size 0x20. The explicit forward Size takes 0x48 while compiler temporaries shift down. Test naming the preceding five actual geometry temporaries in that same source order, with no extra objects or padding.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "name preceding geometry temporaries with constructors", "hash": "ff8fe51e7f0b", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.96322, 435, 435, [277, 16]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "name preceding geometry temporaries with Size field assignments", "hash": "59ee53a26e51", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.96322, 435, 435, [277, 16]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "name preceding geometry temporaries and all following temporary objects", "hash": "6884f789b083", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.96322, 435, 435, [277, 16]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "name preceding geometry temporaries with immediate translation scopes", "hash": "711bf964bbf1", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.96322, 435, 435, [277, 16]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
Named geometry trial has only sixteen stack-address differences. Target captures both original pane Size values in the first two stack homes. Declare those two real values before emitted geometry temporaries, assigning at original GetSize calls; no dummy slots, added objects or uninitialized reads.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "original pane sizes declared before placement temporaries 0", "hash": "0ddc3f6b1e0a", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [98.7954, 440, 435, [14, 404]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "original pane sizes declared before placement temporaries 1", "hash": "20648e459004", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [98.8023, 440, 435, [11, 404]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "original pane sizes declared before placement temporaries 2", "hash": "a59038511d75", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [98.7954, 440, 435, [14, 404]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
Constructor follow-up: field assignment gives correct forward FP roles; test Size constructor body forms under a TU-only macro so temporary lifetime stays unchanged. Also test modifying the captured Size and passing its actual copy. No default initialization is removed.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "TU-only Size constructor 0", "hash": "c768604727d3", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.67614, 352, 352, [24, 218]], "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [98.49537, 216, 216, [0, 64]], "CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "TU-only Size constructor 1", "hash": "e974015b60ef", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.67614, 352, 352, [24, 218]], "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [98.49537, 216, 216, [0, 64]], "setLanguage__Q39textinput12candidatebox12LayoutByNW4RFQ29textinput8Language": [99.0, 246, 246, [21, 45]], "CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.848274, 435, 435, [6, 14]]}, "drops": ["main/src/keyboard/tiCandidateBox:matched_code", "main/src/keyboard/tiCandidateBox:matched_functions", "setLanguage__Q39textinput12candidatebox12LayoutByNW4RFQ29textinput8Language"]}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "TU-only Size constructor 2", "hash": "ae51c2388a65", "pool": 0, "functions": {"create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [93.67614, 352, 352, [24, 218]], "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator": [98.49537, 216, 216, [0, 64]], "CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "forward width replaces captured Size before copy construction", "hash": "3e4eae3e1fa3", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [98.72414, 437, 435, [7, 126]]}, "drops": []}
|
||||
Remote check src/keyboard/tiCandidateBox: fetch rc=0; owned source changed=False
|
||||
Final geometry boundary tests: route real Size and VEC2 temporaries through inline setters, so all temporary allocations occur after captured pane-size locals. Test width/height input forms without packing a stack-layout struct or changing constructors.
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "all geometry temporary setters width and height", "hash": "64f6c0e9aa70", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "all geometry temporary setters height and width", "hash": "286c7f42971b", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "all geometry temporary setters captured Size reference and width", "hash": "5797c2c9dadd", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [100.0, 435, 435, [0, 0]]}, "drops": []}
|
||||
|
||||
## Register-only final classification
|
||||
start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface: structural 0 exact 7
|
||||
onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface: structural 0 exact 81
|
||||
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv: structural 0 exact 37
|
||||
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator: structural 0 exact 7
|
||||
createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator: structural 0 exact 64
|
||||
CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv: structural 0 exact 11
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator: structural 0 exact 6
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "minimize exact helper remove position helper", "hash": "98ce3525c377", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.95862, 435, 435, [21, 18]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "minimize exact helper forward sizes only", "hash": "eb543b51eec5", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.981606, 435, 435, [11, 8]]}, "drops": []}
|
||||
ATTEMPT {"unit": "src/keyboard/tiCandidateBox", "label": "minimize exact helper constructor spelling", "hash": "f7e14954e2df", "pool": 0, "functions": {"CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv": [99.873566, 435, 435, [0, 11]]}, "drops": []}
|
||||
|
||||
## Exact result
|
||||
CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv reaches 100.0%, 435/435 instructions and ctxdiff diffs 0 with inline pane geometry setters. The size setter accepts the actual captured Size by const reference and preserves its height; the position setter constructs the actual VEC2. This recovers both FP register roles and original temporary stack allocation. No extra/dummy geometry objects, uninitialized values, pragmas, metadata changes, or new assembly. Original stale NONMATCHING comments removed.
|
||||
|
||||
## Coverage audit
|
||||
All 23 originally open functions have at least three distinct successfully compiled source-level attempts. For SD create, the three TU-guarded getIPLState definition variants are the three attempts. For inputChar, the three CharacterOutput implementation variants are the three attempts. clearCandidates has typed storage/input-reference/reset-pointer variants; update and setElementBuffer each have storage-layout plus two separate body variants. Every other open function has at least three distinct body variants. Failed builds do not count. All failed/nonexact experiments restored; only exact CandidateBox geometry change retained.
|
||||
The target disasm_fn helper stops at unsupported paired-single instructions in FP functions. Instruction counts use per-word decoding in ctxdiff/declsearch and objdiff symbol sizes; raw target listings alone are not counted.
|
||||
All ten documented levers reviewed. eZiText-only lever 7 is inapplicable. Reference index has no matching app-source prior art. Existing target counts/branch conditions ruled out CTR rewrites. No target proof supports uninitialized or volatile changes; mpBS2Manager unchanged. Most new work uses inline boundaries, const views, types and actual local lifetimes, then register-only scoring.
|
||||
|
||||
## Final full clean gate
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiCandidateBox] pool: IDENTICAL
|
||||
[src/keyboard/tiCandidateBox] objdiff: code 21728/24000 data 4652/4652 functions 110/112 fuzzy 99.5748 linked code 0
|
||||
[src/keyboard/tiCandidateBox] instruction-exact functions: 109/112
|
||||
[src/keyboard/tiCandidateBox] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .data size 3488 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .rodata size 1048 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .sdata size 32 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .sdata2 size 80 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .text size 24000 match 99.57484
|
||||
[src/keyboard/tiCandidateBox] below 100: create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 93.67614
|
||||
[src/keyboard/tiCandidateBox] below 100: createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 98.49537
|
||||
[src/keyboard/tiCandidateBox] baseline: code 19988/24000 data 4652 functions 109 fuzzy 99.5657
|
||||
[src/keyboard/tiInputForm] pool: IDENTICAL
|
||||
[src/keyboard/tiInputForm] objdiff: code 47928/50656 data 3772/3772 functions 219/221 fuzzy 99.7200 linked code 0
|
||||
[src/keyboard/tiInputForm] instruction-exact functions: 217/221
|
||||
[src/keyboard/tiInputForm] section .bss size 96 match 100.0
|
||||
[src/keyboard/tiInputForm] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiInputForm] section .data size 2736 match 100.0
|
||||
[src/keyboard/tiInputForm] section .rodata size 760 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sbss size 32 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata size 40 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata2 size 104 match 100.0
|
||||
[src/keyboard/tiInputForm] section .text size 50656 match 99.71999
|
||||
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 93.05215
|
||||
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 96.40169
|
||||
[src/keyboard/tiInputForm] baseline: code 47928/50656 data 3772 functions 219 fuzzy 99.7200
|
||||
[src/keyboard/tiCellPhone] pool: IDENTICAL
|
||||
[src/keyboard/tiCellPhone] objdiff: code 14968/19028 data 3860/3860 functions 84/86 fuzzy 99.9453 linked code 0
|
||||
[src/keyboard/tiCellPhone] instruction-exact functions: 84/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.94534
|
||||
[src/keyboard/tiCellPhone] below 100: onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009
|
||||
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949
|
||||
[src/keyboard/tiCellPhone] baseline: code 14968/19028 data 3860 functions 84 fuzzy 99.9453
|
||||
[src/keyboard/tiZiString] pool: IDENTICAL
|
||||
[src/keyboard/tiZiString] objdiff: code 3136/5504 data 7680/7680 functions 26/29 fuzzy 98.3241 linked code 0
|
||||
[src/keyboard/tiZiString] instruction-exact functions: 26/29
|
||||
[src/keyboard/tiZiString] section .bss size 7296 match 100.0
|
||||
[src/keyboard/tiZiString] section .data size 328 match 100.0
|
||||
[src/keyboard/tiZiString] section .rodata size 56 match 100.0
|
||||
[src/keyboard/tiZiString] section .text size 5504 match 98.32413
|
||||
[src/keyboard/tiZiString] below 100: clearCandidates__Q39textinput8tistring6WithZiFv 93.28395
|
||||
[src/keyboard/tiZiString] below 100: update__Q39textinput8tistring6WithZiFv 97.4574
|
||||
[src/keyboard/tiZiString] below 100: setElementBuffer__Q39textinput8tistring6WithZiFv 90.33846
|
||||
[src/keyboard/tiZiString] baseline: code 3136/5504 data 7680 functions 26 fuzzy 98.3241
|
||||
[src/keyboard/tiString] pool: IDENTICAL
|
||||
[src/keyboard/tiString] objdiff: code 4632/5176 data 288/288 functions 41/42 fuzzy 99.0286 linked code 0
|
||||
[src/keyboard/tiString] instruction-exact functions: 41/42
|
||||
[src/keyboard/tiString] section .data size 288 match 100.0
|
||||
[src/keyboard/tiString] section .text size 5176 match 99.028595
|
||||
[src/keyboard/tiString] below 100: inputChar__Q39textinput8tistring9DecolatedFw 90.757355
|
||||
[src/keyboard/tiString] baseline: code 4632/5176 data 288 functions 41 fuzzy 99.0286
|
||||
[src/keyboard/tiSignWindow] pool: IDENTICAL
|
||||
[src/keyboard/tiSignWindow] objdiff: code 6300/7184 data 3468/3468 functions 55/56 fuzzy 99.9833 linked code 0
|
||||
[src/keyboard/tiSignWindow] instruction-exact functions: 55/56
|
||||
[src/keyboard/tiSignWindow] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .data size 2672 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .rodata size 784 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .sdata size 8 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .text size 7184 match 99.9833
|
||||
[src/keyboard/tiSignWindow] below 100: create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425
|
||||
[src/keyboard/tiSignWindow] baseline: code 6300/7184 data 3468 functions 55 fuzzy 99.9833
|
||||
[src/scene/address/iplAddress] pool: IDENTICAL
|
||||
[src/scene/address/iplAddress] objdiff: code 22016/23988 data 1964/1964 functions 99/101 fuzzy 99.9233 linked code 0
|
||||
[src/scene/address/iplAddress] instruction-exact functions: 98/101
|
||||
[src/scene/address/iplAddress] section .ctors size 4 match 100.0
|
||||
[src/scene/address/iplAddress] section .data size 1880 match 100.0
|
||||
[src/scene/address/iplAddress] section .rodata size 24 match 100.0
|
||||
[src/scene/address/iplAddress] section .sbss size 8 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata size 16 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata2 size 32 match 100.0
|
||||
[src/scene/address/iplAddress] section .text size 23988 match 99.923294
|
||||
[src/scene/address/iplAddress] below 100: start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.84305
|
||||
[src/scene/address/iplAddress] below 100: onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 98.42593
|
||||
[src/scene/address/iplAddress] baseline: code 22016/23988 data 1964 functions 99 fuzzy 99.9233
|
||||
[src/scene/address/iplAddressEdit] pool: IDENTICAL
|
||||
[src/scene/address/iplAddressEdit] objdiff: code 23344/27112 data 2560/2560 functions 91/94 fuzzy 99.5528 linked code 0
|
||||
[src/scene/address/iplAddressEdit] instruction-exact functions: 91/94
|
||||
[src/scene/address/iplAddressEdit] section .bss size 320 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .data size 2152 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .rodata size 40 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .sdata size 24 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .sdata2 size 24 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .text size 27112 match 99.55282
|
||||
[src/scene/address/iplAddressEdit] below 100: create__Q33ipl5scene11AddressEditFv 97.5561
|
||||
[src/scene/address/iplAddressEdit] below 100: get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571
|
||||
[src/scene/address/iplAddressEdit] below 100: update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105
|
||||
[src/scene/address/iplAddressEdit] baseline: code 23344/27112 data 2560 functions 91 fuzzy 99.5528
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] pool: IDENTICAL
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] objdiff: code 30344/33828 data 2960/2960 functions 123/129 fuzzy 99.7731 linked code 0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] instruction-exact functions: 123/129
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .data size 2736 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .rodata size 64 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata2 size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .text size 33828 match 99.77309
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: create__Q33ipl5scene15SDChannelSelectFv 97.73972
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 98.007935
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] baseline: code 30344/33828 data 2960 functions 123 fuzzy 99.7731
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.26770 -> 92.32580
|
||||
global fuzzy_match_percent: 99.73349 -> 99.73356
|
||||
global complete_code_percent: 74.91312 -> 74.91312
|
||||
global matched_data_percent: 99.78196 -> 99.78196
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
Explicit build/43U/ok passed. Final ctxdiff is 435/435 instructions, diffs 0. Exact objdiff 100.0%. No metadata/header/configure changes survived. All nine pools identical and data metrics 100%; zero global regressions, forbidden additions or readability warnings.
|
||||
|
||||
## Remaining functions
|
||||
create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 93.67614%: inline subobject initialization. At least three compiled attempts; reverted.
|
||||
createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 98.49537%: animation descriptor/count register allocation. At least three compiled attempts; reverted.
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff 93.05215%: glyph geometry FP scheduling. At least three compiled attempts; reverted.
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 96.40169%: row activation and animation register allocation. At least three compiled attempts; reverted.
|
||||
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009%: key/table/event register allocation. At least three compiled attempts; reverted.
|
||||
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949%: toggle descriptor/offset register allocation. At least three compiled attempts; reverted.
|
||||
clearCandidates__Q39textinput8tistring6WithZiFv 93.28395%: shared buffer base lifetime. At least three compiled attempts; reverted.
|
||||
update__Q39textinput8tistring6WithZiFv 97.4574%: buffer/context and candidate-loop lifetimes. At least three compiled attempts; reverted.
|
||||
setElementBuffer__Q39textinput8tistring6WithZiFv 90.33846%: buffer base and index register allocation. At least three compiled attempts; reverted.
|
||||
inputChar__Q39textinput8tistring9DecolatedFw 90.757355%: literal Hangul converter index operations. At least three compiled attempts; reverted.
|
||||
create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425%: animation count/descriptor register allocation. At least three compiled attempts; reverted.
|
||||
start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.84305%: icon object/pane register allocation. At least three compiled attempts; reverted.
|
||||
onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 98.42593%: event/mode saved-register allocation. At least three compiled attempts; reverted.
|
||||
create__Q33ipl5scene11AddressEditFv 97.5561%: text address lifetimes and balloon margin scheduling. At least three compiled attempts; reverted.
|
||||
get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571%: text address retained across virtual pane lookup. At least three compiled attempts; reverted.
|
||||
update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105%: source/destination address-load order. At least three compiled attempts; reverted.
|
||||
create__Q33ipl5scene15SDChannelSelectFv 97.73972%: BS2 loop pointer reload. At least three compiled attempts; reverted.
|
||||
collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188%: count store/threshold-load order. At least three compiled attempts; reverted.
|
||||
collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336%: count store/threshold-load order. At least three compiled attempts; reverted.
|
||||
collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 98.007935%: channel addressing and count/threshold-load order. At least three compiled attempts; reverted.
|
||||
collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125%: count store/threshold-load order. At least three compiled attempts; reverted.
|
||||
flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714%: save manager/heap argument-load order. At least three compiled attempts; reverted.
|
||||
|
||||
80 successful source trials; three earlier compile failures excluded. Minimization checks confirm that removing the position helper, limiting setters to forward placement, or replacing field assignments with a constructor loses exactness. New helpers are static inline and emit no added standalone function. All 22 remaining objdiff-open functions have their required attempt coverage.
|
||||
Uncertainty: gate instruction-exact counts have four existing disassembler discrepancies in functions objdiff scores 100; these predate the change. The new function passes both metrics. Awaiting independent parent verification; this is one function gain, not unit/project completion.
|
||||
@@ -1,444 +0,0 @@
|
||||
# a23m max round
|
||||
|
||||
|
||||
|
||||
Base 5473a84f21b7777ae6eecd3207913d60bf3716a0. Fresh origin fetch checked. Latest user scope selects 2-3 closest functions; focus on CellPhone onKey, CellPhone create and SignWindow create. Prior u2, a23h2 and a23x logs stay untracked. Read-only references: local AGENTS, a23h prompt, all ten levers, effort policy, a23h/u2/a23h2/a23x and historical target-specific logs. No tiPcKeyboard or BS2 volatility changes.
|
||||
|
||||
|
||||
|
||||
Baseline follows.
|
||||
|
||||
src/keyboard/tiCandidateBox: POOL IDENTICAL up to 57 (mine=57 base=57); instruction-exact 109/112; {"fuzzy_match_percent": 99.71067, "total_code": "24000", "matched_code": "21728", "matched_code_percent": 90.53333, "total_data": "4652", "matched_data": "4652", "matched_data_percent": 100.0, "total_functions": 112, "matched_functions": 110, "matched_functions_percent": 98.21429, "total_units": 1}
|
||||
|
||||
OPEN create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 95.99148
|
||||
|
||||
OPEN createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 98.49537
|
||||
|
||||
src/keyboard/tiInputForm: POOL IDENTICAL up to 20 (mine=20 base=20); instruction-exact 217/221; {"fuzzy_match_percent": 99.71999, "total_code": "50656", "matched_code": "47928", "matched_code_percent": 94.614655, "total_data": "3772", "matched_data": "3772", "matched_data_percent": 100.0, "total_functions": 221, "matched_functions": 219, "matched_functions_percent": 99.095024, "total_units": 1}
|
||||
|
||||
OPEN calcCursorPos__Q39textinput9inputform4BaseFff 93.05215
|
||||
|
||||
OPEN create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 96.40169
|
||||
|
||||
src/keyboard/tiCellPhone: POOL IDENTICAL up to 76 (mine=76 base=76); instruction-exact 84/86; {"fuzzy_match_percent": 99.94534, "total_code": "19028", "matched_code": "14968", "matched_code_percent": 78.663025, "total_data": "3860", "matched_data": "3860", "matched_data_percent": 100.0, "total_functions": 86, "matched_functions": 84, "matched_functions_percent": 97.674416, "total_units": 1}
|
||||
|
||||
OPEN onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv 99.67009
|
||||
|
||||
OPEN create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949
|
||||
|
||||
src/keyboard/tiZiString: POOL IDENTICAL up to 0 (mine=0 base=0); instruction-exact 26/29; {"fuzzy_match_percent": 98.32413, "total_code": "5504", "matched_code": "3136", "matched_code_percent": 56.97674, "total_data": "7680", "matched_data": "7680", "matched_data_percent": 100.0, "total_functions": 29, "matched_functions": 26, "matched_functions_percent": 89.655174, "total_units": 1}
|
||||
|
||||
OPEN clearCandidates__Q39textinput8tistring6WithZiFv 93.28395
|
||||
|
||||
OPEN update__Q39textinput8tistring6WithZiFv 97.4574
|
||||
|
||||
OPEN setElementBuffer__Q39textinput8tistring6WithZiFv 90.33846
|
||||
|
||||
src/keyboard/tiString: POOL IDENTICAL up to 0 (mine=0 base=0); instruction-exact 41/42; {"fuzzy_match_percent": 99.028595, "total_code": "5176", "matched_code": "4632", "matched_code_percent": 89.48995, "total_data": "288", "matched_data": "288", "matched_data_percent": 100.0, "total_functions": 42, "matched_functions": 41, "matched_functions_percent": 97.61904, "total_units": 1}
|
||||
|
||||
OPEN inputChar__Q39textinput8tistring9DecolatedFw 90.757355
|
||||
|
||||
src/keyboard/tiSignWindow: POOL IDENTICAL up to 30 (mine=30 base=30); instruction-exact 55/56; {"fuzzy_match_percent": 99.9833, "total_code": "7184", "matched_code": "6300", "matched_code_percent": 87.69488, "total_data": "3468", "matched_data": "3468", "matched_data_percent": 100.0, "total_functions": 56, "matched_functions": 55, "matched_functions_percent": 98.21429, "total_units": 1}
|
||||
|
||||
OPEN create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425
|
||||
|
||||
src/scene/address/iplAddress: POOL IDENTICAL up to 81 (mine=81 base=81); instruction-exact 98/101; {"fuzzy_match_percent": 99.923294, "total_code": "23988", "matched_code": "22016", "matched_code_percent": 91.77922, "total_data": "1964", "matched_data": "1964", "matched_data_percent": 100.0, "total_functions": 101, "matched_functions": 99, "matched_functions_percent": 98.019806, "total_units": 1}
|
||||
|
||||
OPEN start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.84305
|
||||
|
||||
OPEN onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 98.42593
|
||||
|
||||
src/scene/address/iplAddressEdit: POOL IDENTICAL up to 57 (mine=57 base=57); instruction-exact 91/94; {"fuzzy_match_percent": 99.55282, "total_code": "27112", "matched_code": "23344", "matched_code_percent": 86.10209, "total_data": "2560", "matched_data": "2560", "matched_data_percent": 100.0, "total_functions": 94, "matched_functions": 91, "matched_functions_percent": 96.80851, "total_units": 1}
|
||||
|
||||
OPEN create__Q33ipl5scene11AddressEditFv 97.5561
|
||||
|
||||
OPEN get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571
|
||||
|
||||
OPEN update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105
|
||||
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect: POOL IDENTICAL up to 101 (mine=101 base=101); instruction-exact 123/129; {"fuzzy_match_percent": 99.77309, "total_code": "33828", "matched_code": "30344", "matched_code_percent": 89.70084, "total_data": "2960", "matched_data": "2960", "matched_data_percent": 100.0, "total_functions": 129, "matched_functions": 123, "matched_functions_percent": 95.34883, "total_units": 1}
|
||||
|
||||
OPEN create__Q33ipl5scene15SDChannelSelectFv 97.73972
|
||||
|
||||
OPEN collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188
|
||||
|
||||
OPEN collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336
|
||||
|
||||
OPEN collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 98.007935
|
||||
|
||||
OPEN collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125
|
||||
|
||||
OPEN flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714
|
||||
|
||||
## CellPhone onKey
|
||||
|
||||
Resumed a23x four-operand patch as a starting point, not a repeated new trial. Source implements control-key dispatch, normal holding-key cycling, predictive numeric conversion, then release confirmation. The last inline getInputType holds the keyset across language queries. Prior read-only/reference/type-query wrappers all retained r20 where the target uses r19. New focus: method implementation boundaries and ownership of the complete release operation. No prior-art match in the supplied index.
|
||||
|
||||
ATTEMPT {"label": "resume prior four-operand candidate; baseline only", "hash": "3f53d21fff3f", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.95601, 682, 682, 4], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "14968", "data": "3860"}
|
||||
|
||||
Live reconstruction differs from a23x notes: the resumed patch has four differences at indices 146,149,150,154, all in the first holding-key lookup. Target holds keys in r21 and displacement in r19; source uses keys r19 and displacement r21. Last getInputType now matches. This new live evidence directs first lookup ownership experiments; old classifier trials are excluded.
|
||||
|
||||
ATTEMPT {"label": "holding lookup nests the mode-table accessor in the existing search", "hash": "0d2acbe96650", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.95601, 682, 682, 4], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "14968", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "holding lookup owns counter before table extraction in a dedicated helper", "hash": "16e37c32ea58", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.941345, 682, 682, 7], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "14968", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "holding lookup keeps bounded key-array reference through the existing search", "hash": "d574cc3409fe", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.978004, 682, 682, 3], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "14968", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "holding lookup references the actual table pointer field", "hash": "b167bf267fd8", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.941345, 682, 682, 7], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "14968", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "holding lookup snapshots keyset reference before its character array", "hash": "5136600ac69a", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.978004, 682, 682, 3], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "14968", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "holding lookup const pointer lifetime begins with mode selection", "hash": "58c0538d79fe", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [99.95601, 682, 682, 4], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "14968", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "holding lookup search receives const keyset and owns pointer snapshot", "hash": "4d35d7b79ab5", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
Exact candidate: first holding lookup now receives a const KeySet reference and owns its pointer snapshot and u16 search index. This restores r21 keys/r19 displacement without changing control flow, calls, data or any original exact sibling. Objdiff onKey 100.0; ctxdiff independently required below.
|
||||
|
||||
## First exact candidate full clean gate
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiCandidateBox] pool: IDENTICAL
|
||||
[src/keyboard/tiCandidateBox] objdiff: code 21728/24000 data 4652/4652 functions 110/112 fuzzy 99.7107 linked code 0
|
||||
[src/keyboard/tiCandidateBox] instruction-exact functions: 109/112
|
||||
[src/keyboard/tiCandidateBox] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .data size 3488 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .rodata size 1048 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .sdata size 32 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .sdata2 size 80 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .text size 24000 match 99.71067
|
||||
[src/keyboard/tiCandidateBox] below 100: create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 95.99148
|
||||
[src/keyboard/tiCandidateBox] below 100: createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 98.49537
|
||||
[src/keyboard/tiCandidateBox] baseline: code 21728/24000 data 4652 functions 110 fuzzy 99.7107
|
||||
[src/keyboard/tiInputForm] pool: IDENTICAL
|
||||
[src/keyboard/tiInputForm] objdiff: code 47928/50656 data 3772/3772 functions 219/221 fuzzy 99.7200 linked code 0
|
||||
[src/keyboard/tiInputForm] instruction-exact functions: 217/221
|
||||
[src/keyboard/tiInputForm] section .bss size 96 match 100.0
|
||||
[src/keyboard/tiInputForm] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiInputForm] section .data size 2736 match 100.0
|
||||
[src/keyboard/tiInputForm] section .rodata size 760 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sbss size 32 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata size 40 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata2 size 104 match 100.0
|
||||
[src/keyboard/tiInputForm] section .text size 50656 match 99.71999
|
||||
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 93.05215
|
||||
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 96.40169
|
||||
[src/keyboard/tiInputForm] baseline: code 47928/50656 data 3772 functions 219 fuzzy 99.7200
|
||||
[src/keyboard/tiCellPhone] pool: IDENTICAL
|
||||
[src/keyboard/tiCellPhone] objdiff: code 17696/19028 data 3860/3860 functions 85/86 fuzzy 99.9926 linked code 0
|
||||
[src/keyboard/tiCellPhone] instruction-exact functions: 85/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.992645
|
||||
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949
|
||||
[src/keyboard/tiCellPhone] baseline: code 14968/19028 data 3860 functions 84 fuzzy 99.9453
|
||||
[src/keyboard/tiZiString] pool: IDENTICAL
|
||||
[src/keyboard/tiZiString] objdiff: code 3136/5504 data 7680/7680 functions 26/29 fuzzy 98.3241 linked code 0
|
||||
[src/keyboard/tiZiString] instruction-exact functions: 26/29
|
||||
[src/keyboard/tiZiString] section .bss size 7296 match 100.0
|
||||
[src/keyboard/tiZiString] section .data size 328 match 100.0
|
||||
[src/keyboard/tiZiString] section .rodata size 56 match 100.0
|
||||
[src/keyboard/tiZiString] section .text size 5504 match 98.32413
|
||||
[src/keyboard/tiZiString] below 100: clearCandidates__Q39textinput8tistring6WithZiFv 93.28395
|
||||
[src/keyboard/tiZiString] below 100: update__Q39textinput8tistring6WithZiFv 97.4574
|
||||
[src/keyboard/tiZiString] below 100: setElementBuffer__Q39textinput8tistring6WithZiFv 90.33846
|
||||
[src/keyboard/tiZiString] baseline: code 3136/5504 data 7680 functions 26 fuzzy 98.3241
|
||||
[src/keyboard/tiString] pool: IDENTICAL
|
||||
[src/keyboard/tiString] objdiff: code 4632/5176 data 288/288 functions 41/42 fuzzy 99.0286 linked code 0
|
||||
[src/keyboard/tiString] instruction-exact functions: 41/42
|
||||
[src/keyboard/tiString] section .data size 288 match 100.0
|
||||
[src/keyboard/tiString] section .text size 5176 match 99.028595
|
||||
[src/keyboard/tiString] below 100: inputChar__Q39textinput8tistring9DecolatedFw 90.757355
|
||||
[src/keyboard/tiString] baseline: code 4632/5176 data 288 functions 41 fuzzy 99.0286
|
||||
[src/keyboard/tiSignWindow] pool: IDENTICAL
|
||||
[src/keyboard/tiSignWindow] objdiff: code 6300/7184 data 3468/3468 functions 55/56 fuzzy 99.9833 linked code 0
|
||||
[src/keyboard/tiSignWindow] instruction-exact functions: 55/56
|
||||
[src/keyboard/tiSignWindow] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .data size 2672 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .rodata size 784 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .sdata size 8 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .text size 7184 match 99.9833
|
||||
[src/keyboard/tiSignWindow] below 100: create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425
|
||||
[src/keyboard/tiSignWindow] baseline: code 6300/7184 data 3468 functions 55 fuzzy 99.9833
|
||||
[src/scene/address/iplAddress] pool: IDENTICAL
|
||||
[src/scene/address/iplAddress] objdiff: code 22016/23988 data 1964/1964 functions 99/101 fuzzy 99.9233 linked code 0
|
||||
[src/scene/address/iplAddress] instruction-exact functions: 98/101
|
||||
[src/scene/address/iplAddress] section .ctors size 4 match 100.0
|
||||
[src/scene/address/iplAddress] section .data size 1880 match 100.0
|
||||
[src/scene/address/iplAddress] section .rodata size 24 match 100.0
|
||||
[src/scene/address/iplAddress] section .sbss size 8 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata size 16 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata2 size 32 match 100.0
|
||||
[src/scene/address/iplAddress] section .text size 23988 match 99.923294
|
||||
[src/scene/address/iplAddress] below 100: start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.84305
|
||||
[src/scene/address/iplAddress] below 100: onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 98.42593
|
||||
[src/scene/address/iplAddress] baseline: code 22016/23988 data 1964 functions 99 fuzzy 99.9233
|
||||
[src/scene/address/iplAddressEdit] pool: IDENTICAL
|
||||
[src/scene/address/iplAddressEdit] objdiff: code 23344/27112 data 2560/2560 functions 91/94 fuzzy 99.5528 linked code 0
|
||||
[src/scene/address/iplAddressEdit] instruction-exact functions: 91/94
|
||||
[src/scene/address/iplAddressEdit] section .bss size 320 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .data size 2152 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .rodata size 40 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .sdata size 24 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .sdata2 size 24 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .text size 27112 match 99.55282
|
||||
[src/scene/address/iplAddressEdit] below 100: create__Q33ipl5scene11AddressEditFv 97.5561
|
||||
[src/scene/address/iplAddressEdit] below 100: get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571
|
||||
[src/scene/address/iplAddressEdit] below 100: update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105
|
||||
[src/scene/address/iplAddressEdit] baseline: code 23344/27112 data 2560 functions 91 fuzzy 99.5528
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] pool: IDENTICAL
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] objdiff: code 30344/33828 data 2960/2960 functions 123/129 fuzzy 99.7731 linked code 0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] instruction-exact functions: 123/129
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .data size 2736 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .rodata size 64 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata2 size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .text size 33828 match 99.77309
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: create__Q33ipl5scene15SDChannelSelectFv 97.73972
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 98.007935
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] baseline: code 30344/33828 data 2960 functions 123 fuzzy 99.7731
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.44372 -> 92.53480
|
||||
global fuzzy_match_percent: 99.73527 -> 99.73559
|
||||
global complete_code_percent: 76.18478 -> 76.18478
|
||||
global matched_data_percent: 99.78196 -> 99.78196
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
|
||||
```
|
||||
Independent post-clean ctxdiff: src 0xaa8 base 0xaa8 insns 682/682, diffs 0. Pool identical 76/76. CellPhone instruction-exact 84/86 -> 85/86; matched code 14968 -> 17696; data 3860/3860. Full gate passes with no regressions, forbidden additions or readability warnings and required DOL SHA1.
|
||||
|
||||
## CellPhone create
|
||||
|
||||
Refetched origin before starting; source/header unchanged remotely. Target is 333 instructions, stack 0x60, two construction/animation loops and three texture snapshots. Only toggle-row r18 and animation byte offset r16 are swapped. Pool 76/76 and data 3860/3860. New tiPcKeyboard precedent suggests declaration/definition boundaries; prior table views, const resource inputs, whole animation helpers and declaration permutations are excluded. Existing TI_CELLPHONE_IMPLEMENTATION and TI_CELLPHONE_MATCH_LAYOUT are defined only by this source, so guarded header changes cannot affect another translation unit. No reload or uninitialized-path evidence supports qualifiers or uninitialized values.
|
||||
|
||||
ATTEMPT {"label": "layout getter declared in header and defined inline in this source", "hash": "826e3e9b2fce", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "toggle pane constructor defined inline beside layout creation", "hash": "8e0261e135be", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "both pane constructors defined inline beside layout creation", "hash": "f5e5a3f9dfcb", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
Getter/constructor declaration boundaries did not resolve the seven toggle-loop operands. Next boundary is a const reference to the complete animation table, matching the successful keyset ownership change while preserving independently reloaded row fields. No metadata changes.
|
||||
|
||||
ATTEMPT {"label": "toggle resource names and ids use independent descriptor accessor calls", "hash": "dd6d7cfb6fe9", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "toggle animation descriptor owns filename and animation accessors", "hash": "07a960fa68ea", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.8949, 333, 333, 7]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "toggle pane descriptor comes from const row accessor", "hash": "2382b82f734e", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [99.66967, 333, 333, 21]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "toggle pane construction and binding own member helper", "hash": "cbc324a1fe10", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [98.31832, 333, 333, 90]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "normal pane construction and binding own member helper", "hash": "5239ac30b2d7", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [98.093094, 333, 333, 121]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
ATTEMPT {"label": "normal and toggle pane loops own separate member helpers", "hash": "5ab768a13034", "unit": "src/keyboard/tiCellPhone", "pool": 0, "functions": {"onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv": [100.0, 682, 682, 0], "create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator": [97.53754, 333, 333, 142]}, "drops": [], "code": "17696", "data": "3860"}
|
||||
|
||||
## SignWindow create
|
||||
|
||||
Origin refetched; SignWindow source and headers unchanged. Target frame 0x50 and 221 instructions, switch over pane type with three typed allocations, append, snapshot force name/count, and animation-resource loop, then init. Source differs only at six operands: count r22 versus target r31, and pointer-slot base r31 versus target r22. New inline accessor/constructor declaration boundaries are distinct from earlier slot-view, count-wrapper and whole inner-loop helpers. No qualifier or uninitialized-value evidence.
|
||||
|
||||
ATTEMPT {"label": "sign layout getter has source-level inline definition", "hash": "d26315c3d30f", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.86425, 221, 221, 6]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign button constructor has inline definition next to creation", "hash": "c15b76d3871f", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.86425, 221, 221, 6]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign all concrete constructors has inline definition next to creation", "hash": "604b3beaac54", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.86425, 221, 221, 6]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign descriptor owns its animation-count accessor", "hash": "724f60ecafa4", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.86425, 221, 221, 6]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign descriptor owns a reference-returning animation accessor", "hash": "39c05000fcbc", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.86425, 221, 221, 6]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign descriptor owns all loop-control and slot accessors", "hash": "bdb4baac9c4d", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.86425, 221, 221, 6]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign complete pane-creation loop owns inline member helper", "hash": "15e5275a8aba", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [98.66516, 221, 221, 54]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign count snapshot belongs to descriptor query and inner scope", "hash": "ae3bd9b31b68", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [98.8914, 221, 221, 46]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
ATTEMPT {"label": "sign descriptor separately reads resource name and id at each call", "hash": "1fea9aa866c5", "unit": "src/keyboard/tiSignWindow", "pool": 0, "functions": {"create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator": [99.117645, 221, 221, 34]}, "drops": [], "code": "6300", "data": "3468"}
|
||||
|
||||
## Focused-round coverage
|
||||
|
||||
Latest user request narrowed this max round to the closest 2-3 functions. Three functions received new source trials, excluding the resumed a23x candidate from the trial count. onKey: seven new trials, seventh exact. CellPhone create: nine new trials, no exact; final register swap unchanged at seven operands. SignWindow create: nine new trials, no exact; final count/slot swap unchanged at six operands. No trial is a compiler flag sweep, pragma, volatile/uninitialized addition, symbol extent change or arbitrary data placement. All rejected experiments are restored. Only onKey source changes remain, committed as 58b89a3a.
|
||||
|
||||
The other 19 original open functions were not re-tried under the explicit 2-3-function focus. Their existing three-or-more-trial evidence remains in a23x/a23h2/u2. Final open inventory and full gate below cover all nine owned units. No code or data edits outside the selected onKey implementation survive. All 31,204 data bytes matched at baseline; no missing-symbol or extent correction is supported.
|
||||
|
||||
Origin advanced to 49be1c79 during the round, changing only BS2Mach data. The branch is based on 5473a84f; no worker rebase or merge was performed. Parent must revalidate on current main.
|
||||
|
||||
## Final full clean gate
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiCandidateBox] pool: IDENTICAL
|
||||
[src/keyboard/tiCandidateBox] objdiff: code 21728/24000 data 4652/4652 functions 110/112 fuzzy 99.7107 linked code 0
|
||||
[src/keyboard/tiCandidateBox] instruction-exact functions: 109/112
|
||||
[src/keyboard/tiCandidateBox] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .data size 3488 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .rodata size 1048 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .sdata size 32 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .sdata2 size 80 match 100.0
|
||||
[src/keyboard/tiCandidateBox] section .text size 24000 match 99.71067
|
||||
[src/keyboard/tiCandidateBox] below 100: create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 95.99148
|
||||
[src/keyboard/tiCandidateBox] below 100: createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 98.49537
|
||||
[src/keyboard/tiCandidateBox] baseline: code 21728/24000 data 4652 functions 110 fuzzy 99.7107
|
||||
[src/keyboard/tiInputForm] pool: IDENTICAL
|
||||
[src/keyboard/tiInputForm] objdiff: code 47928/50656 data 3772/3772 functions 219/221 fuzzy 99.7200 linked code 0
|
||||
[src/keyboard/tiInputForm] instruction-exact functions: 217/221
|
||||
[src/keyboard/tiInputForm] section .bss size 96 match 100.0
|
||||
[src/keyboard/tiInputForm] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiInputForm] section .data size 2736 match 100.0
|
||||
[src/keyboard/tiInputForm] section .rodata size 760 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sbss size 32 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata size 40 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata2 size 104 match 100.0
|
||||
[src/keyboard/tiInputForm] section .text size 50656 match 99.71999
|
||||
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 93.05215
|
||||
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 96.40169
|
||||
[src/keyboard/tiInputForm] baseline: code 47928/50656 data 3772 functions 219 fuzzy 99.7200
|
||||
[src/keyboard/tiCellPhone] pool: IDENTICAL
|
||||
[src/keyboard/tiCellPhone] objdiff: code 17696/19028 data 3860/3860 functions 85/86 fuzzy 99.9926 linked code 0
|
||||
[src/keyboard/tiCellPhone] instruction-exact functions: 85/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.992645
|
||||
[src/keyboard/tiCellPhone] below 100: create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949
|
||||
[src/keyboard/tiCellPhone] baseline: code 14968/19028 data 3860 functions 84 fuzzy 99.9453
|
||||
[src/keyboard/tiZiString] pool: IDENTICAL
|
||||
[src/keyboard/tiZiString] objdiff: code 3136/5504 data 7680/7680 functions 26/29 fuzzy 98.3241 linked code 0
|
||||
[src/keyboard/tiZiString] instruction-exact functions: 26/29
|
||||
[src/keyboard/tiZiString] section .bss size 7296 match 100.0
|
||||
[src/keyboard/tiZiString] section .data size 328 match 100.0
|
||||
[src/keyboard/tiZiString] section .rodata size 56 match 100.0
|
||||
[src/keyboard/tiZiString] section .text size 5504 match 98.32413
|
||||
[src/keyboard/tiZiString] below 100: clearCandidates__Q39textinput8tistring6WithZiFv 93.28395
|
||||
[src/keyboard/tiZiString] below 100: update__Q39textinput8tistring6WithZiFv 97.4574
|
||||
[src/keyboard/tiZiString] below 100: setElementBuffer__Q39textinput8tistring6WithZiFv 90.33846
|
||||
[src/keyboard/tiZiString] baseline: code 3136/5504 data 7680 functions 26 fuzzy 98.3241
|
||||
[src/keyboard/tiString] pool: IDENTICAL
|
||||
[src/keyboard/tiString] objdiff: code 4632/5176 data 288/288 functions 41/42 fuzzy 99.0286 linked code 0
|
||||
[src/keyboard/tiString] instruction-exact functions: 41/42
|
||||
[src/keyboard/tiString] section .data size 288 match 100.0
|
||||
[src/keyboard/tiString] section .text size 5176 match 99.028595
|
||||
[src/keyboard/tiString] below 100: inputChar__Q39textinput8tistring9DecolatedFw 90.757355
|
||||
[src/keyboard/tiString] baseline: code 4632/5176 data 288 functions 41 fuzzy 99.0286
|
||||
[src/keyboard/tiSignWindow] pool: IDENTICAL
|
||||
[src/keyboard/tiSignWindow] objdiff: code 6300/7184 data 3468/3468 functions 55/56 fuzzy 99.9833 linked code 0
|
||||
[src/keyboard/tiSignWindow] instruction-exact functions: 55/56
|
||||
[src/keyboard/tiSignWindow] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .data size 2672 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .rodata size 784 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .sdata size 8 match 100.0
|
||||
[src/keyboard/tiSignWindow] section .text size 7184 match 99.9833
|
||||
[src/keyboard/tiSignWindow] below 100: create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425
|
||||
[src/keyboard/tiSignWindow] baseline: code 6300/7184 data 3468 functions 55 fuzzy 99.9833
|
||||
[src/scene/address/iplAddress] pool: IDENTICAL
|
||||
[src/scene/address/iplAddress] objdiff: code 22016/23988 data 1964/1964 functions 99/101 fuzzy 99.9233 linked code 0
|
||||
[src/scene/address/iplAddress] instruction-exact functions: 98/101
|
||||
[src/scene/address/iplAddress] section .ctors size 4 match 100.0
|
||||
[src/scene/address/iplAddress] section .data size 1880 match 100.0
|
||||
[src/scene/address/iplAddress] section .rodata size 24 match 100.0
|
||||
[src/scene/address/iplAddress] section .sbss size 8 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata size 16 match 100.0
|
||||
[src/scene/address/iplAddress] section .sdata2 size 32 match 100.0
|
||||
[src/scene/address/iplAddress] section .text size 23988 match 99.923294
|
||||
[src/scene/address/iplAddress] below 100: start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.84305
|
||||
[src/scene/address/iplAddress] below 100: onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 98.42593
|
||||
[src/scene/address/iplAddress] baseline: code 22016/23988 data 1964 functions 99 fuzzy 99.9233
|
||||
[src/scene/address/iplAddressEdit] pool: IDENTICAL
|
||||
[src/scene/address/iplAddressEdit] objdiff: code 23344/27112 data 2560/2560 functions 91/94 fuzzy 99.5528 linked code 0
|
||||
[src/scene/address/iplAddressEdit] instruction-exact functions: 91/94
|
||||
[src/scene/address/iplAddressEdit] section .bss size 320 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .data size 2152 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .rodata size 40 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .sdata size 24 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .sdata2 size 24 match 100.0
|
||||
[src/scene/address/iplAddressEdit] section .text size 27112 match 99.55282
|
||||
[src/scene/address/iplAddressEdit] below 100: create__Q33ipl5scene11AddressEditFv 97.5561
|
||||
[src/scene/address/iplAddressEdit] below 100: get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571
|
||||
[src/scene/address/iplAddressEdit] below 100: update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105
|
||||
[src/scene/address/iplAddressEdit] baseline: code 23344/27112 data 2560 functions 91 fuzzy 99.5528
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] pool: IDENTICAL
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] objdiff: code 30344/33828 data 2960/2960 functions 123/129 fuzzy 99.7731 linked code 0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] instruction-exact functions: 123/129
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .data size 2736 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .rodata size 64 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .sdata2 size 80 match 100.0
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] section .text size 33828 match 99.77309
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: create__Q33ipl5scene15SDChannelSelectFv 97.73972
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 98.007935
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] below 100: flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714
|
||||
[src/scene/sdChannelSelect/iplSDChannelSelect] baseline: code 30344/33828 data 2960 functions 123 fuzzy 99.7731
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.44372 -> 92.53480
|
||||
global fuzzy_match_percent: 99.73527 -> 99.73559
|
||||
global complete_code_percent: 76.18478 -> 76.18478
|
||||
global matched_data_percent: 99.78196 -> 99.78196
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
|
||||
```
|
||||
|
||||
Final explicit ninja build/43U/ok and build/43U/report.json passed. Post-clean onKey ctxdiff gives 682/682 instructions and diffs 0. Pool 76/76 identical; SHA1 independently 26116613f624061ba99c8d1a299aaa6efa85670d. No source/header edits remain beyond committed onKey helpers.
|
||||
|
||||
## Remaining functions
|
||||
|
||||
OPEN start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface 99.84305%: icon versus pane saved registers; view trial moves discrepancy to index/pane.
|
||||
|
||||
OPEN onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface 98.42593%: saved-register roles across event arms.
|
||||
|
||||
OPEN create__Q33ipl5scene11AddressEditFv 97.5561%: retained text address and balloon margin scheduling.
|
||||
|
||||
OPEN get_friendinfo__Q33ipl5scene11AddressEditFv 88.03571%: text address rematerialized after virtual pane lookup.
|
||||
|
||||
OPEN update_friendinfo__Q33ipl5scene11AddressEditFv 99.42105%: source/destination address scheduling.
|
||||
|
||||
OPEN create__Q33ipl5scene15SDChannelSelectFv 97.73972%: BS2 manager reload folded by compiler.
|
||||
|
||||
OPEN collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.81188%: count-store versus threshold-read scheduling.
|
||||
|
||||
OPEN collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.833336%: count-store versus threshold-read scheduling.
|
||||
|
||||
OPEN collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 98.007935%: count-store scheduling and channel address operands.
|
||||
|
||||
OPEN collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl 97.55125%: four count-store versus threshold-read schedules.
|
||||
|
||||
OPEN flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv 99.65714%: heap/save-manager load order.
|
||||
|
||||
OPEN create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator 99.8949%: toggle row versus animation offset saved registers.
|
||||
|
||||
OPEN calcCursorPos__Q39textinput9inputform4BaseFff 93.05215%: glyph dimension scheduling and FP register roles.
|
||||
|
||||
OPEN create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 96.40169%: row linkage and animation register allocation.
|
||||
|
||||
OPEN create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 95.99148%: Scroll-name/child initialization lifetimes, current origin changes retained unchanged.
|
||||
|
||||
OPEN createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator 98.49537%: pane/count/slot saved-register allocation.
|
||||
|
||||
OPEN create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator 99.86425%: count versus animation-slot saved registers.
|
||||
|
||||
OPEN inputChar__Q39textinput8tistring9DecolatedFw 90.757355%: Hangul builder branch folding and count/index operations.
|
||||
|
||||
OPEN clearCandidates__Q39textinput8tistring6WithZiFv 93.28395%: separate static-buffer address materialization.
|
||||
|
||||
OPEN update__Q39textinput8tistring6WithZiFv 97.4574%: buffer base handling and candidate-loop register lifetime.
|
||||
|
||||
OPEN setElementBuffer__Q39textinput8tistring6WithZiFv 90.33846%: buffer base scheduling and copy-index registers.
|
||||
|
||||
Instruction-exact total 844/870 -> 845/870; objdiff matched functions 848/870 -> 849/870; code 174396/196476 -> 177124/196476 bytes; data 31204/31204 -> 31204/31204. All other owned-unit measures match this round baseline.
|
||||
|
||||
Uncertainty: four existing objdiff-versus-instruction-decoder discrepancies remain outside the new exact function. Source-only weak functions/objects and prior InputForm literal offsets are unchanged; symbol-paired data 100% is not a claim of raw-section or linked-unit completion. No linking flags were edited. Parent must independently verify before acceptance.
|
||||
@@ -1,88 +0,0 @@
|
||||
# a5h high-effort CHANSVm round
|
||||
|
||||
Owned worktree data-d5, branch agent/w1003/astra-a5-high, starting HEAD/origin f170531a. Read a5 prior attempts and final gate, shared prompt and all ten levers, CHANSVm policy entries, local CHANSVm/fz1/big1 histories. Prior-art index has no entry. Prior medium round gained no exact functions; its Step operand-order change is absent from this fresh main. Baseline 222/233 exact, code 38136/53564, data 6904/6904, fuzzy 99.4341. Pool first: 125/125 identical. All data sections already exact; no symbol edits warranted.
|
||||
|
||||
High-round focus: float parser store/compare scheduling, document-writer lifetime reuse, formatter temporary lifetimes, executable table fixup registers. Do not repeat previously logged plain declaration permutations or five orchestrator writer shapes. No target evidence permits an uninitialized local; preserve every initialization. No eZiText optimization-off lever applies. Follow helpers/types/const/lifetimes before allocation searches. Remaining functions receive at least three new source forms before handoff.
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "end-pointer scratch initialized by inline parser formal argument", "source": "fcfdea703d2c", "build": 0, "fuzzy": 95.180725, "insns": [83, 83], "diffs": 3, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "caller owns addressable end pointer, parser initializes via formal output", "source": "3dcf785ca76e", "build": 0, "fuzzy": 97.59036, "insns": [83, 83], "diffs": 2, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "parser output is native float object instead of scalar field address", "source": "ea36389b824e", "build": 0, "fuzzy": 97.59036, "insns": [83, 83], "diffs": 2, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "whole writer body through vm-only inline helper", "source": "aa8222d6230b", "build": 0, "fuzzy": 99.10448, "insns": [67, 67], "diffs": 13, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "argument index passed through whole writer helper", "source": "0b85ce17d3ad", "build": 0, "fuzzy": 99.10448, "insns": [67, 67], "diffs": 13, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "writer conversion type through inline formal enum", "source": "c37487e4baa2", "build": 0, "fuzzy": 99.10448, "insns": [67, 67], "diffs": 13, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "native formatted string ownership record: const wchar_t* data; CHANSVmObjHdr* object;", "source": "4195315f4732", "build": 0, "fuzzy": 99.84919, "insns": [431, 431], "diffs": 13, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "native formatted string ownership record: CHANSVmObjHdr* object; const wchar_t* data;", "source": "e9b3a96255b6", "build": 0, "fuzzy": 99.84919, "insns": [431, 431], "diffs": 13, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "native formatted string ownership record: const wchar_t* data; CHANSVmObjHdr* object; s32 length;", "source": "a8e576986777", "build": 0, "fuzzy": 99.84919, "insns": [431, 431], "diffs": 13, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "only string input gets independent typed lifetime; existing cleanup and output counts retained", "source": "5923077b2fa8", "build": 0, "fuzzy": 99.187935, "insns": [431, 431], "diffs": 53, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmDateDtor", "attempt": "calendar table indices widened explicitly to unsigned native indices", "source": "f1be39516ed0", "build": 0, "fuzzy": 94.96703, "insns": [91, 91], "diffs": 7, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmDateDtor", "attempt": "calendar table lookup uses shared unsigned accessor with month evaluated as helper first", "source": "e39110d7d93c", "build": 0, "fuzzy": 94.96703, "insns": [91, 91], "diffs": 7, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmDateDtor", "attempt": "calendar format call receives returned date value through inline boundary", "source": "f1da6f67f1a2", "build": 0, "fuzzy": 72.98901, "insns": [107, 91], "diffs": 97, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "argument acquisition and conversion in inline helper with CHANSVm*", "source": "dd098720f2f6", "build": 0, "fuzzy": 99.62687, "insns": [67, 67], "diffs": 5, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "argument acquisition and conversion in inline helper with const CHANSVm*", "source": "e2aa528796b4", "build": 0, "fuzzy": 99.62687, "insns": [67, 67], "diffs": 5, "code": "38136", "data": "6904"}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "encoder scratch and bound scoped after successful converted-object check", "source": "292969d911b0", "build": 0, "fuzzy": 99.62687, "insns": [67, 67], "diffs": 5, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method fixup helper header precedes VM in formal argument order", "source": "666757906e2a", "build": 0, "fuzzy": 99.744095, "insns": [254, 254], "diffs": 10, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method fixup helper gets table as independent const formal", "source": "f4b21b6a6f11", "build": 0, "fuzzy": 99.88189, "insns": [254, 254], "diffs": 4, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method fixup helper gets table as independent mutable formal", "source": "315f755a9816", "build": 0, "fuzzy": 99.88189, "insns": [254, 254], "diffs": 4, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method helper counter declaration before table binding", "source": "e9373aac8d33", "build": 0, "fuzzy": 99.88189, "insns": [254, 254], "diffs": 4, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method helper table pointer const binding", "source": "7b539fde55dc", "build": 0, "fuzzy": 99.744095, "insns": [254, 254], "diffs": 10, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "module clear uses offset declared before index", "source": "5a52a46d26af", "build": 0, "fuzzy": 99.66535, "insns": [254, 254], "diffs": 13, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "module initialization loop through header-only helper", "source": "bd1650d81d65", "build": 0, "fuzzy": 99.744095, "insns": [254, 254], "diffs": 10, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "typed module entry indexed memset with compiler-managed byte stride", "source": "e766de18a400", "build": 0, "fuzzy": 99.96063, "insns": [254, 254], "diffs": 1, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "module stride is function-scoped beside region offsets", "source": "78e9121d89c6", "build": 0, "fuzzy": 99.80315, "insns": [254, 254], "diffs": 7, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "module clear offset is native signed byte offset", "source": "a710deff2beb", "build": 0, "fuzzy": 99.88189, "insns": [254, 254], "diffs": 4, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method name end address: (vmU32)methodTable + methodTable[i].nameLength + methodTable[i].offset", "source": "3a910e6ab28e", "build": 0, "fuzzy": 99.88189, "insns": [254, 254], "diffs": 4, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method name end address: methodTable[i].offset + (methodTable[i].nameLength + (vmU32)methodTable)", "source": "1a3385de7f93", "build": 0, "fuzzy": 99.92126, "insns": [254, 254], "diffs": 3, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "method name end address: (vmU32)((u8*)methodTable + methodTable[i].nameLength) + methodTable[i].offset", "source": "83c732793800", "build": 0, "fuzzy": 99.88189, "insns": [254, 254], "diffs": 4, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "typed clear plus method end address: (vmU32)methodTable + methodTable[i].nameLength + methodTable[i].offset", "source": "688f0a2ef623", "build": 0, "fuzzy": 99.96063, "insns": [254, 254], "diffs": 1, "code": "38136", "data": "6904"}
|
||||
- {"function": "CHANSVmAddExe", "attempt": "typed clear plus method end address: methodTable[i].offset + (methodTable[i].nameLength + (vmU32)methodTable)", "source": "16bc72f47d1f", "build": 0, "fuzzy": 100.0, "insns": [254, 254], "diffs": 0, "code": "39152", "data": "6904"}
|
||||
|
||||
## CHANSVmAddExe exact candidate
|
||||
|
||||
Method-table fixup has its own loop and success/failure result in target instructions183..214. Extracting it with index declared before table pointer fixes the initial module/type register exchange and method loop registers. Typed module entry indexing gives target compiler-managed stride r29 instead of manual offset r28. Reassociating the validated end address as offset+(nameLength+table) gives target add r3,r5,r28. All arithmetic operands remain unsigned32 with identical wrap behavior; table validation and calls retain order. Result100.0%,254/254instructions,diffs0,code39152,data6904. Quick full-build GATE PASS, zero regressions/forbidden/readability, exact223/233, correctDOL. Formatting cleanup follows, then fresh gate before local commit.
|
||||
- {"function": "VmBlobGetHexString", "attempt": "raw byte encoder inline boundary with output first", "source": "3e7e12925d9d", "build": 0, "fuzzy": 97.35366, "insns": [82, 82], "diffs": 32, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobGetHexString", "attempt": "raw byte encoder read-only source and explicit digit table", "source": "91218592b8d3", "build": 0, "fuzzy": 97.35366, "insns": [82, 82], "diffs": 32, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobGetHexString", "attempt": "raw byte encoder loop counter initialized at helper boundary", "source": "5e32f6e45a16", "build": 0, "fuzzy": 97.35366, "insns": [82, 82], "diffs": 32, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmStringSplit", "attempt": "typed real metadata record for parent split span", "source": "fb732f313bac", "build": 0, "fuzzy": 97.567566, "insns": [222, 222], "diffs": 84, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmStringSplit", "attempt": "typed real metadata record for delimiter split span", "source": "190fa665d513", "build": 0, "fuzzy": 97.72523, "insns": [222, 222], "diffs": 76, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmStringSplit", "attempt": "typed real metadata record for both split spans", "source": "b88a5d1ad181", "build": 0, "fuzzy": 97.432434, "insns": [222, 222], "diffs": 90, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobPackCommon", "attempt": "native blob copy and zero-fill helper with BlobHeader* source", "source": "8af1bfdec68f", "build": 0, "fuzzy": 97.97156, "insns": [668, 668], "diffs": 242, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobPackCommon", "attempt": "native blob copy and zero-fill helper with const BlobHeader* source", "source": "718b0dd3c12a", "build": 0, "fuzzy": 97.97156, "insns": [668, 668], "diffs": 242, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobPackCommon", "attempt": "integer staging buffer lifetime belongs to packing iteration", "source": "9c318ea16d63", "build": 0, "fuzzy": 97.949104, "insns": [668, 668], "diffs": 244, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobUnpack", "attempt": "integer staging union lifetime belongs to unpacking iteration", "source": "6017037ff266", "build": 0, "fuzzy": 98.452614, "insns": [517, 517], "diffs": 141, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobUnpack", "attempt": "signed and unsigned integer decoding helper with u32* input", "source": "e6f7a5f031d0", "build": 0, "fuzzy": 95.46228, "insns": [526, 517], "diffs": 366, "code": "39152", "data": "6904"}
|
||||
- {"function": "VmBlobUnpack", "attempt": "signed and unsigned integer decoding helper with const u32* input", "source": "52628f4f9f18", "build": 0, "fuzzy": 95.46228, "insns": [526, 517], "diffs": 366, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "third module pass separated with CHANSVmModule* input", "source": "c2880482ee9c", "build": 0, "fuzzy": 98.677246, "insns": [189, 189], "diffs": 43, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "third module pass separated with const CHANSVmModule* input", "source": "50e11723d30b", "build": 0, "fuzzy": 98.677246, "insns": [189, 189], "diffs": 43, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "shared typed dispatch-name validation and comparison boundary", "source": "47e9680b69cd", "build": 0, "fuzzy": 84.08995, "insns": [173, 189], "diffs": 169, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmStep", "attempt": "floating immediate load uses typed scratch output helper", "source": "319c356e86f7", "build": 0, "fuzzy": 96.98723, "insns": [1253, 1253], "diffs": 276, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmStep", "attempt": "signal consumption isolated as initialized boolean helper", "source": "ad852802744f", "build": 0, "fuzzy": 96.73743, "insns": [1257, 1253], "diffs": 1160, "code": "39152", "data": "2232"}
|
||||
- {"function": "CHANSVmStep", "attempt": "instruction range validation through const execution-context helper", "source": "75bd6182f4ed", "build": 0, "fuzzy": 96.47805, "insns": [1260, 1253], "diffs": 1214, "code": "39152", "data": "2232"}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "formatted ownership record assigned before copy call", "source": "3bf8fcb93c2c", "build": 0, "fuzzy": 96.92575, "insns": [431, 431], "diffs": 150, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "formatted owner is allocated directly into cleanup record", "source": "af2098b87259", "build": 0, "fuzzy": 97.38979, "insns": [431, 431], "diffs": 147, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "direct formatted owner with character ownership initialized before data binding", "source": "e4428eea5fcd", "build": 0, "fuzzy": 96.89095, "insns": [430, 431], "diffs": 249, "code": "39152", "data": "2232"}
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "float parser tag dispatch expressed as single supported switch case", "source": "72a9cfd97545", "build": 0, "fuzzy": 96.26506, "insns": [84, 83], "diffs": 69, "code": "39152", "data": "6904"}
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "float parser tag guard branches to common invalid result", "source": "d2b34ee3b2d0", "build": 0, "fuzzy": 97.59036, "insns": [83, 83], "diffs": 2, "code": "39152", "data": "6904"}
|
||||
|
||||
## Coverage and retained result
|
||||
|
||||
New high-round boundaries were compiled for every remaining function. Split222, Hex82, Pack668, Unpack517 and Link189 already share the target CFG and instruction counts; their new span/encoder/decoder/pass boundaries tested real lifetime changes. Rejected all fuzzy-only experiments. Step1253 has structural and allocation differences; its floating load boundary changes no instructions, while signal/range boolean helpers add instructions and lose jump-table data. Restored all three. Formatter431 keeps its13register differences; ownership-record stores before copy regress allocation. Parser83 still has the adjacent initialization-store/type-compare inversion; target initializes the end pointer, so removal/volatile tricks are unwarranted. Writer67 still has5register differences; whole writer and argument-acquisition boundaries do not resolve vm/string register reuse. Date91 retains7table and varargs scheduling differences.
|
||||
|
||||
All ten levers reviewed: helpers, true field types, const views, separate locals and scopes tested; new AddExe graph and typed indexing resolve register lifetimes without another exhaustive declaration sweep. No eZiText-specific lever applies. Counted traversal preserves Hex CTR. Prior-art index has no matching entry. Target initialization audit from the preceding round remains valid; no undefined values introduced. All data already100%, so no relocation rename/extent correction applies.
|
||||
|
||||
Distinct successful source forms this round:
|
||||
- CHANSVmConvertToFloatFromStr: 5
|
||||
- VmWinEmuWrite: 6
|
||||
- CHANSVmFormatString: 7
|
||||
- VmDateDtor: 3
|
||||
- CHANSVmAddExe: 15
|
||||
- VmBlobGetHexString: 3
|
||||
- VmStringSplit: 3
|
||||
- VmBlobPackCommon: 3
|
||||
- VmBlobUnpack: 3
|
||||
- CHANSVmLinkModules: 3
|
||||
- CHANSVmStep: 3
|
||||
|
||||
Only CHANSVmAddExe source changes retained, exact100.0 with254/254instructions anddiffs0. Initial candidate committed470bb80e after fresh quick full-build gate. Full clean final gate follows. Worker result remains subject to independent parent verification.
|
||||
|
||||
Final fetch 934587c4: owned source unchanged from startingmain. No concurrent match duplicated. All54successful distinct source trials recorded; temporary variants will be removed after final measurements.
|
||||
|
||||
Final clean non-quick GATE PASS. CHANSVm exact222/233 ->223/233, code38136 ->39152/53564, data6904/6904unchanged, fuzzy99.43410 ->99.44119. No regressions, forbidden additions or readability warnings. Full43Ubuild, pool and targetDOLhash pass. Regenerated live progress/report and build/43U/ok, then independently rechecked AddExe254/254,diffs0. No source changes after470bb80e. Parent verification required before acceptance.
|
||||
@@ -1,30 +0,0 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 39152/53564 data 6904/6904 functions 223/233 fuzzy 99.4412 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 223/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
|
||||
[src/channelScript/CHANSVm] section .text size 53564 match 99.44119
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmConvertToFloatFromStr 97.59036
|
||||
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
|
||||
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmFormatString 99.84919
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.98723
|
||||
[src/channelScript/CHANSVm] baseline: code 38136/53564 data 6904 functions 222 fuzzy 99.4341
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.26770 -> 92.30162
|
||||
global fuzzy_match_percent: 99.73349 -> 99.73362
|
||||
global complete_code_percent: 74.91312 -> 74.91312
|
||||
global matched_data_percent: 99.78196 -> 99.78196
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
@@ -1,30 +0,0 @@
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 39152/53564 data 6904/6904 functions 223/233 fuzzy 99.4412 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 223/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
|
||||
[src/channelScript/CHANSVm] section .text size 53564 match 99.44119
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmConvertToFloatFromStr 97.59036
|
||||
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
|
||||
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmFormatString 99.84919
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmLinkModules 98.677246
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.98723
|
||||
[src/channelScript/CHANSVm] baseline: code 38136/53564 data 6904 functions 222 fuzzy 99.4341
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.26770 -> 92.30162
|
||||
global fuzzy_match_percent: 99.73349 -> 99.73362
|
||||
global complete_code_percent: 74.91312 -> 74.91312
|
||||
global matched_data_percent: 99.78196 -> 99.78196
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
@@ -1,144 +0,0 @@
|
||||
# a5h2 second high round
|
||||
|
||||
Owned data-d5 branch agent/w1003/astra-a5-high2, baseline a120e478. Read AGENTS, a5/common/levers and prior a5h, a5, g8, ult14 and CHANSVm/big1/fz1 histories. Prior-art index has no matching unit entry. Pool checked before code work: 125/125 identical. Baseline {"fuzzy_match_percent": 99.44119, "total_code": "53564", "matched_code": "39152", "matched_code_percent": 73.093864, "total_data": "6904", "matched_data": "6904", "matched_data_percent": 100.0, "total_functions": 233, "matched_functions": 223, "matched_functions_percent": 95.70815, "total_units": 1}
|
||||
|
||||
All data sections already 100%; no metadata corrections warranted. No linking/config changes. New trials focus on additional self-contained boundaries rather than repeating logged whole-body or leading-declaration searches. Every candidate remains subject to full clean gate and parent verification.
|
||||
|
||||
## CHANSVmConvertToFloatFromStr
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target83/83: only adjacent initialized end-pointer store and type comparison differ. Allocation, byte-copy, constants loop, integer parse, decimal parse and final store have identical order. Preserve end-pointer initialization. New inner boundaries below do not repeat whole-parser inputs/record trials.
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "constant-name recognition loop returns boolean and parsed output through inline helper", "source": "470ece29b1ca", "build": 0, "pool": true, "fuzzy": 86.90362, "insns": [91, 83], "diffs": 87, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "ASCII copy and terminator inline helper returns end-of-buffer pointer", "source": "bb74cf8f9171", "build": 0, "pool": true, "fuzzy": 86.445786, "insns": [88, 83], "diffs": 63, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmConvertToFloatFromStr", "attempt": "numeric text dispatch in inline scalar helper with caller-owned initialized end pointer", "source": "c80e2b8dee27", "build": 0, "pool": true, "fuzzy": 97.59036, "insns": [83, 83], "diffs": 2, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## VmDateDtor
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target91/91: sec/min/hour/mday/month/year/weekday signed guards and conversion calls match; seven differences in month/day table loads and varargs year store. No volatile or missing-initialization evidence. Try full value-producing boundary and split guard success joins.
|
||||
- {"function": "VmDateDtor", "attempt": "calendar initialization, guards and formatting owned by full inline helper CHANSVm* vm, CHANSVmObjHdr* output", "source": "5342727a6e16", "build": 0, "pool": true, "fuzzy": 94.96703, "insns": [91, 91], "diffs": 7, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmDateDtor", "attempt": "calendar initialization, guards and formatting owned by full inline helper CHANSVmObjHdr* output, CHANSVm* vm", "source": "3ae0a6c99c81", "build": 0, "pool": true, "fuzzy": 94.96703, "insns": [91, 91], "diffs": 7, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmDateDtor", "attempt": "formatted length validation and string setter share an inline status boundary", "source": "11e45fb5ff7b", "build": 0, "pool": true, "fuzzy": 90.51649, "insns": [95, 91], "diffs": 40, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## VmStringSplit
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target222/222 CFG: convert separator, optional limit, load input views, two scans for nonempty separator, array-only fallback, per-character loop for empty separator. New boundaries isolate the empty-separator loop and array-only fallback instead of the previously tried segment-copy helper.
|
||||
- {"function": "VmStringSplit", "attempt": "empty-separator per-character array creation helper with char input", "source": "3a58af0a6ae9", "build": 0, "pool": true, "fuzzy": 97.10361, "insns": [224, 222], "diffs": 100, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmStringSplit", "attempt": "empty-separator per-character array creation helper with const char input", "source": "ef29a67c630c", "build": 0, "pool": true, "fuzzy": 97.10361, "insns": [224, 222], "diffs": 100, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmStringSplit", "attempt": "null-separator and zero-limit array creation share value-count inline helper", "source": "4c78ba884a67", "build": 0, "pool": true, "fuzzy": 97.10361, "insns": [224, 222], "diffs": 142, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## CHANSVmFormatString
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target431/431: only r14/r18 lifetimes for character/string temporary and common string-format cleanup differ. Existing record/allocation helpers unsuccessful. Test actual format-tail conversion and precision digit loops as independent boundaries, leaving ownership and argument order intact.
|
||||
- {"function": "CHANSVmFormatString", "attempt": "wide-format conversion and varargs call helper with string argument", "source": "4e2f34b8c42d", "build": 0, "pool": true, "fuzzy": 99.84919, "insns": [431, 431], "diffs": 13, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "wide-format conversion and varargs call helper with const string argument", "source": "9b4e8dd5e61f", "build": 0, "pool": true, "fuzzy": 99.84919, "insns": [431, 431], "diffs": 13, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmFormatString", "attempt": "signed numeric formatting dispatch through const object helper", "source": "38bd330f8674", "build": 0, "pool": true, "fuzzy": 99.84919, "insns": [431, 431], "diffs": 13, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## VmBlobGetHexString
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target82/82: blob validation, argument conversion, count and range guards, allocation, CTR nibble loop, offset commit. Fourteen differences are allocation only. Prior raw encoder boundaries failed; test whole-method input alias lifetime and shared allocation+loop boundary.
|
||||
- {"function": "VmBlobGetHexString", "attempt": "full hex method helper formal parent object", "source": "20658c1480f8", "build": 0, "pool": true, "fuzzy": 97.13415, "insns": [82, 82], "diffs": 33, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmBlobGetHexString", "attempt": "full hex method helper formal const parent object", "source": "1a29e5ffa85b", "build": 2, "error": "/TMC_JPEG/include -i libs/RVLFaceLib/include -i libs/EGG/include -i libs/OperaWWW/include -ir libs/RVL_SDK/include/private/bte -i build/43U/include -DBUILD_VERSION=0 -DVERSION_43U -i libs/RVL_SDK/include/private/bte -DNDEBUG=1 -DTARGET_RVL -W nomissingreturn -ipa file -gccinc -fp_contract off -O4,s -enc SJIS -lang=c -MMD -c src/channelScript/CHANSVm.c -o build/43U/src/src/channelScript && \"/usr/bin/python3\" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d\n### mwcceppc.exe Compiler:\n# File: src\\channelScript\\CHANSVm.c\n# ------------------------------------\n# 4286: BlobHeader* blob = (BlobHeader*)VmGetStrFromObjHdr(VmParentObj); \n# Error: ^\n# (10209) illegal implicit conversion from 'const struct CHANSVmObjHdr *' to\n# 'struct CHANSVmObjHdr *'\n# Too many errors printed, aborting program\n\nUser break, cancelled...\nninja: build stopped: subcommand failed.\n"}
|
||||
- {"function": "VmBlobGetHexString", "attempt": "hex allocation, CTR loop and offset commit in one typed inline boundary", "source": "8f2e23a952ee", "build": 0, "pool": true, "fuzzy": 97.13415, "insns": [82, 82], "diffs": 33, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## VmBlobPackCommon
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target668/668: first parser scan computes extent, optional blob allocation, second parser scan writes payloads, optional offset reset. Remaining244 differences are register allocation. New boundaries isolate first-pass sizing, string payload conversion and endian staging; retain parser initialization and alias-sensitive blob reloads.
|
||||
- {"function": "VmBlobPackCommon", "attempt": "entire sizing scan through const source-blob helper with explicit extent output", "source": "9f2ebb529fe8", "build": 2, "error": "s/MSL/include -i libs/RVL_SDK/include -i libs/RevoEX/include -i libs/NW4R/include -i libs/RVLMiddleware/eZiText/include -i libs/RVLMiddleware/TMC_JPEG/include -i libs/RVLFaceLib/include -i libs/EGG/include -i libs/OperaWWW/include -ir libs/RVL_SDK/include/private/bte -i build/43U/include -DBUILD_VERSION=0 -DVERSION_43U -i libs/RVL_SDK/include/private/bte -DNDEBUG=1 -DTARGET_RVL -W nomissingreturn -ipa file -gccinc -fp_contract off -O4,s -enc SJIS -lang=c -MMD -c src/channelScript/CHANSVm.c -o build/43U/src/src/channelScript && \"/usr/bin/python3\" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d\n### mwcceppc.exe Compiler:\n# File: src\\channelScript\\CHANSVm.c\n# ------------------------------------\n# 4987: u32 totalSize = flag != 0 ? 0 : parentBlob->offset; \n# Error: ^^^\n# (10141) expression syntax error\n# Too many errors printed, aborting program\n\nUser break, cancelled...\nninja: build stopped: subcommand failed.\n"}
|
||||
- {"function": "VmBlobPackCommon", "attempt": "string zero-fill, width conversion and offset update use const input helper", "source": "0111155c50f2", "build": 2, "error": "bs/RVLMiddleware/TMC_JPEG/include -i libs/RVLFaceLib/include -i libs/EGG/include -i libs/OperaWWW/include -ir libs/RVL_SDK/include/private/bte -i build/43U/include -DBUILD_VERSION=0 -DVERSION_43U -i libs/RVL_SDK/include/private/bte -DNDEBUG=1 -DTARGET_RVL -W nomissingreturn -ipa file -gccinc -fp_contract off -O4,s -enc SJIS -lang=c -MMD -c src/channelScript/CHANSVm.c -o build/43U/src/src/channelScript && \"/usr/bin/python3\" tools/transform_dep.py build/43U/src/src/channelScript/CHANSVm.d build/43U/src/src/channelScript/CHANSVm.d\n### mwcceppc.exe Compiler:\n# File: src\\channelScript\\CHANSVm.c\n# ------------------------------------\n# 4983: srcData = (u8*)VmGetStrFromObjHdr(strObj); \n# Error: ^\n# (10209) illegal implicit conversion from 'const struct CHANSVmObjHdr *' to\n# 'struct CHANSVmObjHdr *'\n# Too many errors printed, aborting program\n\nUser break, cancelled...\nninja: build stopped: subcommand failed.\n"}
|
||||
- {"function": "VmBlobPackCommon", "attempt": "endianness staging switch owns integer-buffer alias boundary", "source": "0a4f0ab31810", "build": 0, "pool": true, "fuzzy": 97.62724, "insns": [668, 668], "diffs": 253, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## VmBlobUnpack
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target517/517: parser extent/count pass, array allocation, parser decode pass. New sizing/helper split and blob-element allocation distinguish code from previously tried integer value decoder and hex/zero trimming helpers.
|
||||
- {"function": "VmBlobUnpack", "attempt": "complete count scan through const blob-and-format inline helper", "source": "2cdadc9a90a6", "build": 0, "pool": true, "fuzzy": 94.471954, "insns": [538, 517], "diffs": 502, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmBlobUnpack", "attempt": "endianness conversion separated before signedness decoding", "source": "b4e6a55b58ac", "build": 0, "pool": true, "fuzzy": 98.03675, "insns": [517, 517], "diffs": 150, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmBlobUnpack", "attempt": "blob-element allocation, source copy and cursor advancement helper", "source": "3fa61d774d6e", "build": 0, "pool": true, "fuzzy": 97.05996, "insns": [522, 517], "diffs": 402, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmBlobGetHexString", "attempt": "formal const parent with explicit legacy accessor adaptation, accessor does not write header", "source": "80c44abc68dd", "build": 0, "pool": true, "fuzzy": 97.13415, "insns": [82, 82], "diffs": 33, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmBlobPackCommon", "attempt": "first-pass sizing helper with C89 declarations and const blob input", "source": "55c48705e748", "build": 0, "pool": true, "fuzzy": 94.18563, "insns": [691, 668], "diffs": 655, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmBlobPackCommon", "attempt": "string payload conversion helper preserving mutable legacy accessor signature", "source": "2e4063c2b5e3", "build": 0, "pool": true, "fuzzy": 97.03443, "insns": [666, 668], "diffs": 362, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## VmWinEmuWrite
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target67/67 reuses dead VM r27 for converted object; baseline instead uses r29 and uses r27 for length. Earlier whole-writer, whole-loop, typed accessor and call-only helpers already failed. Isolate real per-chunk locals and report handling, leaving object reload in caller.
|
||||
- {"function": "VmWinEmuWrite", "attempt": "whole per-chunk encoder and report helper owns its actual scratch buffer", "source": "2b5a13b8d79d", "build": 0, "pool": true, "fuzzy": 87.0, "insns": [71, 67], "diffs": 48, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "per-chunk encoding/report helper receives caller-owned buffer and lengths", "source": "fdbef89ce98b", "build": 0, "pool": true, "fuzzy": 87.07462, "insns": [71, 67], "diffs": 47, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "VmWinEmuWrite", "attempt": "successful SJIS buffer termination and report use separate inline helper", "source": "983e5f910cb8", "build": 0, "pool": true, "fuzzy": 99.62687, "insns": [67, 67], "diffs": 5, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## CHANSVmLinkModules
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target189/189, 43 allocation differences. Global pass owns r25 table/r26 list/r27 index; native pass owns r27 table/r26 list/r25 index, module lives r23. Separate list-input helpers remove shared loop-index/table variable lifetimes; earlier pVm-input pass helpers were not exact.
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "resolution passes (1,) receive list head directly, module formal first", "source": "8177855f3d19", "build": 0, "pool": true, "fuzzy": 99.07407, "insns": [189, 189], "diffs": 31, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "resolution passes (2,) receive list head directly, module formal first", "source": "3e72e69edb87", "build": 0, "pool": true, "fuzzy": 98.783066, "insns": [189, 189], "diffs": 39, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "resolution passes (1, 2) receive list head directly, module formal first", "source": "dc852938244a", "build": 0, "pool": true, "fuzzy": 99.33862, "insns": [189, 189], "diffs": 23, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "resolution passes (1, 2) receive list head directly, module formal second", "source": "a6f0eff3d448", "build": 0, "pool": true, "fuzzy": 99.33862, "insns": [189, 189], "diffs": 23, "code": "39152", "data": "6904", "regress": []}
|
||||
Both list-input helpers reduce LinkModules43 to23 diffs. All inner-pass registers now match; only module r24 versus targetr23 and outer index r23 versus targetr24 differ. Try natural caller declaration/initialization order on this new graph, then third pass boundary.
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "declare outer index before module pointer with two list-input helpers", "source": "63a498a10d6e", "build": 0, "pool": true, "fuzzy": 100.0, "insns": [189, 189], "diffs": 0, "code": "39908", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "initialize outer index before binding module list with two list-input helpers", "source": "3c99bfc27a2f", "build": 0, "pool": true, "fuzzy": 99.33862, "insns": [189, 189], "diffs": 23, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "outer module traversal expressed as counted for loop with two list-input helpers", "source": "46540aabf2f8", "build": 0, "pool": true, "fuzzy": 99.33862, "insns": [189, 189], "diffs": 23, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "three typed pass helpers with const module input for local method scan", "source": "8cc52683bdc5", "build": 0, "pool": true, "fuzzy": 99.33862, "insns": [189, 189], "diffs": 23, "code": "39152", "data": "6904", "regress": []}
|
||||
|
||||
## CHANSVmStep
|
||||
Origin a120e478; owned source unchanged.
|
||||
Target1253/1253 with276 differences. Previous count/property/type-enumeration boundaries audited and not repeated. Test independently scoped constant-string, indirect-load and indirect-store handlers; preserve frame scratch outputs and return paths.
|
||||
- {"function": "CHANSVmStep", "attempt": "constant-string validation and accumulator publication form one inline handler", "source": "ca8f3b843126", "build": 0, "pool": true, "fuzzy": 96.98723, "insns": [1253, 1253], "diffs": 276, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmStep", "attempt": "LOAD_INDIRECT copy lookup store cleanup owned by inline handler with explicit scratch reference", "source": "9cd14aeb2e8e", "build": 0, "pool": true, "fuzzy": 96.98723, "insns": [1253, 1253], "diffs": 276, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmStep", "attempt": "STORE_INDIRECT copy lookup store cleanup owned by inline handler with explicit scratch reference", "source": "d3d015790c88", "build": 0, "pool": true, "fuzzy": 96.98723, "insns": [1253, 1253], "diffs": 276, "code": "39152", "data": "6904", "regress": []}
|
||||
- {"function": "CHANSVmLinkModules", "attempt": "format exact helper candidate and remove caller declarations and labels made obsolete by extraction", "source": "b620541da10c", "build": 0, "pool": true, "fuzzy": 100.0, "insns": [189, 189], "diffs": 0, "code": "39908", "data": "6904", "regress": []}
|
||||
|
||||
## Exact candidate
|
||||
|
||||
CHANSVmLinkModules now100.0%,189/189instructions,diffs0. The global and native dispatch walks each take their module and list head as arguments, own their own table/index/list locals, and return the existing error code. This reproduces target inner-loop register lifetimes. Declaring the outer module counter before its module pointer fixes the final r23/r24 exchange. Calls, traversal order, bounds checks, error joins, writes and literal pool are unchanged. No assembly, undefined values, volatile, metadata or linking change. Cleaned obsolete caller locals/labels and helper indentation; exact status and all233 baseline function scores rechecked. Candidate adds756 matched code bytes, keeps6904/6904 data, and raises223->224 exact functions. Parent validation still required.
|
||||
|
||||
All ten remaining baseline functions have at least3 distinct compiled source forms. Failed compiles do not count. Parser/date/formatter/writer scheduling and register ties remain; blob sizing boundaries introduce control-flow cost, so all are restored. Step's three new handler boundaries reproduce the original1253instructions/276diffs unchanged. Only LinkModules is retained.
|
||||
|
||||
|
||||
Quick gate PASS: full43Ubuild, targetDOL26116613f624061ba99c8d1a299aaa6efa85670d, pool identical, instruction-exact224/233, matched code39908/53564, data6904/6904; regressions0, forbidden0, readability0. Focused diff reviewed: only the two dispatch walks extracted and caller index declaration moved. Local checkpoint commit follows; final non-quick clean gate remains required.
|
||||
|
||||
## Final coverage and clean gate
|
||||
|
||||
- CHANSVmConvertToFloatFromStr: 97.59036%; 83/83 instructions, 2 differences; 3 distinct successful trials.
|
||||
- VmDateDtor: 94.96703%; 91/91 instructions, 7 differences; 3 distinct successful trials.
|
||||
- VmStringSplit: 98.04054%; 222/222 instructions, 66 differences; 3 distinct successful trials.
|
||||
- CHANSVmFormatString: 99.84919%; 431/431 instructions, 13 differences; 3 distinct successful trials.
|
||||
- VmBlobGetHexString: 98.71951%; 82/82 instructions, 14 differences; 3 distinct successful trials.
|
||||
- VmBlobPackCommon: 97.949104%; 668/668 instructions, 244 differences; 3 distinct successful trials.
|
||||
- VmBlobUnpack: 98.452614%; 517/517 instructions, 141 differences; 3 distinct successful trials.
|
||||
- VmWinEmuWrite: 99.62687%; 67/67 instructions, 5 differences; 3 distinct successful trials.
|
||||
- CHANSVmStep: 96.98723%; 1253/1253 instructions, 276 differences; 3 distinct successful trials.
|
||||
|
||||
36 distinct successful source trials, including final formatting; 3 failed compilation trials excluded. All 9 remaining functions received at least 3 distinct compiling attempts. Only CHANSVmLinkModules source changes retained.
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/channelScript/CHANSVm] pool: IDENTICAL
|
||||
[src/channelScript/CHANSVm] objdiff: code 39908/53564 data 6904/6904 functions 224/233 fuzzy 99.4599 linked code 0
|
||||
[src/channelScript/CHANSVm] instruction-exact functions: 224/233
|
||||
[src/channelScript/CHANSVm] section .data size 4672 match 100.0
|
||||
[src/channelScript/CHANSVm] section .rodata size 1432 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sbss size 16 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata size 600 match 100.0
|
||||
[src/channelScript/CHANSVm] section .sdata2 size 184 match 100.0
|
||||
[src/channelScript/CHANSVm] section .text size 53564 match 99.45986
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmConvertToFloatFromStr 97.59036
|
||||
[src/channelScript/CHANSVm] below 100: VmDateDtor 94.96703
|
||||
[src/channelScript/CHANSVm] below 100: VmStringSplit 98.04054
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmFormatString 99.84919
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobGetHexString 98.71951
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobPackCommon 97.949104
|
||||
[src/channelScript/CHANSVm] below 100: VmBlobUnpack 98.452614
|
||||
[src/channelScript/CHANSVm] below 100: VmWinEmuWrite 99.62687
|
||||
[src/channelScript/CHANSVm] below 100: CHANSVmStep 96.98723
|
||||
[src/channelScript/CHANSVm] baseline: code 39152/53564 data 6904 functions 223 fuzzy 99.4412
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.30162 -> 92.32686
|
||||
global fuzzy_match_percent: 99.73362 -> 99.73394
|
||||
global complete_code_percent: 74.91312 -> 74.91312
|
||||
global matched_data_percent: 99.78196 -> 99.78196
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
Final non-quick clean gate PASS. Instruction-exact functions 223/233 -> 224/233, code 39152 -> 39908/53564, data 6904/6904 unchanged. Source commit 594bce67. Fresh post-gate objdiff/report, pool125/125, ctxdiff189/189 with zero differences, full43U build and build/43U/ok agree. DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d. Regressions, forbidden additions and readability warnings are all zero. Origin remains a120e478; no concurrent owned-source changes. No push, PR, merge, rebase or other worktree edits.
|
||||
|
||||
Parent acceptance remains pending. This worker round has a new exact function; the full unit still has 9 nonexact functions and remains unlinked. The compiler source shapes behind those remaining allocation and scheduling differences are unresolved. No source changes occurred after the clean gate.
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,839 +0,0 @@
|
||||
# Aggregate boundary sweep
|
||||
|
||||
Worktree sol-high, branch agent/w1003/agg-sweep. Baseline 38cb84c8. Fresh full 43U Ninja build and progress report pass. Origin fetched under /tmp/wii-git.lock. AOSS, ATERM, AOSSLink and eZiText excluded. Existing a6x, h6 and u7 untracked logs preserved.
|
||||
|
||||
Read AGENTS.md, common.md, levers.md and unslop. Only lever 13 candidates with target evidence can change object boundaries. Prior function-only helper/type trials are recorded in the existing attempts logs. Snapshot reference ELFs, section bytes and resolved relocations before any object correction. No configure/link changes.
|
||||
|
||||
## Live baseline and open-function audit
|
||||
|
||||
### src/system/iplKeyboard
|
||||
{"fuzzy_match_percent": 98.73506, "matched_code": "4752", "matched_code_percent": 78.88447, "matched_data": "1184", "matched_data_percent": 100.0, "matched_functions": 31, "matched_functions_percent": 96.875, "total_code": "6024", "total_data": "1184", "total_functions": 32, "total_units": 1}
|
||||
POOL IDENTICAL up to 28 (mine=28 base=28)
|
||||
Instruction-exact 31/32.
|
||||
- `create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap` 94.00944%; instructions 318/318, diffs 210, address-instruction diffs 61. Target objects: __vt__Q49textinput6extend4memo7Manager, jumptable_81638D20, lbl_816961F8, mspAllocator__Q34nw4r3lyt6Layout, sZiSysLangTable__Q23ipl8keyboard, smArg__Q23ipl6System. Large objects: sZiSysLangTable__Q23ipl8keyboard 0x58.
|
||||
|
||||
### src/system/odh
|
||||
{"fuzzy_match_percent": 99.55462, "matched_code": "12876", "matched_code_percent": 87.68728, "matched_data": "6360", "matched_data_percent": 100.0, "matched_functions": 26, "matched_functions_percent": 92.85714, "total_code": "14684", "total_data": "6360", "total_functions": 28, "total_units": 1}
|
||||
POOL IDENTICAL up to 10 (mine=10 base=10)
|
||||
Instruction-exact 26/28.
|
||||
- `LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli` 98.08219%; instructions 146/146, diffs 12, address-instruction diffs 2. Target objects: lbl_816945A0, lbl_816945A4, lbl_816945A8, lbl_816945AC, lbl_816945B0, lbl_816945B4, lbl_816945B8, lbl_816945C0. Large objects: none.
|
||||
- `huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl` 95.57189%; instructions 306/306, diffs 171, address-instruction diffs 21. Target objects: none. Large objects: none.
|
||||
|
||||
### src/utility/iplESMisc
|
||||
{"fuzzy_match_percent": 99.8625, "matched_code": "9404", "matched_code_percent": 83.96429, "matched_data": "4416", "matched_data_percent": 100.0, "matched_functions": 30, "matched_functions_percent": 96.77419, "total_code": "11200", "total_data": "4416", "total_functions": 31, "total_units": 1}
|
||||
POOL IDENTICAL up to 114 (mine=114 base=114)
|
||||
Instruction-exact 30/31.
|
||||
- `DeleteUnauthorizedData__Q33ipl7utility6ESMiscFPQ23EGG4Heap` 99.14254%; instructions 449/449, diffs 74, address-instruction diffs 3. Target objects: @17577. Large objects: none.
|
||||
|
||||
### src/iplwww/www_wiisetting
|
||||
{"fuzzy_match_percent": 99.94495, "matched_code": "3740", "matched_code_percent": 60.556995, "matched_data": "3856", "matched_data_percent": 100.0, "matched_functions": 20, "matched_functions_percent": 95.2381, "total_code": "6176", "total_data": "3856", "total_functions": 21, "total_units": 1}
|
||||
POOL IDENTICAL up to 72 (mine=72 base=72)
|
||||
Instruction-exact 20/21.
|
||||
- `Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue` 99.86043%; instructions 609/609, diffs 14, address-instruction diffs 4. Target objects: funcResult__Q23www10wiisetting, jumptable_816441AC, jumptable_816442CC, lbl_8160F0F0, lbl_816440A0, lbl_81644834, lbl_816946B8, lbl_816946C0, lbl_8169631C, lbl_8169631D, opera_callbacks__Q23www10wiisetting, pString__Q23www10wiisetting, sWiiData__Q23www10wiisetting, saveData__Q23www10wiisetting, setupFlag__Q23www10wiisetting, wiiFlag__Q23www10wiisetting, wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue, wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue, writeBackID__Q23www10wiisetting. Large objects: jumptable_816441AC 0x120, jumptable_816442CC 0x64, lbl_8160F0F0 0x164, lbl_81644834 0x64, sWiiData__Q23www10wiisetting 0x48, wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue 0x5c, wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue 0x344.
|
||||
|
||||
### src/BS2/BS2Mach
|
||||
{"fuzzy_match_percent": 99.169846, "matched_code": "5112", "matched_code_percent": 30.106009, "matched_data": "158528", "matched_data_percent": 100.0, "matched_functions": 25, "matched_functions_percent": 86.206894, "total_code": "16980", "total_data": "158528", "total_functions": 29, "total_units": 1}
|
||||
POOL IDENTICAL up to 91 (mine=91 base=91)
|
||||
Instruction-exact 25/29.
|
||||
- `BS2StartGame` 98.72774%; instructions 393/393, diffs 10, address-instruction diffs 6. Target objects: BS2NANDCallback, Block, CacheFailed, DiskID, DvdTransferred, GamePartition, LoaderClose, LowReadResult, NandPending, RequiredIosHigh, RequiredIosLow, StartingGame, TicketViews, callback, lbl_81645DA8. Large objects: BS2NANDCallback 0x64.
|
||||
- `BS2StartGCGame` 97.82895%; instructions 228/228, diffs 9, address-instruction diffs 5. Target objects: BS2NANDCallback, BS2VideoMode, Block, CacheFailed, NandPending, StartingGame, TicketViews, lbl_81645DA8, lbl_81696584. Large objects: BS2NANDCallback 0x64.
|
||||
- `CheckBS2CommandStatus` 99.50739%; instructions 406/406, diffs 2, address-instruction diffs 0. Target objects: BS2BootCaching, BS2BootFromCache, BS2NANDCallback, BannerBuffer, BannerLength, Block, CacheCommandComplete, CacheLength, CacheSeekComplete, DataToc, LoaderAddress, LoaderLength, NandPending, State, jumptable_81646338, lbl_81645DA8. Large objects: BS2NANDCallback 0x64, jumptable_81646338 0xb8.
|
||||
- `BS2Tick` 98.799484%; instructions 1940/1940, diffs 71, address-instruction diffs 15. Target objects: AbortFlag, Allocator, AudioBufferUnconfigured, BS2BootCaching, BS2BootFromCache, BS2DVDCallback, BS2DriveReset, BS2NANDCallback, BS2NoDisk, BS2Report, BS2WaitSpinup, BannerAllocation, BannerAvailable, BannerBuffer, BannerLength, Block, CoverOpenTimeHigh, CoverOpenTimeLow, CoverPollTime, CurrentTmd, DataToc, DriveWasReset, DvdProgress, DvdReadPending, DvdTransferLength, DvdTransferred, FatalErrorFlag, GamePartition, GameToc, LoaderAddress, LoaderClose, LoaderInit, LoaderLength, LoaderMain, LoaderOffset, LoadingTitle, NandPending, OSReport, PartitionCursor, PartitionOpen, RegionValid, RequiredIosHigh, RequiredIosLow, ResetTime, RestartRequested, RetryErrorFlag, SpinupDeadline, StartingGame, State, TitleCode, TitleTicketView, UpdateErrorFlag, UpdatePartition, __DVDLayoutFormat, jumptable_816467F4, jumptable_81646850, lbl_81645DA8, lbl_8169658B, lbl_81696590, lbl_81696594. Large objects: BS2DVDCallback 0x144, BS2NANDCallback 0x64, BS2Report 0x50, jumptable_816467F4 0x5c, jumptable_81646850 0x124.
|
||||
|
||||
### src/BS2/BS2Update
|
||||
{"fuzzy_match_percent": 95.340576, "matched_code": "400", "matched_code_percent": 9.871669, "matched_data": "10488", "matched_data_percent": 100.0, "matched_functions": 9, "matched_functions_percent": 90.0, "total_code": "4052", "total_data": "10488", "total_functions": 10, "total_units": 1}
|
||||
POOL IDENTICAL up to 55 (mine=55 base=55)
|
||||
Instruction-exact 9/10.
|
||||
- `UpdateThread` 94.83023%; instructions 911/913, diffs 337, address-instruction diffs 163. Target objects: CancelUpdate, ContainsSeatTitles, CurrentEntry, EntriesCount, Flags0, RebootRequired, StartUpdate, State, UpdateImportResult, UpdateImportState, UpdateProgress, jumptable_81646E78, lbl_81646978, lbl_81696598, lbl_8169659A, lbl_8169659E, lbl_816965A5, pEntries, pFlags, rc. Large objects: Flags0 0x800, lbl_81646978 0x500.
|
||||
|
||||
### src/scene/address/iplAddress
|
||||
{"fuzzy_match_percent": 99.923294, "matched_code": "22016", "matched_code_percent": 91.77922, "matched_data": "1964", "matched_data_percent": 100.0, "matched_functions": 99, "matched_functions_percent": 98.019806, "total_code": "23988", "total_data": "1964", "total_functions": 101, "total_units": 1}
|
||||
POOL IDENTICAL up to 81 (mine=81 base=81)
|
||||
Instruction-exact 98/101.
|
||||
- `start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface` 99.84305%; instructions 223/223, diffs 7, address-instruction diffs 1. Target objects: @17080, lbl_816947D8, sSystem__Q23ipl3snd, smArg__Q23ipl6System. Large objects: none.
|
||||
- `onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface` 98.42593%; instructions 270/270, diffs 81, address-instruction diffs 12. Target objects: @17080, sSystem__Q23ipl3snd, smArg__Q23ipl6System, smButtonName__Q33ipl5scene6Button. Large objects: none.
|
||||
|
||||
### src/scene/address/iplAddressEdit
|
||||
{"fuzzy_match_percent": 99.55282, "matched_code": "23344", "matched_code_percent": 86.10209, "matched_data": "2560", "matched_data_percent": 100.0, "matched_functions": 91, "matched_functions_percent": 96.80851, "total_code": "27112", "total_data": "2560", "total_functions": 94, "total_units": 1}
|
||||
POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
Instruction-exact 91/94.
|
||||
- `create__Q33ipl5scene11AddressEditFv` 97.5561%; instructions 818/820, diffs 331, address-instruction diffs 155. Target objects: @16959, __vt__Q33ipl5scene16AddressEditEvent, __vt__Q33ipl5scene17AddressInputEvent, lbl_816947F0, lbl_816947F4, lbl_816947F8, lbl_816965E4, lbl_816965E8, lbl_816965EA, nigaoe_create_callback_edit__Q33ipl5scene11AddressEditFPQ33ipl6nigaoe6ObjectPv, sFriendInfo__Q23ipl5scene, sInputPaneName, smArg__Q23ipl6System. Large objects: nigaoe_create_callback_edit__Q33ipl5scene11AddressEditFPQ33ipl6nigaoe6ObjectPv 0xb0, sFriendInfo__Q23ipl5scene 0x140.
|
||||
- `get_friendinfo__Q33ipl5scene11AddressEditFv` 88.03571%; instructions 82/84, diffs 68, address-instruction diffs 37. Target objects: @24215, @24231, sFriendInfo__Q23ipl5scene. Large objects: sFriendInfo__Q23ipl5scene 0x140.
|
||||
- `update_friendinfo__Q33ipl5scene11AddressEditFv` 99.42105%; instructions 38/38, diffs 2, address-instruction diffs 2. Target objects: sFriendInfo__Q23ipl5scene, smArg__Q23ipl6System. Large objects: sFriendInfo__Q23ipl5scene 0x140.
|
||||
|
||||
### src/scene/memoryCard/iplMemoryCardManager
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 97.90215, "matched_code": "2932", "matched_code_percent": 54.336548, "matched_data_percent": 100.0, "matched_functions": 19, "matched_functions_percent": 73.07692, "total_code": "5396", "total_functions": 26, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 19/26.
|
||||
- `isMoveEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl` 99.830505%; instructions 118/118, diffs 2, address-instruction diffs 0. Target objects: none. Large objects: none.
|
||||
- `isCopyEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl` 99.830505%; instructions 118/118, diffs 2, address-instruction diffs 0. Target objects: none. Large objects: none.
|
||||
- `isBannerEnable__Q33ipl5scene17MemoryCardManagerFUcs` 92.30769%; instructions 26/26, diffs 8, address-instruction diffs 2. Target objects: none. Large objects: none.
|
||||
- `_create_icon__Q33ipl5scene17MemoryCardManagerFUcsl` 87.55%; instructions 100/100, diffs 37, address-instruction diffs 5. Target objects: none. Large objects: none.
|
||||
- `getComment__Q33ipl5scene17MemoryCardManagerFUcsi` 98.94309%; instructions 123/123, diffs 20, address-instruction diffs 1. Target objects: none. Large objects: none.
|
||||
- `create_banner__Q33ipl5scene17MemoryCardManagerFUcs` 90.42453%; instructions 106/106, diffs 70, address-instruction diffs 11. Target objects: none. Large objects: none.
|
||||
- `getBlocks__Q33ipl5scene17MemoryCardManagerFUcs` 92.0%; instructions 25/25, diffs 9, address-instruction diffs 2. Target objects: none. Large objects: none.
|
||||
|
||||
### src/scene/cardSequence/iplCardSequence
|
||||
{"fuzzy_match_percent": 97.225334, "matched_code": "4168", "matched_code_percent": 42.30613, "matched_data": "1496", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 90.0, "total_code": "9852", "total_data": "1496", "total_functions": 30, "total_units": 1}
|
||||
POOL IDENTICAL up to 43 (mine=43 base=43)
|
||||
Instruction-exact 27/30.
|
||||
- `cardThreadMain` 97.9402%; instructions 301/301, diffs 78, address-instruction diffs 8. Target objects: jumptable_81652F68, jumptable_8165321C, lbl_81696CF8, sThread__Q23ipl10memorycard. Large objects: jumptable_81652F68 0x70.
|
||||
- `loadCardFileIcons` 90.37305%; instructions 508/512, diffs 436, address-instruction diffs 107. Target objects: sThread__Q23ipl10memorycard. Large objects: none.
|
||||
- `runCardMoveOrCopy` 97.88651%; instructions 608/608, diffs 176, address-instruction diffs 26. Target objects: clearCardWritePending, jumptable_81652F68, sThread__Q23ipl10memorycard. Large objects: jumptable_81652F68 0x70.
|
||||
|
||||
### src/scene/sdChannelSelect/iplSDChannelSelect
|
||||
{"fuzzy_match_percent": 99.77309, "matched_code": "30344", "matched_code_percent": 89.70084, "matched_data": "2960", "matched_data_percent": 100.0, "matched_functions": 123, "matched_functions_percent": 95.34883, "total_code": "33828", "total_data": "2960", "total_functions": 129, "total_units": 1}
|
||||
POOL IDENTICAL up to 101 (mine=101 base=101)
|
||||
Instruction-exact 123/129.
|
||||
- `create__Q33ipl5scene15SDChannelSelectFv` 97.73972%; instructions 145/146, diffs 39, address-instruction diffs 15. Target objects: @24633, @24634, smArg__Q23ipl6System. Large objects: none.
|
||||
- `collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` 97.81188%; instructions 101/101, diffs 4, address-instruction diffs 2. Target objects: smArg__Q23ipl6System. Large objects: none.
|
||||
- `collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` 97.833336%; instructions 102/102, diffs 4, address-instruction diffs 2. Target objects: smArg__Q23ipl6System. Large objects: none.
|
||||
- `collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` 98.007935%; instructions 126/126, diffs 7, address-instruction diffs 2. Target objects: lbl_816105D8, smArg__Q23ipl6System. Large objects: none.
|
||||
- `collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl` 97.55125%; instructions 361/361, diffs 16, address-instruction diffs 8. Target objects: smArg__Q23ipl6System. Large objects: none.
|
||||
- `flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv` 99.65714%; instructions 35/35, diffs 2, address-instruction diffs 0. Target objects: smArg__Q23ipl6System. Large objects: none.
|
||||
|
||||
### src/scene/sdChannelTitle/iplSDChannelTitle
|
||||
{"fuzzy_match_percent": 99.98883, "matched_code": "18476", "matched_code_percent": 99.20533, "matched_data": "1976", "matched_data_percent": 100.0, "matched_functions": 68, "matched_functions_percent": 98.55073, "total_code": "18624", "total_data": "1976", "total_functions": 69, "total_units": 1}
|
||||
POOL IDENTICAL up to 55 (mine=55 base=55)
|
||||
Instruction-exact 68/69.
|
||||
- `iplSDChannelTitle_flushSaveBeforeExit` 98.5946%; instructions 37/37, diffs 6, address-instruction diffs 2. Target objects: smArg__Q23ipl6System. Large objects: none.
|
||||
|
||||
### src/scene/sdChannelMemory/iplSDMemory
|
||||
{"fuzzy_match_percent": 99.26294, "matched_code": "14812", "matched_code_percent": 70.96589, "matched_data": "3344", "matched_data_percent": 100.0, "matched_functions": 64, "matched_functions_percent": 96.969696, "total_code": "20872", "total_data": "3344", "total_functions": 66, "total_units": 1}
|
||||
POOL IDENTICAL up to 90 (mine=90 base=90)
|
||||
Instruction-exact 63/66.
|
||||
- `create__Q33ipl5scene8SDMemoryFPQ23EGG4HeapPQ33ipl4nand10LayoutFilePQ33ipl5scene15SDChannelSelect` 99.15884%; instructions 1064/1064, diffs 175, address-instruction diffs 111. Target objects: lbl_81655CA0, lbl_8165680C, lbl_81656824, lbl_8165683C, lbl_81696F7C, lbl_81696F80, lbl_81696F88, lbl_81696F8F, lbl_81696F96, lbl_81696F9D, lbl_81696FA4, lbl_81696FAB, lbl_81696FB3, lbl_81696FBB, smArg__Q23ipl6System. Large objects: lbl_8165683C 0xac.
|
||||
- `drawTransferTitles__Q33ipl5scene8SDMemoryFv` 93.456764%; instructions 438/451, diffs 371, address-instruction diffs 96. Target objects: lbl_81655CA0, lbl_81694BD0, lbl_81694BD8, lbl_81694BF0, lbl_81694BF4, lbl_81694BF8, lbl_81694BFC, lbl_81696FC2, lbl_81696FC9, lbl_81696FD6, lbl_81696FDA, lbl_81696FE1, smArg__Q23ipl6System. Large objects: none.
|
||||
|
||||
### src/scene/setting/iplSetting
|
||||
{"fuzzy_match_percent": 99.97709, "matched_code": "36796", "matched_code_percent": 97.128075, "matched_data": "5696", "matched_data_percent": 100.0, "matched_functions": 111, "matched_functions_percent": 99.10714, "total_code": "37884", "total_data": "5696", "total_functions": 112, "total_units": 1}
|
||||
POOL IDENTICAL up to 108 (mine=108 base=108)
|
||||
Instruction-exact 110/112.
|
||||
- `scanAP__Q33ipl5scene7SettingFv` 99.20221%; instructions 272/272, diffs 4, address-instruction diffs 2. Target objects: @27404, @27405, @27406, @27407, @27409. Large objects: none.
|
||||
|
||||
### src/keyboard/tiCellPhone
|
||||
{"fuzzy_match_percent": 99.992645, "matched_code": "17696", "matched_code_percent": 92.999794, "matched_data": "3860", "matched_data_percent": 100.0, "matched_functions": 85, "matched_functions_percent": 98.83721, "total_code": "19028", "total_data": "3860", "total_functions": 86, "total_units": 1}
|
||||
POOL IDENTICAL up to 76 (mine=76 base=76)
|
||||
Instruction-exact 85/86.
|
||||
- `create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator` 99.8949%; instructions 333/333, diffs 7, address-instruction diffs 0. Target objects: __vt__Q39textinput11nw4rmanager7AnmPane, __vt__Q49textinput8keyboard13cellphonetype12EventHandler, __vt__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPane, __vt__Q49textinput8keyboard13cellphonetype23CellPhoneControlAnmPane, csPaneNameToControlKey__Q39textinput8keyboard13cellphonetype, csszPredictLanguage__Q39textinput8keyboard13cellphonetype. Large objects: csPaneNameToControlKey__Q39textinput8keyboard13cellphonetype 0x120.
|
||||
|
||||
### src/keyboard/tiInputForm
|
||||
{"fuzzy_match_percent": 99.71999, "matched_code": "47928", "matched_code_percent": 94.614655, "matched_data": "3772", "matched_data_percent": 100.0, "matched_functions": 219, "matched_functions_percent": 99.095024, "total_code": "50656", "total_data": "3772", "total_functions": 221, "total_units": 1}
|
||||
POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
Instruction-exact 217/221.
|
||||
- `calcCursorPos__Q39textinput9inputform4BaseFff` 93.05215%; instructions 326/326, diffs 43, address-instruction diffs 0. Target objects: mbHyphen__Q29textinput9inputform, scInputFormHalfF, scInputFormOneF, scInputFormZeroF. Large objects: none.
|
||||
- `create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer` 96.40169%; instructions 356/356, diffs 153, address-instruction diffs 28. Target objects: __vt__Q39textinput11nw4rmanager7AnmPane, __vt__Q39textinput9inputform12EventHandler, __vt__Q39textinput9inputform19NormalButtonAnmPane, csCharColor__Q29textinput9inputform, lbl_816973B4, lbl_816973B8, scP_txtScrll_UP. Large objects: none.
|
||||
|
||||
### src/keyboard/tiCandidateBox
|
||||
{"fuzzy_match_percent": 99.71067, "matched_code": "21728", "matched_code_percent": 90.53333, "matched_data": "4652", "matched_data_percent": 100.0, "matched_functions": 110, "matched_functions_percent": 98.21429, "total_code": "24000", "total_data": "4652", "total_functions": 112, "total_units": 1}
|
||||
POOL IDENTICAL up to 57 (mine=57 base=57)
|
||||
Instruction-exact 109/112.
|
||||
- `create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator` 95.99148%; instructions 356/352, diffs 278, address-instruction diffs 57. Target objects: __vt__Q39textinput8tistring9Decolated, lbl_81694D90, scB_OnBtn, scEmptyWChars, scP_OnBtn, scT_prdc_Text_00. Large objects: none.
|
||||
- `createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator` 98.49537%; instructions 216/216, diffs 64, address-instruction diffs 5. Target objects: __vt__Q39textinput11nw4rmanager7AnmPane, __vt__Q39textinput12candidatebox12OnOffAnmPane, __vt__Q39textinput12candidatebox13PredictWindow, __vt__Q39textinput12candidatebox20CandidateTextAnmPane, __vt__Q39textinput12candidatebox22CandidateScrollAnmPane, scCandidatePaneData. Large objects: scCandidatePaneData 0x68c.
|
||||
|
||||
### src/keyboard/tiSignWindow
|
||||
{"fuzzy_match_percent": 99.9833, "matched_code": "6300", "matched_code_percent": 87.69488, "matched_data": "3468", "matched_data_percent": 100.0, "matched_functions": 55, "matched_functions_percent": 98.21429, "total_code": "7184", "total_data": "3468", "total_functions": 56, "total_units": 1}
|
||||
POOL IDENTICAL up to 30 (mine=30 base=30)
|
||||
Instruction-exact 55/56.
|
||||
- `create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator` 99.86425%; instructions 221/221, diffs 6, address-instruction diffs 0. Target objects: __vt__Q39textinput11nw4rmanager7AnmPane, __vt__Q49textinput8keyboard10signwindow12EventHandler, __vt__Q49textinput8keyboard10signwindow23CellPhoneSignAllAnmPane, __vt__Q49textinput8keyboard10signwindow23CellPhoneSignButtonPane, __vt__Q49textinput8keyboard10signwindow26CellPhoneSignScrollAnmPane, csLanguageDependencyData__Q39textinput8keyboard10signwindow, csPaneToAnimationInSign__Q39textinput8keyboard10signwindow. Large objects: csLanguageDependencyData__Q39textinput8keyboard10signwindow 0x50, csPaneToAnimationInSign__Q39textinput8keyboard10signwindow 0x640.
|
||||
|
||||
### src/keyboard/tiString
|
||||
{"fuzzy_match_percent": 99.028595, "matched_code": "4632", "matched_code_percent": 89.48995, "matched_data": "288", "matched_data_percent": 100.0, "matched_functions": 41, "matched_functions_percent": 97.61904, "total_code": "5176", "total_data": "288", "total_functions": 42, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 41/42.
|
||||
- `inputChar__Q39textinput8tistring9DecolatedFw` 90.757355%; instructions 126/136, diffs 73, address-instruction diffs 12. Target objects: none. Large objects: none.
|
||||
|
||||
### src/keyboard/tiZiString
|
||||
{"fuzzy_match_percent": 98.32413, "matched_code": "3136", "matched_code_percent": 56.97674, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 26, "matched_functions_percent": 89.655174, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 26/29.
|
||||
- `clearCandidates__Q39textinput8tistring6WithZiFv` 93.28395%; instructions 84/81, diffs 76, address-instruction diffs 19. Target objects: ElementBuffer__Q39textinput8tistring6WithZi. Large objects: ElementBuffer__Q39textinput8tistring6WithZi 0x200.
|
||||
- `update__Q39textinput8tistring6WithZiFv` 97.4574%; instructions 448/446, diffs 427, address-instruction diffs 98. Target objects: ElementBuffer__Q39textinput8tistring6WithZi. Large objects: ElementBuffer__Q39textinput8tistring6WithZi 0x200.
|
||||
- `setElementBuffer__Q39textinput8tistring6WithZiFv` 90.33846%; instructions 65/65, diffs 18, address-instruction diffs 9. Target objects: ElementBuffer__Q39textinput8tistring6WithZi. Large objects: ElementBuffer__Q39textinput8tistring6WithZi 0x200.
|
||||
|
||||
### src/channelScript/CHANSVm
|
||||
{"fuzzy_match_percent": 99.45986, "matched_code": "39908", "matched_code_percent": 74.505264, "matched_data": "6904", "matched_data_percent": 100.0, "matched_functions": 224, "matched_functions_percent": 96.13734, "total_code": "53564", "total_data": "6904", "total_functions": 233, "total_units": 1}
|
||||
POOL IDENTICAL up to 125 (mine=125 base=125)
|
||||
Instruction-exact 224/233.
|
||||
- `CHANSVmConvertToFloatFromStr` 97.59036%; instructions 83/83, diffs 2, address-instruction diffs 0. Target objects: lbl_81694F08, scFloatConstantList. Large objects: none.
|
||||
- `VmDateDtor` 94.96703%; instructions 91/91, diffs 7, address-instruction diffs 4. Target objects: scUndefinedUtf16. Large objects: none.
|
||||
- `VmStringSplit` 98.04054%; instructions 222/222, diffs 66, address-instruction diffs 4. Target objects: none. Large objects: none.
|
||||
- `CHANSVmFormatString` 99.84919%; instructions 431/431, diffs 13, address-instruction diffs 2. Target objects: jumptable_81669C54, jumptable_81669D34. Large objects: jumptable_81669C54 0xe0, jumptable_81669D34 0x84.
|
||||
- `VmBlobGetHexString` 98.71951%; instructions 82/82, diffs 14, address-instruction diffs 2. Target objects: scHexDigitsPtr. Large objects: none.
|
||||
- `VmBlobPackCommon` 97.949104%; instructions 668/668, diffs 244, address-instruction diffs 22. Target objects: lbl_81694FA7. Large objects: none.
|
||||
- `VmBlobUnpack` 98.452614%; instructions 517/517, diffs 141, address-instruction diffs 12. Target objects: scHexDigitsPtr2. Large objects: none.
|
||||
- `VmWinEmuWrite` 99.62687%; instructions 67/67, diffs 5, address-instruction diffs 0. Target objects: lbl_8166A07E, lbl_81697583. Large objects: none.
|
||||
- `CHANSVmStep` 96.98723%; instructions 1253/1253, diffs 276, address-instruction diffs 39. Target objects: CHANSVmConstStringObjectUndefined, CHANSVmDebugVerboseMode, VmARShift, VmAdd, VmBitAnd, VmBitOr, VmBitXor, VmCmpEq, VmCmpGeq, VmCmpGt, VmCmpLeq, VmCmpLt, VmCmpNeq, VmDiv, VmMod, VmMul, VmSub, VmULShift, jumptable_8166A0CC, jumptable_8166A0F4, jumptable_8166A1B0, lbl_8166A0B0, lbl_81694F28, lbl_81694FB8, lbl_81697591, scVmGetResultType. Large objects: VmARShift 0x98, VmAdd 0x158, VmBitAnd 0x54, VmBitOr 0x54, VmBitXor 0x54, VmCmpEq 0x1ac, VmCmpLeq 0x124, VmCmpLt 0x11c, VmCmpNeq 0x54, VmDiv 0xac, VmMod 0xa8, VmMul 0x8c, VmSub 0x7c, VmULShift 0x94, jumptable_8166A0F4 0xbc, jumptable_8166A1B0 0x100.
|
||||
|
||||
### libs/RevoEX/src/cdb/CDBRecord
|
||||
{"fuzzy_match_percent": 99.86998, "matched_code": "5940", "matched_code_percent": 83.94573, "matched_data": "2640", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "7076", "total_data": "2640", "total_functions": 29, "total_units": 1}
|
||||
POOL IDENTICAL up to 47 (mine=47 base=47)
|
||||
Instruction-exact 28/29.
|
||||
- `CDBRecordEncrypt` 99.19014%; instructions 284/284, diffs 44, address-instruction diffs 10. Target objects: lbl_8166BBC0. Large objects: none.
|
||||
|
||||
### libs/RevoEX/src/net/md5
|
||||
{"fuzzy_match_percent": 97.01755, "matched_code": "600", "matched_code_percent": 32.894737, "matched_data": "456", "matched_data_percent": 100.0, "matched_functions": 3, "matched_functions_percent": 75.0, "total_code": "1824", "total_data": "456", "total_functions": 4, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 3/4.
|
||||
- `ProcessBlock` 95.55556%; instructions 306/306, diffs 197, address-instruction diffs 12. Target objects: k$2351, t$2350. Large objects: k$2351 0xc0, t$2350 0x100.
|
||||
|
||||
### libs/RevoEX/src/net/aes
|
||||
{"fuzzy_match_percent": 84.47093, "matched_code": "1116", "matched_code_percent": 40.552326, "matched_data": "2800", "matched_data_percent": 100.0, "matched_functions": 7, "matched_functions_percent": 77.77778, "total_code": "2752", "total_data": "2800", "total_functions": 9, "total_units": 1}
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Instruction-exact 7/9.
|
||||
- `AESiEncryptBlock` 65.81013%; instructions 158/158, diffs 137, address-instruction diffs 6. Target objects: AESiEncryptTable, AESiSubShiftTable. Large objects: AESiEncryptTable 0x400, AESiSubShiftTable 0x100.
|
||||
- `AESiDecryptBlock` 78.95618%; instructions 251/251, diffs 215, address-instruction diffs 9. Target objects: AESiDecryptTable, AESiInvSubShiftTable. Large objects: AESiDecryptTable 0x400, AESiInvSubShiftTable 0x100.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_bgnend
|
||||
{"complete_code": "880", "complete_code_percent": 100.0, "complete_data": "136", "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "880", "matched_code_percent": 100.0, "matched_data": "136", "matched_data_percent": 100.0, "matched_functions": 9, "matched_functions_percent": 100.0, "total_code": "880", "total_data": "136", "total_functions": 9, "total_units": 1}
|
||||
POOL IDENTICAL up to 4 (mine=4 base=4)
|
||||
Instruction-exact 9/9.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_control
|
||||
{"complete_code": "420", "complete_code_percent": 100.0, "complete_data": "32", "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "420", "matched_code_percent": 100.0, "matched_data": "32", "matched_data_percent": 100.0, "matched_functions": 3, "matched_functions_percent": 100.0, "total_code": "420", "total_data": "32", "total_functions": 3, "total_units": 1}
|
||||
POOL IDENTICAL up to 1 (mine=1 base=1)
|
||||
Instruction-exact 3/3.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_list
|
||||
{"complete_code": "592", "complete_code_percent": 100.0, "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "592", "matched_code_percent": 100.0, "matched_data_percent": 100.0, "matched_functions": 5, "matched_functions_percent": 100.0, "total_code": "592", "total_functions": 5, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 5/5.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_os_RVL
|
||||
{"complete_code": "548", "complete_code_percent": 100.0, "complete_data": "72", "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "548", "matched_code_percent": 100.0, "matched_data": "72", "matched_data_percent": 100.0, "matched_functions": 11, "matched_functions_percent": 100.0, "total_code": "548", "total_data": "72", "total_functions": 11, "total_units": 1}
|
||||
POOL IDENTICAL up to 3 (mine=3 base=3)
|
||||
Instruction-exact 11/11.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_recvbuf
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 99.21513, "matched_code": "1196", "matched_code_percent": 70.68558, "matched_data_percent": 100.0, "matched_functions": 6, "matched_functions_percent": 85.71429, "total_code": "1692", "total_functions": 7, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 6/7.
|
||||
- `NHTTPi_compareTokenN_HdrRecvBuf` 97.32258%; instructions 124/124, diffs 5, address-instruction diffs 2. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_request
|
||||
{"complete_code": "2512", "complete_code_percent": 100.0, "complete_data": "48", "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "2512", "matched_code_percent": 100.0, "matched_data": "48", "matched_data_percent": 100.0, "matched_functions": 7, "matched_functions_percent": 100.0, "total_code": "2512", "total_data": "48", "total_functions": 7, "total_units": 1}
|
||||
POOL IDENTICAL up to 1 (mine=1 base=1)
|
||||
Instruction-exact 7/7.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_response
|
||||
{"complete_code": "1044", "complete_code_percent": 100.0, "complete_data": "16", "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "1044", "matched_code_percent": 100.0, "matched_data": "16", "matched_data_percent": 100.0, "matched_functions": 4, "matched_functions_percent": 100.0, "total_code": "1044", "total_data": "16", "total_functions": 4, "total_units": 1}
|
||||
POOL IDENTICAL up to 1 (mine=1 base=1)
|
||||
Instruction-exact 4/4.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_socket_RVL
|
||||
{"complete_code": "2140", "complete_code_percent": 100.0, "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "2140", "matched_code_percent": 100.0, "matched_data_percent": 100.0, "matched_functions": 10, "matched_functions_percent": 100.0, "total_code": "2140", "total_functions": 10, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 10/10.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_stdlib_RVL
|
||||
{"fuzzy_match_percent": 99.9573, "matched_code": "1864", "matched_code_percent": 82.91815, "matched_data": "112", "matched_data_percent": 100.0, "matched_functions": 12, "matched_functions_percent": 85.71429, "total_code": "2248", "total_data": "112", "total_functions": 14, "total_units": 1}
|
||||
POOL IDENTICAL up to 1 (mine=1 base=1)
|
||||
Instruction-exact 12/14.
|
||||
- `NHTTPi_strnicmp` 99.76471%; instructions 51/51, diffs 2, address-instruction diffs 0. Target objects: none. Large objects: none.
|
||||
- `NHTTPi_compareToken` 99.73333%; instructions 45/45, diffs 2, address-instruction diffs 0. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RevoEX/src/nhttp/NHTTP_thread
|
||||
{"complete_code": "11292", "complete_code_percent": 100.0, "complete_data": "504", "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "11292", "matched_code_percent": 100.0, "matched_data": "504", "matched_data_percent": 100.0, "matched_functions": 26, "matched_functions_percent": 100.0, "total_code": "11292", "total_data": "504", "total_functions": 26, "total_units": 1}
|
||||
POOL IDENTICAL up to 8 (mine=8 base=8)
|
||||
Instruction-exact 26/26.
|
||||
|
||||
### libs/RevoEX/src/nwc24/NWC24Download
|
||||
{"fuzzy_match_percent": 99.950386, "matched_code": "11920", "matched_code_percent": 95.390526, "matched_data": "80", "matched_data_percent": 100.0, "matched_functions": 29, "matched_functions_percent": 96.666664, "total_code": "12496", "total_data": "80", "total_functions": 30, "total_units": 1}
|
||||
POOL IDENTICAL up to 3 (mine=3 base=3)
|
||||
Instruction-exact 29/30.
|
||||
- `NWC24InitDlTask` 98.923615%; instructions 144/144, diffs 31, address-instruction diffs 2. Target objects: NWC24WorkP, lbl_8166E1FC. Large objects: none.
|
||||
|
||||
### libs/RevoEX/src/so/SOBasic
|
||||
{"fuzzy_match_percent": 99.79452, "matched_code": "3836", "matched_code_percent": 93.83562, "matched_data": "144", "matched_data_percent": 100.0, "matched_functions": 21, "matched_functions_percent": 95.454544, "total_code": "4088", "total_data": "144", "total_functions": 22, "total_units": 1}
|
||||
POOL IDENTICAL up to 1 (mine=1 base=1)
|
||||
Instruction-exact 21/22.
|
||||
- `SOGetSockName` 96.666664%; instructions 63/63, diffs 3, address-instruction diffs 0. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RevoEX/src/vf/dskmng/pdm_partition
|
||||
{"complete_code": "6108", "complete_code_percent": 100.0, "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "6108", "matched_code_percent": 100.0, "matched_data_percent": 100.0, "matched_functions": 19, "matched_functions_percent": 100.0, "total_code": "6108", "total_functions": 19, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 19/19.
|
||||
|
||||
### libs/RevoEX/src/vf/develop/sd_drv
|
||||
{"complete_code": "3608", "complete_code_percent": 100.0, "complete_data": "992", "complete_data_percent": 100.0, "complete_units": 1, "fuzzy_match_percent": 100.0, "matched_code": "3608", "matched_code_percent": 100.0, "matched_data": "992", "matched_data_percent": 100.0, "matched_functions": 16, "matched_functions_percent": 100.0, "total_code": "3608", "total_data": "992", "total_functions": 16, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 16/16.
|
||||
|
||||
### libs/RVLMiddleware/TMC_JPEG/src/buffer/idct_block_var
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 90.488045, "matched_data_percent": 100.0, "total_code": "2844", "total_functions": 2, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 0/2.
|
||||
- `TMCJPEGDEC_IdctBlock_Lumi` 86.178986%; instructions 257/257, diffs 185, address-instruction diffs 11. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_IdctBlock_Col` 92.927315%; instructions 454/454, diffs 290, address-instruction diffs 5. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 98.98035, "matched_code": "1348", "matched_code_percent": 26.49371, "matched_data_percent": 100.0, "matched_functions": 3, "matched_functions_percent": 50.0, "total_code": "5088", "total_functions": 6, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 3/6.
|
||||
- `TMCJPEGDEC_exif_parse` 99.43396%; instructions 212/212, diffs 21, address-instruction diffs 2. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_IFD0_tag_parse` 99.49065%; instructions 480/481, diffs 457, address-instruction diffs 40. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_IFD1_tag_parse` 96.14876%; instructions 239/242, diffs 226, address-instruction diffs 22. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 99.64535, "matched_code": "15164", "matched_code_percent": 95.08402, "matched_data_percent": 100.0, "matched_functions": 12, "matched_functions_percent": 92.30769, "total_code": "15948", "total_functions": 13, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 2/13.
|
||||
- `TMCJPEGDEC_set_converterY8U8V8` 92.78571%; instructions 195/196, diffs 195, address-instruction diffs 58. Target objects: TMCJPEG_814EFEAC, TMCJPEG_814F043C, TMCJPEG_814F0A58, TMCJPEG_814F11C4, TMCJPEG_814F17E0, TMCJPEG_814F1F48, TMCJPEG_814F2570, TMCJPEG_814F2B50, TMCJPEG_814F3158, TMCJPEG_814F32E4, TMCJPEG_814F34A4, TMCJPEG_814F372C. Large objects: TMCJPEG_814EFEAC 0x590, TMCJPEG_814F043C 0x61c, TMCJPEG_814F0A58 0x76c, TMCJPEG_814F11C4 0x61c, TMCJPEG_814F17E0 0x768, TMCJPEG_814F1F48 0x628, TMCJPEG_814F2570 0x5e0, TMCJPEG_814F2B50 0x608, TMCJPEG_814F3158 0x18c, TMCJPEG_814F32E4 0x1c0, TMCJPEG_814F34A4 0x288, TMCJPEG_814F372C 0x2bc.
|
||||
|
||||
### libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 96.95084, "matched_code": "2648", "matched_code_percent": 42.820183, "matched_data_percent": 100.0, "matched_functions": 7, "matched_functions_percent": 53.846157, "total_code": "6184", "total_functions": 13, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 7/13.
|
||||
- `TMCJPEGDEC_set_converterRGB565` 93.91765%; instructions 169/170, diffs 169, address-instruction diffs 58. Target objects: TMCJPEGDEC_converterYUV211toRGB565, TMCJPEGDEC_converterYUV211toRGB565edge, TMCJPEGDEC_converterYUV400toRGB565, TMCJPEGDEC_converterYUV400toRGB565edge, TMCJPEGDEC_converterYUV411toRGB565, TMCJPEGDEC_converterYUV411toRGB565edge, TMCJPEGDEC_converterYUV420toRGB565, TMCJPEGDEC_converterYUV420toRGB565edge, TMCJPEGDEC_converterYUV422toRGB565, TMCJPEGDEC_converterYUV422toRGB565edge, TMCJPEGDEC_converterYUV444toRGB565, TMCJPEGDEC_converterYUV444toRGB565edge. Large objects: TMCJPEGDEC_converterYUV211toRGB565 0x188, TMCJPEGDEC_converterYUV211toRGB565edge 0x1b4, TMCJPEGDEC_converterYUV400toRGB565 0x118, TMCJPEGDEC_converterYUV400toRGB565edge 0x14c, TMCJPEGDEC_converterYUV411toRGB565 0x364, TMCJPEGDEC_converterYUV411toRGB565edge 0x1a8, TMCJPEGDEC_converterYUV420toRGB565 0x234, TMCJPEGDEC_converterYUV420toRGB565edge 0x1c8, TMCJPEGDEC_converterYUV422toRGB565 0x220, TMCJPEGDEC_converterYUV422toRGB565edge 0x1ac, TMCJPEGDEC_converterYUV444toRGB565 0x16c, TMCJPEGDEC_converterYUV444toRGB565edge 0x1a0.
|
||||
- `TMCJPEGDEC_converterYUV411toRGB565` 91.17512%; instructions 217/217, diffs 141, address-instruction diffs 3. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV411toRGB565edge` 95.42453%; instructions 106/106, diffs 61, address-instruction diffs 7. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV422toRGB565` 97.132355%; instructions 136/136, diffs 52, address-instruction diffs 1. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV420toRGB565` 95.42553%; instructions 141/141, diffs 80, address-instruction diffs 2. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV420toRGB565edge` 97.850876%; instructions 114/114, diffs 35, address-instruction diffs 1. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 90.70224, "matched_code": "660", "matched_code_percent": 10.006064, "matched_data_percent": 100.0, "matched_functions": 2, "matched_functions_percent": 15.384616, "total_code": "6596", "total_functions": 13, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 2/13.
|
||||
- `TMCJPEGDEC_set_converterRGBA8` 93.91765%; instructions 169/170, diffs 169, address-instruction diffs 58. Target objects: TMCJPEGDEC_converterYUV211toRGBA8, TMCJPEGDEC_converterYUV211toRGBA8edge, TMCJPEGDEC_converterYUV400toRGBA8, TMCJPEGDEC_converterYUV400toRGBA8edge, TMCJPEGDEC_converterYUV411toRGBA8, TMCJPEGDEC_converterYUV411toRGBA8edge, TMCJPEGDEC_converterYUV420toRGBA8, TMCJPEGDEC_converterYUV420toRGBA8edge, TMCJPEGDEC_converterYUV422toRGBA8, TMCJPEGDEC_converterYUV422toRGBA8edge, TMCJPEGDEC_converterYUV444toRGBA8, TMCJPEGDEC_converterYUV444toRGBA8edge. Large objects: TMCJPEGDEC_converterYUV211toRGBA8 0x1a0, TMCJPEGDEC_converterYUV211toRGBA8edge 0x1cc, TMCJPEGDEC_converterYUV400toRGBA8 0x130, TMCJPEGDEC_converterYUV400toRGBA8edge 0x164, TMCJPEGDEC_converterYUV411toRGBA8 0x3c8, TMCJPEGDEC_converterYUV411toRGBA8edge 0x1c0, TMCJPEGDEC_converterYUV420toRGBA8 0x264, TMCJPEGDEC_converterYUV420toRGBA8edge 0x1e0, TMCJPEGDEC_converterYUV422toRGBA8 0x250, TMCJPEGDEC_converterYUV422toRGBA8edge 0x1c4, TMCJPEGDEC_converterYUV444toRGBA8 0x184, TMCJPEGDEC_converterYUV444toRGBA8edge 0x1b8.
|
||||
- `TMCJPEGDEC_converterYUV411toRGBA8` 82.70661%; instructions 242/242, diffs 153, address-instruction diffs 26. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV411toRGBA8edge` 94.28571%; instructions 112/112, diffs 51, address-instruction diffs 6. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV422toRGBA8` 88.195946%; instructions 148/148, diffs 80, address-instruction diffs 10. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV422toRGBA8edge` 92.0354%; instructions 113/113, diffs 51, address-instruction diffs 5. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV420toRGBA8` 90.973854%; instructions 153/153, diffs 76, address-instruction diffs 10. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV420toRGBA8edge` 87.5%; instructions 120/120, diffs 77, address-instruction diffs 12. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV211toRGBA8` 91.15385%; instructions 104/104, diffs 49, address-instruction diffs 5. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV211toRGBA8edge` 92.17391%; instructions 115/115, diffs 47, address-instruction diffs 5. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV444toRGBA8` 90.670105%; instructions 97/97, diffs 46, address-instruction diffs 5. Target objects: none. Large objects: none.
|
||||
- `TMCJPEGDEC_converterYUV444toRGBA8edge` 88.90909%; instructions 110/110, diffs 61, address-instruction diffs 5. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 99.710144, "matched_data_percent": 100.0, "total_code": "1104", "total_functions": 1, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 0/1.
|
||||
- `TMCJPEGDEC_decode_iquant` 99.710144%; instructions 276/276, diffs 13, address-instruction diffs 4. Target objects: TMCJPEGDEC_Zigzag_data, TMCJPEGDEC_Zigzag_loop. Large objects: none.
|
||||
|
||||
### libs/NW4R/src/lyt/lyt_window
|
||||
{"fuzzy_match_percent": 99.75864, "matched_code": "9848", "matched_code_percent": 86.751236, "matched_data": "316", "matched_data_percent": 100.0, "matched_functions": 20, "matched_functions_percent": 95.2381, "total_code": "11352", "total_data": "316", "total_functions": 21, "total_units": 1}
|
||||
POOL IDENTICAL up to 1 (mine=1 base=1)
|
||||
Instruction-exact 20/21.
|
||||
- `DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc` 98.17819%; instructions 376/376, diffs 119, address-instruction diffs 10. Target objects: flipInfos$7849, lbl_8169553C, lbl_81695540, lbl_81695548. Large objects: none.
|
||||
|
||||
### libs/RVL_SDK/src/kpad/KPAD
|
||||
{"fuzzy_match_percent": 99.875916, "matched_code": "12316", "matched_code_percent": 94.33211, "matched_data": "8032", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "13056", "total_data": "8032", "total_functions": 29, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 28/29.
|
||||
- `KPADInit` 97.810814%; instructions 185/185, diffs 58, address-instruction diffs 4. Target objects: __KPADVersion, iaccXY_nrm_hori, icenter_org, idist_org, inside_kpads, isec_nrm_hori, kp_dist_vv1, kp_err_dist_max, kp_err_dist_min, kp_obj_interval, lbl_81140C80, lbl_816958A8, lbl_816958B4, lbl_816958BC, lbl_816958C4, lbl_8169590C, lbl_81695910, lbl_8169821C. Large objects: inside_kpads 0x14a0, lbl_81140C80 0x40.
|
||||
|
||||
### libs/RVL_SDK/src/wad/wad
|
||||
{"fuzzy_match_percent": 98.944, "matched_code": "13180", "matched_code_percent": 53.795918, "matched_data": "528", "matched_data_percent": 100.0, "matched_functions": 35, "matched_functions_percent": 87.5, "total_code": "24500", "total_data": "528", "total_functions": 40, "total_units": 1}
|
||||
POOL IDENTICAL up to 18 (mine=18 base=18)
|
||||
Instruction-exact 35/40.
|
||||
- `WADImportGetBlocks` 94.24161%; instructions 286/298, diffs 286, address-instruction diffs 57. Target objects: none. Large objects: none.
|
||||
- `WADImportEx` 99.02269%; instructions 1146/1146, diffs 201, address-instruction diffs 24. Target objects: WAD_815BFFA8, __func__$1718. Large objects: WAD_815BFFA8 0xf8.
|
||||
- `WAD_815C1288` 96.803276%; instructions 61/61, diffs 32, address-instruction diffs 2. Target objects: none. Large objects: none.
|
||||
- `WADBackupEx` 97.385124%; instructions 1057/1062, diffs 876, address-instruction diffs 204. Target objects: @4643, WAD_815C1288, lbl_816982F0. Large objects: WAD_815C1288 0xf4.
|
||||
- `WADImportDVDExForBS` 97.49049%; instructions 261/263, diffs 193, address-instruction diffs 28. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RVL_SDK/src/fa/pdm_partition
|
||||
{"complete_data_percent": 100.0, "fuzzy_match_percent": 98.86006, "matched_code": "3380", "matched_code_percent": 90.958015, "matched_data_percent": 100.0, "matched_functions": 19, "matched_functions_percent": 95.0, "total_code": "3716", "total_functions": 20, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 19/20.
|
||||
- `pdm_part_is_master_boot_sector` 87.39286%; instructions 86/84, diffs 84, address-instruction diffs 17. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RVL_SDK/src/fa/driver/sd_drv
|
||||
{"fuzzy_match_percent": 99.14116, "matched_code": "9260", "matched_code_percent": 78.74149, "matched_data": "3592", "matched_data_percent": 100.0, "matched_functions": 22, "matched_functions_percent": 84.61539, "total_code": "11760", "total_data": "3592", "total_functions": 26, "total_units": 1}
|
||||
POOL IDENTICAL up to 46 (mine=46 base=46)
|
||||
Instruction-exact 22/26.
|
||||
- `pfd_sddrv_init` 93.125%; instructions 141/144, diffs 142, address-instruction diffs 56. Target objects: g_event, g_pfd_sddev, g_pfd_sddrv_info, lbl_81690D18, pfd_st_inter_callback, pfd_st_removal_callback. Large objects: g_pfd_sddev 0x40, pfd_st_inter_callback 0x114, pfd_st_removal_callback 0x108.
|
||||
- `pfd_sddrv_finalize` 92.63158%; instructions 57/57, diffs 4, address-instruction diffs 0. Target objects: g_pfd_sddrv_info, lbl_81690FFC, lbl_81691040. Large objects: lbl_81690FFC 0x41, lbl_81691040 0x2d0.
|
||||
- `pfd_sddrv_store_mbr_buf` 99.75247%; instructions 202/202, diffs 9, address-instruction diffs 0. Target objects: lbl_8169134C, sddrv_size_depend_tbl. Large objects: lbl_8169134C 0x57, sddrv_size_depend_tbl 0x150.
|
||||
- `pfd_sddrv_build_fat32_mbr_bpb` 95.202705%; instructions 229/222, diffs 122, address-instruction diffs 36. Target objects: g_pfd_sddrv_buf, g_pfd_sddrv_info, lbl_81690D18. Large objects: g_pfd_sddrv_buf 0x200.
|
||||
|
||||
### libs/RVL_SDK/src/nup/nup
|
||||
{"fuzzy_match_percent": 99.5968, "matched_code": "7748", "matched_code_percent": 71.98068, "matched_data": "1720", "matched_data_percent": 100.0, "matched_functions": 20, "matched_functions_percent": 86.95652, "total_code": "10764", "total_data": "1720", "total_functions": 23, "total_units": 1}
|
||||
POOL IDENTICAL up to 28 (mine=28 base=28)
|
||||
Instruction-exact 20/23.
|
||||
- `__nupParseServerInfo__FP14NUPContextInfoPcPcUx` 98.108406%; instructions 452/452, diffs 148, address-instruction diffs 24. Target objects: lbl_81691798, lbl_816983C8, lbl_816983CC. Large objects: none.
|
||||
- `__nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion` 99.35583%; instructions 163/163, diffs 17, address-instruction diffs 3. Target objects: none. Large objects: none.
|
||||
- `__nupGetTitleSize__FP12NUPTitleInfo` 99.100716%; instructions 139/139, diffs 22, address-instruction diffs 3. Target objects: none. Large objects: none.
|
||||
|
||||
### libs/RVL_SDK/src/kbd/kbd_lib
|
||||
{"fuzzy_match_percent": 99.93963, "matched_code": "3728", "matched_code_percent": 64.67731, "matched_data": "5296", "matched_data_percent": 100.0, "matched_functions": 17, "matched_functions_percent": 80.952385, "total_code": "5764", "total_data": "5296", "total_functions": 21, "total_units": 1}
|
||||
POOL IDENTICAL up to 0 (mine=0 base=0)
|
||||
Instruction-exact 17/21.
|
||||
- `kbdEventHandler` 99.83871%; instructions 186/186, diffs 5, address-instruction diffs 3. Target objects: kbdData. Large objects: kbdData 0x9a0.
|
||||
- `kbdProcMod` 99.90234%; instructions 256/256, diffs 4, address-instruction diffs 0. Target objects: jumptable_816925A0, kbdData, kbdInitialized, kbdKeyMaps. Large objects: jumptable_816925A0 0x88, kbdData 0x9a0, kbdKeyMaps 0x400.
|
||||
- `kbd_led_handler` 99.72%; instructions 25/25, diffs 3, address-instruction diffs 0. Target objects: kbdCmdBuf, kbdLCBuf. Large objects: kbdCmdBuf 0x180, kbdLCBuf 0x60.
|
||||
- `KBDSetModState` 99.40476%; instructions 42/42, diffs 4, address-instruction diffs 0. Target objects: kbdData, kbdInitialized. Large objects: kbdData 0x9a0.
|
||||
|
||||
## Candidate triage
|
||||
|
||||
The baseline covers 51 requested units and 106 open functions. Both sd_drv and pdm_partition copies are included; RevoEX copies already have no open functions. Already-exact NHTTP units are retained in the inventory. No AOSS/ATERM/AOSSLink or eZiText source is in scope.
|
||||
|
||||
Closest structural candidate: tiCandidateBox scCandidatePaneData is a synthetic wrapper containing 26 0x40-byte pane records and a 12-byte tail string. Actual bytes at 0x8165D978 are P_OffBtn followed by four zero bytes. Array consumers use exactly 26 records. UIOnOffButton::Create uses base+0x680 only as a string in searchPaneComponent/searchAnmPane/FindPaneByName. No function treats the string as a 27th record. Source currently forces them into the same object. Test the real table and ordinary string separately, with no explicit string padding.
|
||||
|
||||
KPAD lbl_81140C80 is a 0x40-byte float region whose first 0x30 bytes are passed as an MTX34 and initialized as a rotation matrix. No evidence yet identifies a second object in the last 0x10 bytes. A split there is not justified without further references. The typed inside_kpads[4] is one repeated array, not a mixed aggregate.
|
||||
|
||||
kbdData is four 0x268-byte KBDChannel records; all indexed references agree with that stride. kbdKeyMaps is a homogeneous map array with storage union. Neither establishes separate object boundaries. sFriendInfo is a full NWC24FriendInfo that is copied and cleared as 0x140 bytes. Flags0 is a homogeneous u32 array. These must not be split solely to influence allocation.
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 231, "insns": [353, 352], "name": "create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator", "percent": 98.286934}, {"diffs": 64, "insns": [216, 216], "name": "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator", "percent": 98.49537}], "gained": [], "label": "separate pane records from ordinary off-button name array", "lost": [], "measures": {"fuzzy_match_percent": 99.84534, "matched_code": "21728", "matched_code_percent": 90.53333, "matched_data": "1164", "matched_data_percent": 25.021496, "matched_functions": 110, "matched_functions_percent": 98.21429, "total_code": "24000", "total_data": "4652", "total_functions": 112, "total_units": 1}, "pool": "POOL IDENTICAL up to 57 (mine=57 base=57)", "pool_ok": true, "source_hash": "4bdcbe84d9c5", "trial": 1, "unit": "src/keyboard/tiCandidateBox"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 231, "insns": [353, 352], "name": "create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator", "percent": 98.27273}, {"diffs": 64, "insns": [216, 216], "name": "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator", "percent": 98.49537}], "gained": [], "label": "standalone pane array and ordinary off-button string literal accessor", "lost": [], "measures": {"fuzzy_match_percent": 99.8445, "matched_code": "21728", "matched_code_percent": 90.53333, "matched_data": "116", "matched_data_percent": 2.4935513, "matched_functions": 110, "matched_functions_percent": 98.21429, "total_code": "24000", "total_data": "4652", "total_functions": 112, "total_units": 1}, "pool": "FIRST DIVERGENCE at index 4\n 2 mine=0x6c base=0x6c \n M 'P_prdc_scrl_Left'\n B 'P_prdc_scrl_Left'\n 3 mine=0xac base=0xac \n M 'P_prdc_scrl_Rght'\n B 'P_prdc_scrl_Rght'\n* 4 mine=0x6a8 base=0x6a8 \n M 'B_OffBtn'\n B 'P_OffBtn'\n* 5 mine=0x6b4 base=0x6b4 \n M 'P_JPOffBtn'\n B 'B_OffBtn'\n* 6 mine=0x6c0 base=0x6c0 \n M 'P_CNOffBtn'\n B 'P_JPOffBtn'\n* 7 mine=0x6cc base=0x6cc \n M 'P_CNOnBtn'\n B 'P_CNOffBtn'\n* 8 mine=0x6d8 base=0x6d8 \n M 'B_prdc_scrl_Left'\n B 'P_CNOnBtn'\n\nmine has 57 strings, base has 57", "pool_ok": false, "source_hash": "a0f5ae8bb1bb", "trial": 2, "unit": "src/keyboard/tiCandidateBox"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 317, "insns": [354, 352], "name": "create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator", "percent": 96.701706}, {"diffs": 64, "insns": [216, 216], "name": "createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator", "percent": 98.49537}], "gained": [], "label": "standalone pane array and const off-button name object", "lost": [], "measures": {"fuzzy_match_percent": 99.752335, "matched_code": "21728", "matched_code_percent": 90.53333, "matched_data": "116", "matched_data_percent": 2.4935513, "matched_functions": 110, "matched_functions_percent": 98.21429, "total_code": "24000", "total_data": "4652", "total_functions": 112, "total_units": 1}, "pool": "FIRST DIVERGENCE at index 4\n 2 mine=0x6c base=0x6c \n M 'P_prdc_scrl_Left'\n B 'P_prdc_scrl_Left'\n 3 mine=0xac base=0xac \n M 'P_prdc_scrl_Rght'\n B 'P_prdc_scrl_Rght'\n* 4 mine=0x6a8 base=0x6a8 \n M 'B_OffBtn'\n B 'P_OffBtn'\n* 5 mine=0x6b4 base=0x6b4 \n M 'P_JPOffBtn'\n B 'B_OffBtn'\n* 6 mine=0x6c0 base=0x6c0 \n M 'P_CNOffBtn'\n B 'P_JPOffBtn'\n* 7 mine=0x6cc base=0x6cc \n M 'P_CNOnBtn'\n B 'P_CNOffBtn'\n* 8 mine=0x6d8 base=0x6d8 \n M 'B_prdc_scrl_Left'\n B 'P_CNOnBtn'\n\nmine has 56 strings, base has 57", "pool_ok": false, "source_hash": "e7c2dc9d3b63", "trial": 3, "unit": "src/keyboard/tiCandidateBox"}
|
||||
|
||||
tiCandidateBox trials 1-3 produced no exact gain. The natural writable string preserved the pool; the const object and literal accessor moved the pool. All three left createAnmPane_ at 64 differences. Restored source, with no metadata edits.
|
||||
|
||||
Next boundary candidate: tiZiString CandidatesBuffer size 0x600 is used as three independent 0x200-byte regions. clearCandidates clears them separately with sizes 0x200, 0x1fe and 0x200 at ElementBuffer+0x200, +0x400 and +0x600. The input methods only use the first region. setElementBuffer separately clears the middle region. EZTXGetParam::candidates and update's input-to-result copy use only the third region. The target forms all three addresses from the common BSS base, whereas the current source preserves a second base for the inferred combined CandidatesBuffer. Test separate real input, element-work and prediction arrays. Keep section bytes, total BSS size, existing alignment and all resolved reference targets fixed.
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 8, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 99.30769}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "split input, element-work and prediction arrays at three target memset boundaries", "lost": [], "measures": {"fuzzy_match_percent": 99.43896, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "384", "matched_data_percent": 5.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "86c93cfda3dd", "trial": 4, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 8, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 99.30769}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "prove corrected target symbols and remeasure three distinct candidate buffers", "lost": [], "measures": {"fuzzy_match_percent": 99.43896, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "86c93cfda3dd", "trial": 5, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
Reference proof after tiZiString symbol correction: all 1027 extracted objects have identical allocated-section types, sizes and SHA256 byte hashes. All 109496 relocation entries retain the same relocation section, offset, type and resolved destination section+value+addend. Manifest comparison reports changed=[]. The corrected unit still has 7680 data bytes; all 7680 match. No splits.txt ranges changed. Full raw manifest and comparator are saved under /tmp/agg-sweep for this run.
|
||||
|
||||
## First accepted worker state
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiZiString] pool: IDENTICAL
|
||||
[src/keyboard/tiZiString] objdiff: code 3460/5504 data 7680/7680 functions 27/29 fuzzy 99.4390 linked code 0
|
||||
[src/keyboard/tiZiString] instruction-exact functions: 27/29
|
||||
[src/keyboard/tiZiString] section .bss size 7296 match 100.0
|
||||
[src/keyboard/tiZiString] section .data size 328 match 100.0
|
||||
[src/keyboard/tiZiString] section .rodata size 56 match 100.0
|
||||
[src/keyboard/tiZiString] section .text size 5504 match 99.43896
|
||||
[src/keyboard/tiZiString] below 100: update__Q39textinput8tistring6WithZiFv 98.36996
|
||||
[src/keyboard/tiZiString] below 100: setElementBuffer__Q39textinput8tistring6WithZiFv 99.30769
|
||||
[src/keyboard/tiZiString] baseline: code 3136/5504 data 7680 functions 26 fuzzy 98.3241
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.57366 -> 92.58447
|
||||
global fuzzy_match_percent: 99.73627 -> 99.73832
|
||||
global complete_code_percent: 76.20227 -> 76.20227
|
||||
global matched_data_percent: 99.94696 -> 99.94696
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 8, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 99.30769}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "setElementBuffer reads the distinct input buffer through a const pointer", "lost": [], "measures": {"fuzzy_match_percent": 99.43896, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "d7f08ae2b616", "trial": 6, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 16, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 93.15385}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "setElementBuffer binds separate element and const input array references", "lost": [], "measures": {"fuzzy_match_percent": 99.148254, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "08398ac8718d", "trial": 7, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 8, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 99.30769}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "separate input object with body using the same narrowed count as the condition", "lost": [], "measures": {"fuzzy_match_percent": 99.43896, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "e64c27fef411", "trial": 8, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 13, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 98.38461}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "input and element pointer declarations follow their post-clear lifetimes", "lost": [], "measures": {"fuzzy_match_percent": 99.39535, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "f8eb9947ed00", "trial": 9, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 8, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 99.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "indexed input read helper owns the independent input global address", "lost": [], "measures": {"fuzzy_match_percent": 99.424416, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "5e1069e0a752", "trial": 10, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 47, "insns": [66, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 96.76923}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "separate buffer copy helper receives const input and mutable element arrays", "lost": [], "measures": {"fuzzy_match_percent": 99.31904, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "4be3debcc782", "trial": 11, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "candidate element view binds independent input and output objects", "lost": [], "measures": {"fuzzy_match_percent": 99.47166, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "4dd87de61882", "trial": 12, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 8, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 99.30769}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "separate global element conversion helper with explicit input pointer", "lost": [], "measures": {"fuzzy_match_percent": 99.43896, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "6efbb5d815c5", "trial": 13, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 9, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 98.84615}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "input pointer declared before writable element pointer after storage split", "lost": [], "measures": {"fuzzy_match_percent": 99.41715, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "6e83e0b4b419", "trial": 14, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 47, "insns": [66, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 93.61539}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "narrowed element index belongs to the entire input loop", "lost": [], "measures": {"fuzzy_match_percent": 99.17006, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "ca420f1a259b", "trial": 15, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 16, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 95.2}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv"], "label": "input pointer binds its independent array at function entry", "lost": [], "measures": {"fuzzy_match_percent": 99.24491, "matched_code": "3460", "matched_code_percent": 62.863373, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 27, "matched_functions_percent": 93.10345, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "1eac611d8b49", "trial": 16, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "retain independent-buffer view with exact setElementBuffer", "lost": [], "measures": {"fuzzy_match_percent": 99.47166, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "4dd87de61882", "trial": 17, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
## Second accepted worker state
|
||||
|
||||
Trial 12 binds the two real input and element globals in ElementInputView. Its constructor and read/element accessors inline without additional code or objects. setElementBuffer is 65/65 instructions, diffs 0, exact-name objdiff 100.0. The direct pointer, array-reference, helper-read and declaration-lifetime alternatives did not match. clearCandidates remains exact. Full gate:
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiZiString] pool: IDENTICAL
|
||||
[src/keyboard/tiZiString] objdiff: code 3720/5504 data 7680/7680 functions 28/29 fuzzy 99.4717 linked code 0
|
||||
[src/keyboard/tiZiString] instruction-exact functions: 28/29
|
||||
[src/keyboard/tiZiString] section .bss size 7296 match 100.0
|
||||
[src/keyboard/tiZiString] section .data size 328 match 100.0
|
||||
[src/keyboard/tiZiString] section .rodata size 56 match 100.0
|
||||
[src/keyboard/tiZiString] section .text size 5504 match 99.47166
|
||||
[src/keyboard/tiZiString] below 100: update__Q39textinput8tistring6WithZiFv 98.36996
|
||||
[src/keyboard/tiZiString] baseline: code 3136/5504 data 7680 functions 26 fuzzy 98.3241
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.57366 -> 92.59315
|
||||
global fuzzy_match_percent: 99.73627 -> 99.73837
|
||||
global complete_code_percent: 76.20227 -> 76.20227
|
||||
global matched_data_percent: 99.94696 -> 99.94696
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "prediction search helper binds the independent element and result objects", "lost": [], "measures": {"fuzzy_match_percent": 99.47166, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "c6baf290218a", "trial": 18, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 37, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 99.46861}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "latest-word suffix helper owns only the independent context object", "lost": [], "measures": {"fuzzy_match_percent": 99.82776, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "1318734b1e5f", "trial": 19, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "input-to-prediction copy helper names both separate objects", "lost": [], "measures": {"fuzzy_match_percent": 99.47166, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "b61fbb7a17ff", "trial": 20, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "prediction buffer view binds both pointer fields after search flags", "lost": [], "measures": {"fuzzy_match_percent": 99.47166, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "1b5193ca6142", "trial": 21, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 85, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.36996}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "model forty candidate words as separate rows of the existing result array", "lost": [], "measures": {"fuzzy_match_percent": 99.47166, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "6118e212d953", "trial": 22, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 141, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.13453}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "final prediction copy is an inline member over the independent result object", "lost": [], "measures": {"fuzzy_match_percent": 99.39535, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "69cba6e50407", "trial": 23, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 37, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 99.46861}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "prediction output view owns read cursor and result row cursor", "lost": [], "measures": {"fuzzy_match_percent": 99.82776, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "45f3bae22724", "trial": 24, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 36, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 99.49103}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "prediction output view binds result rows before a const input cursor", "lost": [], "measures": {"fuzzy_match_percent": 99.83503, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "5ac04b7a87c3", "trial": 25, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 37, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 99.46861}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "prediction output advances complete 64-character row objects", "lost": [], "measures": {"fuzzy_match_percent": 99.82776, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "6937ecc8492e", "trial": 26, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 37, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 99.46861}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "prediction output rows consume a const character cursor", "lost": [], "measures": {"fuzzy_match_percent": 99.82776, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "e75a18950588", "trial": 27, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 37, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 99.46861}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "prediction output uses native wide-character pointers for words", "lost": [], "measures": {"fuzzy_match_percent": 99.82776, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "84e9a0b8d45b", "trial": 28, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 33, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 99.524666}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "result buffer bound before readonly prediction input at copy start", "lost": [], "measures": {"fuzzy_match_percent": 99.84593, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "b0a45fb31c44", "trial": 29, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 126, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.3139}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "Korean word copy helper consumes prediction input and writes one result row", "lost": [], "measures": {"fuzzy_match_percent": 99.45349, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "2f0fcdc58eba", "trial": 30, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 121, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.40359}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "wide word copy helper consumes prediction input and writes one result row", "lost": [], "measures": {"fuzzy_match_percent": 99.48256, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "f616675dca0b", "trial": 31, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
## Prior trial coverage for parked functions
|
||||
|
||||
All 106 functions in the fresh inventory have at least three distinct source-level trials recorded before this sweep. These references are historical attempts, not new compiles in this run. They prevent repeating the old helper/type/scheduling searches on functions for which lever 13 has no object-boundary evidence. Current trial records above separately identify the new compiled boundary experiments.
|
||||
|
||||
- `libs/NW4R/src/lyt/lyt_window DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc`: tools/decomp-assist/fz2.attempts.md:755 Round4 final open-function and data audit; tools/decomp-assist/fz2.attempts.md:826 lyt_window data gate; tools/decomp-assist/prior1.attempts.md:105 W1 reference mutable bUseVtxCol
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32 TMCJPEGDEC_decode_iquant`: tools/decomp-assist/jpeg-matching-attempts.md:215 huffman code uses decoded threshold; tools/decomp-assist/jpeg-matching-attempts.md:216 dc load failure through common return; tools/decomp-assist/jpeg-matching-attempts.md:217 sign-extension subtraction operand grouping
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/buffer/idct_block_var TMCJPEGDEC_IdctBlock_Col`: tools/decomp-assist/jpeg-matching-attempts.md:205 ac operand order; tools/decomp-assist/jpeg-matching-attempts.md:206 butterfly operand grouping; tools/decomp-assist/jpeg-matching-attempts.md:207 first pass row counter form
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/buffer/idct_block_var TMCJPEGDEC_IdctBlock_Lumi`: tools/decomp-assist/jpeg-matching-attempts.md:200 ac operand order; tools/decomp-assist/jpeg-matching-attempts.md:201 butterfly operand grouping; tools/decomp-assist/jpeg-matching-attempts.md:202 first pass row counter form
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse TMCJPEGDEC_IFD0_tag_parse`: tools/decomp-assist/ult3.attempts.md:38 compression has own ignored return block; tools/decomp-assist/ult3.attempts.md:39 compression returns separately and rational pointer declared before offset; tools/decomp-assist/ult3.attempts.md:40 all unhandled compressed/strip/jpeg-offset tags have separate exits
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse TMCJPEGDEC_IFD1_tag_parse`: tools/decomp-assist/ult3.attempts.md:20 remove redundant orientation case and give strip offset explicit return; tools/decomp-assist/ult3.attempts.md:21 ignored tags use exact separate strip-offset exit without orientation or planar noops; tools/decomp-assist/ult3.attempts.md:22 ignored tags return directly, all recognized bodies remain separate
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse TMCJPEGDEC_exif_parse`: tools/decomp-assist/ult3.attempts.md:44 each IFD has independent lexical entry cursor; tools/decomp-assist/ult3.attempts.md:45 each IFD has independent entry-count and byte-length locals; tools/decomp-assist/ult3.attempts.md:46 each IFD owns all real traversal locals
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV411toRGB565`: tools/decomp-assist/jpeg-matching-attempts.md:86 source pointer walks; tools/decomp-assist/jpeg-matching-attempts.md:87 column declared at function scope; tools/decomp-assist/jpeg-matching-attempts.md:88 x/y bound initialization order
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV411toRGB565edge`: tools/decomp-assist/jpeg-matching-attempts.md:91 source pointer walks; tools/decomp-assist/jpeg-matching-attempts.md:92 column declared at function scope; tools/decomp-assist/jpeg-matching-attempts.md:93 x/y bound initialization order
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV420toRGB565`: tools/decomp-assist/jpeg-matching-attempts.md:106 source pointer walks; tools/decomp-assist/jpeg-matching-attempts.md:107 column declared at function scope; tools/decomp-assist/jpeg-matching-attempts.md:108 x/y bound initialization order
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV420toRGB565edge`: tools/decomp-assist/jpeg-matching-attempts.md:111 source pointer walks; tools/decomp-assist/jpeg-matching-attempts.md:112 column declared at function scope; tools/decomp-assist/jpeg-matching-attempts.md:113 x/y bound initialization order
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV422toRGB565`: tools/decomp-assist/jpeg-matching-attempts.md:96 source pointer walks; tools/decomp-assist/jpeg-matching-attempts.md:97 column declared at function scope; tools/decomp-assist/jpeg-matching-attempts.md:98 x/y bound initialization order
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_set_converterRGB565`: tools/decomp-assist/jpeg-matching-attempts.md:82 state load before component; tools/decomp-assist/jpeg-matching-attempts.md:83 pointer stores before converter stores; tools/decomp-assist/jpeg-matching-attempts.md:84 dimension operand order
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV211toRGBA8`: tools/decomp-assist/fz20.attempts.md:1365 91.05769%; tools/decomp-assist/fz20.attempts.md:1366 91.95652%; tools/decomp-assist/fz20.attempts.md:1481 TMCJPEGDEC_converterYUV444toRGBA8edge
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV211toRGBA8edge`: tools/decomp-assist/fz20.attempts.md:1366 91.95652%; tools/decomp-assist/fz20.attempts.md:1482 TMCJPEGDEC_converterYUV444toRGBA8edge; tools/decomp-assist/fz20.attempts.md:2097 92.0%
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV411toRGBA8`: tools/decomp-assist/fz20.attempts.md:1359 82.54132%; tools/decomp-assist/fz20.attempts.md:1360 93.83929%; tools/decomp-assist/fz20.attempts.md:1475 TMCJPEGDEC_converterYUV444toRGBA8edge
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV411toRGBA8edge`: tools/decomp-assist/fz20.attempts.md:1360 93.83929%; tools/decomp-assist/fz20.attempts.md:1476 TMCJPEGDEC_converterYUV444toRGBA8edge; tools/decomp-assist/fz20.attempts.md:2091 93.88393%
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV420toRGBA8`: tools/decomp-assist/fz20.attempts.md:1363 89.33987%; tools/decomp-assist/fz20.attempts.md:1364 87.316666%; tools/decomp-assist/fz20.attempts.md:1479 TMCJPEGDEC_converterYUV444toRGBA8edge
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV420toRGBA8edge`: tools/decomp-assist/fz20.attempts.md:1364 87.316666%; tools/decomp-assist/fz20.attempts.md:1480 TMCJPEGDEC_converterYUV444toRGBA8edge; tools/decomp-assist/fz20.attempts.md:2095 87.4%
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV422toRGBA8`: tools/decomp-assist/fz20.attempts.md:1361 87.6554%; tools/decomp-assist/fz20.attempts.md:1362 90.04425%; tools/decomp-assist/fz20.attempts.md:1477 TMCJPEGDEC_converterYUV444toRGBA8edge
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV422toRGBA8edge`: tools/decomp-assist/fz20.attempts.md:1362 90.04425%; tools/decomp-assist/fz20.attempts.md:1478 TMCJPEGDEC_converterYUV444toRGBA8edge; tools/decomp-assist/fz20.attempts.md:2093 90.08849%
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV444toRGBA8`: tools/decomp-assist/fz20.attempts.md:1367 90.4433%; tools/decomp-assist/fz20.attempts.md:1368 88.90909%; tools/decomp-assist/fz20.attempts.md:1483 TMCJPEGDEC_converterYUV444toRGBA8edge
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV444toRGBA8edge`: tools/decomp-assist/fz20.attempts.md:1368 88.90909%; tools/decomp-assist/fz20.attempts.md:1484 TMCJPEGDEC_converterYUV444toRGBA8edge; tools/decomp-assist/jpeg-matching-attempts.md:190 source pointer walks
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_set_converterRGBA8`: tools/decomp-assist/fz20.attempts.md:1358 93.91765%; tools/decomp-assist/fz20.attempts.md:1474 TMCJPEGDEC_converterYUV444toRGBA8edge; tools/decomp-assist/jpeg-matching-attempts.md:141 state load before component
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8 TMCJPEGDEC_set_converterY8U8V8`: tools/decomp-assist/jpeg-matching-attempts.md:333 converter stores before row stores; tools/decomp-assist/jpeg-matching-attempts.md:334 pointer to whole conversion buffer; tools/decomp-assist/jpeg-matching-attempts.md:335 signed conversion sample pointer
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_build_fat32_mbr_bpb`: tools/decomp-assist/perm2.attempts.md:1120 pfd_sddrv_build_fat32_mbr_bpb new T3 source trials; tools/decomp-assist/perm2.attempts.md:1186 94.75225; tools/decomp-assist/data-d6.attempts.md:62 named sector buffer
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_finalize`: tools/decomp-assist/perm2.attempts.md:1110 pfd_sddrv_finalize new T3 source trials; tools/decomp-assist/data-d6.attempts.md:50 clear disk before media state; tools/decomp-assist/data-d6.attempts.md:52 named remaining flags
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_init`: tools/decomp-assist/perm2.attempts.md:1092 pfd_sddrv_init new T3 source trials; tools/decomp-assist/data-d6.attempts.md:44 unsigned null comparison; tools/decomp-assist/data-d6.attempts.md:46 named null disk
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_store_mbr_buf`: tools/decomp-assist/perm2.attempts.md:1101 pfd_sddrv_store_mbr_buf new T3 source trials; tools/decomp-assist/data-d6.attempts.md:56 name cylinder size; tools/decomp-assist/data-d6.attempts.md:58 name first sector before CHS
|
||||
- `libs/RVL_SDK/src/fa/pdm_partition pdm_part_is_master_boot_sector`: tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:21 inline endian helper with high byte first and two addition groups; tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:22 evaluate high byte group before low byte group; tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:23 declare traversal index after pointers at endian helper boundary
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib KBDSetModState`: tools/decomp-assist/sol-low-leaves-attempts.md:30 typed channel pointer for load and store; tools/decomp-assist/sol-low-leaves-attempts.md:31 physical modifier masked expression; tools/decomp-assist/sol-low-leaves-attempts.md:32 single modifier state temporary
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib kbdEventHandler`: tools/decomp-assist/sol-low-leaves-attempts.md:16 reuse report status temporary in comparisons; tools/decomp-assist/sol-low-leaves-attempts.md:17 initialize channel pointer in one expression; tools/decomp-assist/sol-low-leaves-attempts.md:106 remove redundant report status temporary
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib kbdProcMod`: tools/decomp-assist/sol-low-leaves-attempts.md:37 pass modifier expression directly; tools/decomp-assist/sol-low-leaves-attempts.md:38 local modifier scope around inline setter; tools/decomp-assist/sol-low-leaves-attempts.md:39 channel argument recovered from typed channel
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib kbd_led_handler`: tools/decomp-assist/sol-low-leaves-attempts.md:33 load completion callback before releasing command; tools/decomp-assist/sol-low-leaves-attempts.md:43 null callback test after clear; conditional error code; tools/decomp-assist/sol-low-leaves-attempts.md:44 guard completion body with non-null callback
|
||||
- `libs/RVL_SDK/src/kpad/KPAD KPADInit`: tools/decomp-assist/perm7.attempts.md:58 matrix_before_scale_initialization; tools/decomp-assist/perm7.attempts.md:61 reference_height_before_width; tools/decomp-assist/perm7.attempts.md:63 direct_sine_assignment
|
||||
- `libs/RVL_SDK/src/nup/nup __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion`: tools/decomp-assist/h6.attempts.md:108 013-kbd_lib-led-result-switch-failure; tools/decomp-assist/h6.attempts.md:136 018-nup-installed-content-array; tools/decomp-assist/h6.attempts.md:142 019-nup-installed-content-reference
|
||||
- `libs/RVL_SDK/src/nup/nup __nupGetTitleSize__FP12NUPTitleInfo`: tools/decomp-assist/sol-med-structural-round10.attempts.md:16 __nupGetTitleSize__FP12NUPTitleInfo; tools/decomp-assist/sol-med-structural-round10.attempts.md:224 139/139 instructions; reserve high-word temporary and installed-content helper colors differ.; tools/decomp-assist/sol-med-structural-round12.attempts.md:15 diagnosis __nupGetTitleSize__FP12NUPTitleInfo
|
||||
- `libs/RVL_SDK/src/nup/nup __nupParseServerInfo__FP14NUPContextInfoPcPcUx`: tools/decomp-assist/sol-med-structural-round10.attempts.md:13 __nupParseServerInfo__FP14NUPContextInfoPcPcUx; tools/decomp-assist/sol-med-structural-round10.attempts.md:221 452/452 instructions; repeated tag-helper local colors differ.; tools/decomp-assist/sol-med-structural-round12.attempts.md:12 diagnosis __nupParseServerInfo__FP14NUPContextInfoPcPcUx
|
||||
- `libs/RVL_SDK/src/wad/wad WADBackupEx`: tools/decomp-assist/sol-med-attempts.md:7278 WADBackupEx; tools/decomp-assist/h6.attempts.md:375 051-sd_drv-fat32-write-sector-helper; tools/decomp-assist/h6.attempts.md:443 061-wad-backup-export-buffer-wait-helper
|
||||
- `libs/RVL_SDK/src/wad/wad WADImportDVDExForBS`: tools/decomp-assist/sol-med-attempts.md:7323 WADImportDVDExForBS; tools/decomp-assist/h6.attempts.md:376 051-sd_drv-fat32-write-sector-helper; tools/decomp-assist/h6.attempts.md:464 064-wad-dvd-import-section-helper
|
||||
- `libs/RVL_SDK/src/wad/wad WADImportEx`: tools/decomp-assist/sol-med-attempts.md:7275 WADImportEx; tools/decomp-assist/h6.attempts.md:373 051-sd_drv-fat32-write-sector-helper; tools/decomp-assist/h6.attempts.md:401 055-wad-import-installed-content-scan
|
||||
- `libs/RVL_SDK/src/wad/wad WADImportGetBlocks`: tools/decomp-assist/sol-med-attempts.md:7308 WADImportGetBlocks; tools/decomp-assist/h6.attempts.md:372 051-sd_drv-fat32-write-sector-helper; tools/decomp-assist/h6.attempts.md:380 052-wad-blocks-content-accounting-helper
|
||||
- `libs/RVL_SDK/src/wad/wad WAD_815C1288`: tools/decomp-assist/sol-med-attempts.md:7290 WAD_815C1288; tools/decomp-assist/h6.attempts.md:374 051-sd_drv-fat32-write-sector-helper; tools/decomp-assist/h6.attempts.md:422 058-wad-export-buffer-wait-helper
|
||||
- `libs/RevoEX/src/cdb/CDBRecord CDBRecordEncrypt`: tools/decomp-assist/data-d6.attempts.md:82 file-size and data-size declaration order; tools/decomp-assist/data-d6.attempts.md:84 signed pointer tests to pointer null tests; tools/decomp-assist/data-d6.attempts.md:86 signature before hash output
|
||||
- `libs/RevoEX/src/net/aes AESiDecryptBlock`: tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:107 mutate inverse MixColumns intermediate terms in target operand order; tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:108 retain key schedule base separately before round offset; tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:109 inline inverse MixColumns column helper
|
||||
- `libs/RevoEX/src/net/aes AESiEncryptBlock`: tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:101 explicit target low byte XOR association with nested high-byte pair; tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:102 inline encryption round lookup helper with target association; tools/decomp-assist/sol-high-four-oct2.attempts.jsonl:103 separate leading state declarations from round-count and initial key loads
|
||||
- `libs/RevoEX/src/net/md5 ProcessBlock`: tools/decomp-assist/allhands-md5-rotation.attempts.md:32 direct byte-reversed pointers and arithmetic groupings; tools/decomp-assist/allhands-md5-rotation.attempts.md:34 typed inline endian-load wrapper; tools/decomp-assist/allhands-md5-rotation.attempts.md:36 rotation helpers without independent load results
|
||||
- `libs/RevoEX/src/nhttp/NHTTP_recvbuf NHTTPi_compareTokenN_HdrRecvBuf`: tools/decomp-assist/partial-oct2d.attempts.md:621 positive enclosing range guard; tools/decomp-assist/partial-oct2d.attempts.md:622 word character narrows at comparison helper; tools/decomp-assist/partial-oct2d.attempts.md:623 positive guard and int character with conditional lower-case helper
|
||||
- `libs/RevoEX/src/nhttp/NHTTP_stdlib_RVL NHTTPi_compareToken`: tools/decomp-assist/allhands-nhttp-stdlib.attempts.md:64 NHTTPi_Base64Encode; tools/decomp-assist/perm2.attempts.md:196 NHTTPi_compareToken readable trials; tools/decomp-assist/pk2.attempts.md:198 mwcceppc.exe Compiler:
|
||||
- `libs/RevoEX/src/nhttp/NHTTP_stdlib_RVL NHTTPi_strnicmp`: tools/decomp-assist/four-leaves-r11.attempts.md:51 constant-first lower bound; tools/decomp-assist/four-leaves-r11.attempts.md:52 constant-first upper bound; tools/decomp-assist/four-leaves-r11.attempts.md:53 both bounds constant-first
|
||||
- `libs/RevoEX/src/nwc24/NWC24Download NWC24InitDlTask`: tools/decomp-assist/ult3.attempts.md:215 home-directory char buffer uses empty string initialization; tools/decomp-assist/ult3.attempts.md:216 home-directory represented as bytes until NAND and numeric parse interfaces; tools/decomp-assist/ult3.attempts.md:217 task pointer and download type are immutable formal values
|
||||
- `libs/RevoEX/src/so/SOBasic SOGetSockName`: tools/decomp-assist/prior1.attempts.md:185 mwcceppc.exe Compiler:; tools/decomp-assist/prior1.attempts.md:187 S1 reference statement order and conclude goto, with typed wire fields; tools/decomp-assist/prior1.attempts.md:193 S2 reference address initialization and separate prepare assignment
|
||||
- `src/BS2/BS2Mach BS2StartGCGame`: tools/decomp-assist/sol-med-attempts.md:7191 BS2StartGCGame; tools/decomp-assist/fz1.attempts.md:3751 proven asynchronous DVD state field polled inline; tools/decomp-assist/fz1.attempts.md:3752 readonly native DVD polling helper boundary
|
||||
- `src/BS2/BS2Mach BS2StartGame`: tools/decomp-assist/sol-med-attempts.md:7190 BS2StartGame; tools/decomp-assist/fz1.attempts.md:3728 proven async flags volatile definitions and direct state polling; tools/decomp-assist/fz1.attempts.md:3729 polling through native readonly inline DVD accessor
|
||||
- `src/BS2/BS2Mach BS2Tick`: tools/decomp-assist/sol-med-attempts.md:7181 BS2Tick; tools/decomp-assist/fz1.attempts.md:3776 loader outputs represented as three independent addressable locals; tools/decomp-assist/fz1.attempts.md:3777 disc header hardware fields accessed through actual readonly disk type
|
||||
- `src/BS2/BS2Mach CheckBS2CommandStatus`: tools/decomp-assist/sol-med-attempts.md:7187 CheckBS2CommandStatus; tools/decomp-assist/fz1.attempts.md:3762 NAND pending stored before inline partition-size arithmetic; tools/decomp-assist/fz1.attempts.md:3763 partition count read through real constant TOC view
|
||||
- `src/BS2/BS2Update UpdateThread`: tools/decomp-assist/a6x.attempts.md:20 copy selected seat helper returns immutable source for requirements; tools/decomp-assist/a6x.attempts.md:21 seat copy helper returns required bytes and accumulates inode requirements; tools/decomp-assist/a6x.attempts.md:22 seat copy helper accumulates bytes and returns inode requirement
|
||||
- `src/channelScript/CHANSVm CHANSVmConvertToFloatFromStr`: tools/decomp-assist/fz1.attempts.md:3626 read-only parse input object; tools/decomp-assist/fz1.attempts.md:3627 const parsed string view inside parse helper; tools/decomp-assist/fz1.attempts.md:3628 nested result/null parse condition
|
||||
- `src/channelScript/CHANSVm CHANSVmFormatString`: tools/decomp-assist/fz1.attempts.md:3655 actual UTF16 character data instead of misleading pad name; tools/decomp-assist/fz1.attempts.md:3656 read-only format input bytes; tools/decomp-assist/fz1.attempts.md:3657 format cleanup length native signed count
|
||||
- `src/channelScript/CHANSVm CHANSVmStep`: tools/decomp-assist/fz1.attempts.md:3713 default step count explicit branch; tools/decomp-assist/fz1.attempts.md:3714 step loop has precondition and post decrement; tools/decomp-assist/fz1.attempts.md:3715 step count and top tested loop use positive bound
|
||||
- `src/channelScript/CHANSVm VmBlobGetHexString`: tools/decomp-assist/fz1.attempts.md:3662 read-only byte/hex table input views; tools/decomp-assist/fz1.attempts.md:3663 two destination slots owned by a single character cursor; tools/decomp-assist/fz1.attempts.md:3664 hex output as pointer cursor
|
||||
- `src/channelScript/CHANSVm VmBlobPackCommon`: tools/decomp-assist/fz1.attempts.md:3673 boolean packing-mode parameter; tools/decomp-assist/fz1.attempts.md:3674 source blobs and string bytes readonly during copy; tools/decomp-assist/fz1.attempts.md:3675 native signed format length
|
||||
- `src/channelScript/CHANSVm VmBlobUnpack`: tools/decomp-assist/fz1.attempts.md:3681 format string readonly pointer and getter cast; tools/decomp-assist/fz1.attempts.md:3682 packing parser signed counts explicitly decoded from unsigned field; tools/decomp-assist/fz1.attempts.md:3683 native signed inner iteration index
|
||||
- `src/channelScript/CHANSVm VmDateDtor`: tools/decomp-assist/fz1.attempts.md:3635 read-only calendar view for format arguments; tools/decomp-assist/fz1.attempts.md:3636 month value computed before weekday in format call; tools/decomp-assist/fz1.attempts.md:3637 month then weekday genuine names
|
||||
- `src/channelScript/CHANSVm VmStringSplit`: tools/decomp-assist/fz1.attempts.md:3648 read-only source and delimiter byte pointers; tools/decomp-assist/fz1.attempts.md:3649 delimiter payload before parent payload addressing; tools/decomp-assist/fz1.attempts.md:3650 two-pass output uses do loop
|
||||
- `src/channelScript/CHANSVm VmWinEmuWrite`: tools/decomp-assist/fz1.attempts.md:3689 conversion object readonly binding; tools/decomp-assist/fz1.attempts.md:3690 constant string payload cached separately; tools/decomp-assist/fz1.attempts.md:3691 length loop checked before offset initialization
|
||||
- `src/iplwww/www_wiisetting Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue`: tools/decomp-assist/a6x.attempts.md:14 append helper owns index increment through int reference; tools/decomp-assist/a6x.attempts.md:15 mask helper returns final reloaded buffer and publishes length by reference; tools/decomp-assist/a6x.attempts.md:16 entire region and language selection owns reference country result in helper
|
||||
- `src/keyboard/tiCandidateBox createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator`: tools/decomp-assist/a23h.attempts.md:85 animation reference refers directly to the real record; tools/decomp-assist/a23h.attempts.md:86 animation slot cursor advances once per resource; tools/decomp-assist/a23h.attempts.md:87 signed local count preserves bounded descriptor traversal
|
||||
- `src/keyboard/tiCandidateBox create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator`: tools/decomp-assist/a23h.attempts.md:71 text-area setup helper subobject reference and layout pointer; tools/decomp-assist/a23h.attempts.md:72 text-area setup helper subobject pointer and caller pointer reference; tools/decomp-assist/a23h.attempts.md:73 text-area setup helper subobject and layout references
|
||||
- `src/keyboard/tiCellPhone create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator`: tools/decomp-assist/a23h.attempts.md:134 toggle animation helper layout first; tools/decomp-assist/a23h.attempts.md:135 toggle animation helper descriptor first; tools/decomp-assist/a23h.attempts.md:136 toggle animation helper references to live pane and resource objects
|
||||
- `src/keyboard/tiInputForm calcCursorPos__Q39textinput9inputform4BaseFff`: tools/decomp-assist/a23h.attempts.md:33 scaled height compound accumulator; tools/decomp-assist/a23h.attempts.md:34 glyph width computed through a const scalar pair; tools/decomp-assist/a23h.attempts.md:35 scaled cursor bounds output references isolate two calculations
|
||||
- `src/keyboard/tiInputForm create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer`: tools/decomp-assist/a23h.attempts.md:79 textbox metrics preserve complete font-size value; tools/decomp-assist/a23h.attempts.md:80 animation descriptor is a const record reference; tools/decomp-assist/a23h.attempts.md:126 row activation helper receives real row storage and capacity
|
||||
- `src/keyboard/tiSignWindow create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator`: tools/decomp-assist/a23h.attempts.md:92 animation reference refers directly to the real record; tools/decomp-assist/a23h.attempts.md:93 animation slot cursor advances once per resource; tools/decomp-assist/a23h.attempts.md:94 signed local count preserves bounded descriptor traversal
|
||||
- `src/keyboard/tiString inputChar__Q39textinput8tistring9DecolatedFw`: tools/decomp-assist/a23h.attempts.md:52 builder append returns current length after postincrement; tools/decomp-assist/a23h.attempts.md:53 newline append and ordinary append use distinct real cursor operations; tools/decomp-assist/a23h.attempts.md:54 literal converter uses builder count reference with explicit newline terminator
|
||||
- `src/keyboard/tiZiString clearCandidates__Q39textinput8tistring6WithZiFv`: tools/decomp-assist/a23h.attempts.md:40 candidate buffer storage uses three proven typed ranges; tools/decomp-assist/a23h.attempts.md:41 three-range storage with input array-reference lifetime; tools/decomp-assist/a23h.attempts.md:43 separate named subrange pointers at reset boundary
|
||||
- `src/keyboard/tiZiString setElementBuffer__Q39textinput8tistring6WithZiFv`: tools/decomp-assist/a23h.attempts.md:40 candidate buffer storage uses three proven typed ranges; tools/decomp-assist/a23h.attempts.md:41 three-range storage with input array-reference lifetime; tools/decomp-assist/a23h.attempts.md:43 separate named subrange pointers at reset boundary
|
||||
- `src/keyboard/tiZiString update__Q39textinput8tistring6WithZiFv`: tools/decomp-assist/a23h.attempts.md:40 candidate buffer storage uses three proven typed ranges; tools/decomp-assist/a23h.attempts.md:41 three-range storage with input array-reference lifetime; tools/decomp-assist/a23h.attempts.md:43 separate named subrange pointers at reset boundary
|
||||
- `src/scene/address/iplAddress onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface`: tools/decomp-assist/a23h.attempts.md:102 event dispatch pane component helper boundary; tools/decomp-assist/a23h.attempts.md:103 event dispatch separate scene-base receiver; tools/decomp-assist/a23h.attempts.md:104 event dispatch scoped event kind and immutable mail receiver
|
||||
- `src/scene/address/iplAddress start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface`: tools/decomp-assist/a23h.attempts.md:99 drag texture helper const object and pane references; tools/decomp-assist/a23h.attempts.md:100 drag texture helper const input pointer references; tools/decomp-assist/a23h.attempts.md:101 drag texture helper destination-first pointer arguments
|
||||
- `src/scene/address/iplAddressEdit create__Q33ipl5scene11AddressEditFv`: tools/decomp-assist/a23h.attempts.md:109 address create typed balloon margins; tools/decomp-assist/a23h.attempts.md:110 address create const friend-string receiver; tools/decomp-assist/a23h.attempts.md:111 address create inline aspect-ratio margin selector
|
||||
- `src/scene/address/iplAddressEdit get_friendinfo__Q33ipl5scene11AddressEditFv`: tools/decomp-assist/a23h.attempts.md:27 member string getter with explicit nullable receiver; tools/decomp-assist/a23h.attempts.md:28 typed member-array getter retains array dimensions; tools/decomp-assist/a23h.attempts.md:56 layout pane wrapper with correct one-name signature
|
||||
- `src/scene/address/iplAddressEdit update_friendinfo__Q33ipl5scene11AddressEditFv`: tools/decomp-assist/a23h.attempts.md:112 friend name copy explicit array element and size type; tools/decomp-assist/a23h.attempts.md:113 friend name copy bounded array helper; tools/decomp-assist/a23h.attempts.md:114 friend name copy separate string and name receivers
|
||||
- `src/scene/cardSequence/iplCardSequence cardThreadMain`: tools/decomp-assist/gk3.attempts.md:89 native OSMessage receive/storage matching exact probeCard: 301/301 instructions; structural/exact (2, 78); pool identical; exact regressions []; reverted.; tools/decomp-assist/gk3.attempts.md:90 queue local before union field assembly matching exact sendCardSlotState: 301/301 instructions; structural/exact (2, 78); pool identical; exact regressions []; reverted.; tools/decomp-assist/gk3.attempts.md:91 signed do/while mounted-file scan following exact clearAllCardFileEntries: 301/301 instructions; structural/exact (2, 78); pool identical; exact regressions []; reverted.
|
||||
- `src/scene/cardSequence/iplCardSequence loadCardFileIcons`: tools/decomp-assist/gk3.attempts.md:99 const CARDDir input matching read-only icon metadata view: 505/512 instructions; structural/exact (103, 431); pool identical; exact regressions []; reverted.; tools/decomp-assist/gk3.attempts.md:100 native unsigned sector size outputs matching exact refreshCardSlotInfo: 508/512 instructions; structural/exact (66, 436); pool identical; exact regressions []; reverted.; tools/decomp-assist/gk3.attempts.md:101 signed do/while animation speed scan matching clearAllCardFileEntries: 509/512 instructions; structural/exact (71, 423); pool identical; exact regressions []; reverted.
|
||||
- `src/scene/cardSequence/iplCardSequence runCardMoveOrCopy`: tools/decomp-assist/gk3.attempts.md:107 inline common-sector helper with reference outputs and exact sibling error returns: 608/608 instructions; structural/exact (12, 185); pool identical; exact regressions []; reverted.; tools/decomp-assist/gk3.attempts.md:108 scoped permission result matching exact status-helper local lifetime: 608/608 instructions; structural/exact (12, 176); pool identical; exact regressions []; reverted.; tools/decomp-assist/gk3.attempts.md:109 explicit block count guard following exact sibling native loop locals: 609/608 instructions; structural/exact (24, 498); pool identical; exact regressions []; reverted.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager _create_icon__Q33ipl5scene17MemoryCardManagerFUcsl`: tools/decomp-assist/ult15.attempts.md:239 const directory and icon metadata views at GX boundaries; tools/decomp-assist/ult15.attempts.md:241 render metadata as mutable typed reference; tools/decomp-assist/ult15.attempts.md:243 linear icon records using actual slot stride and typed field access
|
||||
- `src/scene/memoryCard/iplMemoryCardManager create_banner__Q33ipl5scene17MemoryCardManagerFUcs`: tools/decomp-assist/ult15.attempts.md:247 const directory and icon metadata views at GX boundaries; tools/decomp-assist/ult15.attempts.md:249 render metadata as mutable typed reference; tools/decomp-assist/ult15.attempts.md:251 linear icon records using actual slot stride and typed field access
|
||||
- `src/scene/memoryCard/iplMemoryCardManager getBlocks__Q33ipl5scene17MemoryCardManagerFUcs`: tools/decomp-assist/ult22.attempts.md:18 return through signed index parameter after metadata lookup; tools/decomp-assist/ult22.attempts.md:19 single exit after readonly manager selection scope; tools/decomp-assist/ult22.attempts.md:20 metadata value output reference at inline helper boundary
|
||||
- `src/scene/memoryCard/iplMemoryCardManager getComment__Q33ipl5scene17MemoryCardManagerFUcsi`: tools/decomp-assist/ult22.attempts.md:54 encoded scratch is unsigned byte array with matching trim cursor types; tools/decomp-assist/ult22.attempts.md:55 narrow trailing trim owns scoped read and write cursor declarations; tools/decomp-assist/ult22.attempts.md:56 comment terminator has named character-code type
|
||||
- `src/scene/memoryCard/iplMemoryCardManager isBannerEnable__Q33ipl5scene17MemoryCardManagerFUcs`: tools/decomp-assist/ult22.attempts.md:14 return through byte parameter after metadata lookup; tools/decomp-assist/ult22.attempts.md:15 single exit after readonly manager selection scope; tools/decomp-assist/ult22.attempts.md:16 metadata value output reference at inline helper boundary
|
||||
- `src/scene/memoryCard/iplMemoryCardManager isCopyEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl`: tools/decomp-assist/ult22.attempts.md:34 commuted built-in subscript preserves file-first source operands; tools/decomp-assist/ult22.attempts.md:35 flat typed directory uses shared slot/file element offset; tools/decomp-assist/ult22.attempts.md:36 typed inline directory selector takes file before slot
|
||||
- `src/scene/memoryCard/iplMemoryCardManager isMoveEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl`: tools/decomp-assist/ult22.attempts.md:28 commuted built-in subscript preserves file-first source operands; tools/decomp-assist/ult22.attempts.md:29 flat typed directory uses shared slot/file element offset; tools/decomp-assist/ult22.attempts.md:30 typed inline directory selector takes file before slot
|
||||
- `src/scene/sdChannelMemory/iplSDMemory create__Q33ipl5scene8SDMemoryFPQ23EGG4HeapPQ33ipl4nand10LayoutFilePQ33ipl5scene15SDChannelSelect`: tools/decomp-assist/a6x.attempts.md:41 entire initial dialog construction and message setup owns helper temporaries; tools/decomp-assist/a6x.attempts.md:42 initial dialog factory receives immutable heap and layout-file bindings; tools/decomp-assist/a6x.attempts.md:43 cached-title scan uses helper with const savedata object reference
|
||||
- `src/scene/sdChannelMemory/iplSDMemory drawTransferTitles__Q33ipl5scene8SDMemoryFv`: tools/decomp-assist/a6x.attempts.md:26 only body child-alpha traversal uses value-parameter static inline helper; tools/decomp-assist/a6x.attempts.md:28 message splitting and drawing loop owns line temporaries in inline helper; tools/decomp-assist/a6x.attempts.md:32 body alpha helper returns inherited alpha from const source pane
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: tools/decomp-assist/a23h.attempts.md:64 paired usage local stores blocks then bytes; tools/decomp-assist/a23h.attempts.md:65 paired usage member predicate owns threshold reads; tools/decomp-assist/a23h.attempts.md:66 append count and compare through real usage pointers
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: tools/decomp-assist/a23h.attempts.md:64 paired usage local stores blocks then bytes; tools/decomp-assist/a23h.attempts.md:65 paired usage member predicate owns threshold reads; tools/decomp-assist/a23h.attempts.md:66 append count and compare through real usage pointers
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: tools/decomp-assist/a23h.attempts.md:64 paired usage local stores blocks then bytes; tools/decomp-assist/a23h.attempts.md:65 paired usage member predicate owns threshold reads; tools/decomp-assist/a23h.attempts.md:66 append count and compare through real usage pointers
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: tools/decomp-assist/a23h.attempts.md:64 paired usage local stores blocks then bytes; tools/decomp-assist/a23h.attempts.md:65 paired usage member predicate owns threshold reads; tools/decomp-assist/a23h.attempts.md:66 append count and compare through real usage pointers
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect create__Q33ipl5scene15SDChannelSelectFv`: tools/decomp-assist/a23h.attempts.md:64 paired usage local stores blocks then bytes; tools/decomp-assist/a23h.attempts.md:65 paired usage member predicate owns threshold reads; tools/decomp-assist/a23h.attempts.md:66 append count and compare through real usage pointers
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv`: tools/decomp-assist/a23h.attempts.md:64 paired usage local stores blocks then bytes; tools/decomp-assist/a23h.attempts.md:65 paired usage member predicate owns threshold reads; tools/decomp-assist/a23h.attempts.md:66 append count and compare through real usage pointers
|
||||
- `src/scene/sdChannelTitle/iplSDChannelTitle iplSDChannelTitle_flushSaveBeforeExit`: tools/decomp-assist/a6x.attempts.md:53 queued-file publication and reconnect own output-reference helper; tools/decomp-assist/a6x.attempts.md:54 concrete save request submits through const member with heap and manager fields; tools/decomp-assist/a6x.attempts.md:55 heap query returns heap and publishes loaded savedata manager
|
||||
- `src/scene/setting/iplSetting scanAP__Q33ipl5scene7SettingFv`: tools/decomp-assist/a6x.attempts.md:35 whole state-9 completion transaction moved into inline member; tools/decomp-assist/a6x.attempts.md:36 state-9 static inline query owns BOOL output and referenced index/layout inputs; tools/decomp-assist/a6x.attempts.md:37 const member publishes current animation index and returns layout
|
||||
- `src/system/iplKeyboard create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap`: tools/decomp-assist/a6x.attempts.md:71 layout allocator installation returns owned allocator through inline factory; tools/decomp-assist/a6x.attempts.md:72 destination switch owns reloadable MemoManager reference boundary; tools/decomp-assist/a6x.attempts.md:73 three MemoSetting assignments retain their order inside inline output transaction
|
||||
- `src/system/odh LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli`: tools/decomp-assist/a6x.attempts.md:59 RGB565 helper returns meaningful three-component RGB5 aggregate; tools/decomp-assist/a6x.attempts.md:60 RGB565 tile-address helper reads source and index through const references; tools/decomp-assist/a6x.attempts.md:61 video sample conversion and pedestal subtraction own static inline boundary
|
||||
- `src/system/odh huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl`: tools/decomp-assist/a6x.attempts.md:65 DC Huffman walk publishes leaf category by reference and returns consumed depth; tools/decomp-assist/a6x.attempts.md:66 DC and AC magnitude tree walks share the same bounded inline helper; tools/decomp-assist/a6x.attempts.md:67 post-DC byte alignment updates the meaningful cursor state through inline references
|
||||
- `src/utility/iplESMisc DeleteUnauthorizedData__Q33ipl7utility6ESMiscFPQ23EGG4Heap`: tools/decomp-assist/a6x.attempts.md:47 both three-slot save-name validation loops share pure inline result helper; tools/decomp-assist/a6x.attempts.md:48 single save-slot validation owns six short-circuit name checks; tools/decomp-assist/a6x.attempts.md:49 zeroing and read helper retains allocated buffer through const reference
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 0, "insns": [81, 81], "name": "clearCandidates__Q39textinput8tistring6WithZiFv", "percent": 100.0}, {"diffs": 126, "insns": [446, 446], "name": "update__Q39textinput8tistring6WithZiFv", "percent": 98.3139}, {"diffs": 0, "insns": [65, 65], "name": "setElementBuffer__Q39textinput8tistring6WithZiFv", "percent": 100.0}], "gained": ["clearCandidates__Q39textinput8tistring6WithZiFv", "setElementBuffer__Q39textinput8tistring6WithZiFv"], "label": "both word copy helpers own independent input and result row cursors", "lost": [], "measures": {"fuzzy_match_percent": 99.45349, "matched_code": "3720", "matched_code_percent": 67.58721, "matched_data": "7680", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "5504", "total_data": "7680", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "bc0131073a6b", "trial": 32, "unit": "src/keyboard/tiZiString"}
|
||||
|
||||
ATTEMPT {"build": 0, "functions": [{"diffs": 58, "insns": [185, 185], "name": "KPADInit", "percent": 97.810814}], "gained": [], "label": "preserve the full 64-byte rotation object as its natural four-by-four matrix type", "lost": [], "measures": {"fuzzy_match_percent": 99.875916, "matched_code": "12316", "matched_code_percent": 94.33211, "matched_data": "8032", "matched_data_percent": 100.0, "matched_functions": 28, "matched_functions_percent": 96.55172, "total_code": "13056", "total_data": "8032", "total_functions": 29, "total_units": 1}, "pool": "POOL IDENTICAL up to 0 (mine=0 base=0)", "pool_ok": true, "source_hash": "3c6a31371288", "trial": 33, "unit": "libs/RVL_SDK/src/kpad/KPAD"}
|
||||
|
||||
## Disposition of the other global-address candidates
|
||||
|
||||
- CHANSVm: scUndefinedUtf16 is a compiler-used anchor for separately declared UTF16 strings and date-name tables. No wrapper combines those objects. VmDateDtor's seven differences are ordering of weekday/month argument preparation, not missing object boundaries. The other open functions use separate scalar constants, function/jump tables or register-only loops.
|
||||
- BS2Mach: Block, DiskID, TicketViews and loader state already have separate declarations. The shared data anchor covers ordinary diagnostic literals. The two startup prologues and CheckBS2CommandStatus have scheduling differences; BS2Tick also has hardware-address and callback scheduling differences. No mixed source global remains to split.
|
||||
- BS2Update: Flags0/Flags1, thread/stack and the two update headers already have separate globals. The 0x500 lbl_81646978 region is a literal pool. No source struct wraps these objects.
|
||||
- iplKeyboard: two separate language tables contain repeated EZTXLanguageEntry records and terminators. No row straddles another global. iplSDMemory's large unnamed regions are string pools, with separate save/system state owned elsewhere.
|
||||
- iplCardSequence: sThread is a pointer to one allocated CardThreadState, not an inferred static aggregate. iplMemoryCardManager's seven open functions do not reference global objects. They cannot use lever 13 without changing a different ownership model.
|
||||
- iplAddress/iplAddressEdit: system and sound globals are outside this leaf. The local 0x140 sFriendInfo is passed to whole-object memset/memcpy and typed NWC24 APIs, so its fields do not prove separate globals. The two-instruction update_friendinfo difference exchanges preparation of a local name and the friend-name address.
|
||||
- iplSDChannelSelect/iplSDChannelTitle: relevant global references are to the existing System::Arg; their collector/flush differences concern pointer reload order or local indexing, not owned object boundaries. iplSetting::scanAP reads only this object's fields at its four remaining differences. iplESMisc references a diagnostic literal, and odh references scalar floating constants.
|
||||
- tiCellPhone/tiInputForm/tiSignWindow: pane/animation/language data are indexed arrays of uniform records. Their register allocation differs inside record consumers, but no interleaved independently addressed object is present. tiString has no global-object relocation in its open function.
|
||||
- www_wiisetting: keyboard-language LUTs are independent homogeneous tables. The near match differs in the saved pointer/index registers for masked values and the European table; the tables do not contain unrelated state. sWiiData is already an independent typed object.
|
||||
- NHTTP_recvbuf/NHTTP_stdlib_RVL/SOBasic: open functions have no global data references. Other requested NHTTP units are already exact. NWC24InitDlTask refers to the existing NWC24WorkP pointer and a literal; no owned aggregate is implicated.
|
||||
- CDBRecordEncrypt references an error literal. Its two 0x40 crypt buffers are already independent globals. AES has separate encryption/decryption and substitution tables. MD5 has separate 64-word constant and 48-word index tables and advances their cursors across the relevant rounds.
|
||||
- JPEG IDCT/exif functions have no global-object relocations; converter selection functions reference function addresses, and open pixel converters read caller-owned buffers. iqdec uses two separate Zigzag lookup arrays, not a merged object. No eligible boundary was found.
|
||||
- lyt_window: flipInfos is a repeated TextureFlipInfo array. SDK pdm_partition's open function has no global-object references; the RevoEX copy is exact.
|
||||
- sd_drv: g_pfd_sddrv_info is a typed state object; g_pfd_sddev is a 0x40 storage union around the 0x28 SDDev. No access identifies a second object in the trailing 0x18 bytes, so no split or metadata shrink is justified. The sector buffer and size-dependence table are already separate globals. The RevoEX driver copy is exact.
|
||||
- nup: remaining differences use caller-owned title/context data and literal/scalar references. No large owned global is implicated.
|
||||
- kbd_lib: kbdData is indexed at the target 0x268 stride for four channels. Command and callback arrays are already separate. The key-map storage is uniform; no reference proves a new boundary. The LED callback's remaining branch direction has no global-layout cause.
|
||||
- KPAD: initial_rotation_matrix has no target use of the last 0x10 bytes or relocation naming another object there. A natural Mtx44 representation preserves all data but leaves KPADInit at 185/185 and 58 differences. Restored. No speculative object or alignment was added.
|
||||
|
||||
The scan checked every open function's address-forming instruction differences and referenced objects. Most apparent large-object hits were jump tables, function symbols, literal pools or real repeated arrays. Only tiZiString supplied a productive, provable split. tiCandidateBox's real table/string separation compiled in three forms without an exact gain; all were restored.
|
||||
|
||||
## Remaining tiZiString work
|
||||
|
||||
After the split, update has 446/446 instructions and 85 differences at 98.36996%. Trials 18-32 cover distinct search, context, input-copy, output-view, row-array and word-copy boundaries. The best context helper plus result-first const cursor reached 99.524666% and 33 differences, still not exact. It exchanges saved zero/one registers and final input/output/index registers, plus the two phone-output increment instructions. All fuzzy-only update helpers, the row-array experiment, and unrelated type experiments were restored. Only the two exact matches remain.
|
||||
|
||||
## Final clean validation
|
||||
|
||||
Full non-quick gate across all 51 audited units, baseline 38cb84c8, exited 0. Log: /tmp/agg-sweep/final.full-gate.txt. The gate removed and rebuilt build/43U. Fresh progress/report/ok Ninja targets passed afterward.
|
||||
No unit other than tiZiString changed any report measure. All 1027 unit data totals stayed unchanged. No regressions, forbidden additions or readability warnings.
|
||||
Reference-object proof rerun after the clean build: 1027 objects, 109496 resolved relocations, changed: []. Every allocated section retains its type, size and bytes; every relocation retains its source position/type and resolved destination section + value + addend.
|
||||
clearCandidates: 81/81 instructions, diffs 0, exact-name objdiff 100.0%. setElementBuffer: 65/65 instructions, diffs 0, exact-name objdiff 100.0%.
|
||||
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
Fresh decomp_status output: /tmp/agg-sweep/final.status.json and /tmp/agg-sweep/final.status.md. The terminal project completion checker still returns DECOMPLETE_FAIL: overall code exact 2773328/2995176, linked 2282392/2995176, data exact 1831712/1832684, linked 1542216/1832684. This matching-only sweep does not claim project or unit completion.
|
||||
|
||||
Final gate excerpts (verbatim):
|
||||
|
||||
```
|
||||
[src/keyboard/tiZiString] pool: IDENTICAL
|
||||
[src/keyboard/tiZiString] objdiff: code 3720/5504 data 7680/7680 functions 28/29 fuzzy 99.4717 linked code 0
|
||||
[src/keyboard/tiZiString] instruction-exact functions: 28/29
|
||||
[src/keyboard/tiZiString] section .bss size 7296 match 100.0
|
||||
[src/keyboard/tiZiString] section .data size 328 match 100.0
|
||||
[src/keyboard/tiZiString] section .rodata size 56 match 100.0
|
||||
[src/keyboard/tiZiString] section .text size 5504 match 99.47166
|
||||
[src/keyboard/tiZiString] below 100: update__Q39textinput8tistring6WithZiFv 98.36996
|
||||
[src/keyboard/tiZiString] baseline: code 3136/5504 data 7680 functions 26 fuzzy 98.3241
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 92.57366 -> 92.59315
|
||||
global fuzzy_match_percent: 99.73627 -> 99.73837
|
||||
global complete_code_percent: 76.20227 -> 76.20227
|
||||
global matched_data_percent: 99.94696 -> 99.94696
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
|
||||
GATE PASS
|
||||
```
|
||||
|
||||
### Every audited unit: before -> after
|
||||
|
||||
| Unit | Instruction-exact functions | Exact code bytes | Exact data bytes |
|
||||
| --- | --- | --- | --- |
|
||||
| src/system/iplKeyboard | 31 -> 31 / 32 | 4752 -> 4752 / 6024 | 1184 -> 1184 / 1184 |
|
||||
| src/system/odh | 26 -> 26 / 28 | 12876 -> 12876 / 14684 | 6360 -> 6360 / 6360 |
|
||||
| src/utility/iplESMisc | 30 -> 30 / 31 | 9404 -> 9404 / 11200 | 4416 -> 4416 / 4416 |
|
||||
| src/iplwww/www_wiisetting | 20 -> 20 / 21 | 3740 -> 3740 / 6176 | 3856 -> 3856 / 3856 |
|
||||
| src/BS2/BS2Mach | 25 -> 25 / 29 | 5112 -> 5112 / 16980 | 158528 -> 158528 / 158528 |
|
||||
| src/BS2/BS2Update | 9 -> 9 / 10 | 400 -> 400 / 4052 | 10488 -> 10488 / 10488 |
|
||||
| src/scene/address/iplAddress | 98 -> 98 / 101 | 22016 -> 22016 / 23988 | 1964 -> 1964 / 1964 |
|
||||
| src/scene/address/iplAddressEdit | 91 -> 91 / 94 | 23344 -> 23344 / 27112 | 2560 -> 2560 / 2560 |
|
||||
| src/scene/memoryCard/iplMemoryCardManager | 19 -> 19 / 26 | 2932 -> 2932 / 5396 | 0 -> 0 / 0 |
|
||||
| src/scene/cardSequence/iplCardSequence | 27 -> 27 / 30 | 4168 -> 4168 / 9852 | 1496 -> 1496 / 1496 |
|
||||
| src/scene/sdChannelSelect/iplSDChannelSelect | 123 -> 123 / 129 | 30344 -> 30344 / 33828 | 2960 -> 2960 / 2960 |
|
||||
| src/scene/sdChannelTitle/iplSDChannelTitle | 68 -> 68 / 69 | 18476 -> 18476 / 18624 | 1976 -> 1976 / 1976 |
|
||||
| src/scene/sdChannelMemory/iplSDMemory | 63 -> 63 / 66 | 14812 -> 14812 / 20872 | 3344 -> 3344 / 3344 |
|
||||
| src/scene/setting/iplSetting | 110 -> 110 / 112 | 36796 -> 36796 / 37884 | 5696 -> 5696 / 5696 |
|
||||
| src/keyboard/tiCellPhone | 85 -> 85 / 86 | 17696 -> 17696 / 19028 | 3860 -> 3860 / 3860 |
|
||||
| src/keyboard/tiInputForm | 217 -> 217 / 221 | 47928 -> 47928 / 50656 | 3772 -> 3772 / 3772 |
|
||||
| src/keyboard/tiCandidateBox | 109 -> 109 / 112 | 21728 -> 21728 / 24000 | 4652 -> 4652 / 4652 |
|
||||
| src/keyboard/tiSignWindow | 55 -> 55 / 56 | 6300 -> 6300 / 7184 | 3468 -> 3468 / 3468 |
|
||||
| src/keyboard/tiString | 41 -> 41 / 42 | 4632 -> 4632 / 5176 | 288 -> 288 / 288 |
|
||||
| src/keyboard/tiZiString | 26 -> 28 / 29 | 3136 -> 3720 / 5504 | 7680 -> 7680 / 7680 |
|
||||
| src/channelScript/CHANSVm | 224 -> 224 / 233 | 39908 -> 39908 / 53564 | 6904 -> 6904 / 6904 |
|
||||
| libs/RevoEX/src/cdb/CDBRecord | 28 -> 28 / 29 | 5940 -> 5940 / 7076 | 2640 -> 2640 / 2640 |
|
||||
| libs/RevoEX/src/net/md5 | 3 -> 3 / 4 | 600 -> 600 / 1824 | 456 -> 456 / 456 |
|
||||
| libs/RevoEX/src/net/aes | 7 -> 7 / 9 | 1116 -> 1116 / 2752 | 2800 -> 2800 / 2800 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_bgnend | 9 -> 9 / 9 | 880 -> 880 / 880 | 136 -> 136 / 136 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_control | 3 -> 3 / 3 | 420 -> 420 / 420 | 32 -> 32 / 32 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_list | 5 -> 5 / 5 | 592 -> 592 / 592 | 0 -> 0 / 0 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_os_RVL | 11 -> 11 / 11 | 548 -> 548 / 548 | 72 -> 72 / 72 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_recvbuf | 6 -> 6 / 7 | 1196 -> 1196 / 1692 | 0 -> 0 / 0 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_request | 7 -> 7 / 7 | 2512 -> 2512 / 2512 | 48 -> 48 / 48 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_response | 4 -> 4 / 4 | 1044 -> 1044 / 1044 | 16 -> 16 / 16 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_socket_RVL | 10 -> 10 / 10 | 2140 -> 2140 / 2140 | 0 -> 0 / 0 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_stdlib_RVL | 12 -> 12 / 14 | 1864 -> 1864 / 2248 | 112 -> 112 / 112 |
|
||||
| libs/RevoEX/src/nhttp/NHTTP_thread | 26 -> 26 / 26 | 11292 -> 11292 / 11292 | 504 -> 504 / 504 |
|
||||
| libs/RevoEX/src/nwc24/NWC24Download | 29 -> 29 / 30 | 11920 -> 11920 / 12496 | 80 -> 80 / 80 |
|
||||
| libs/RevoEX/src/so/SOBasic | 21 -> 21 / 22 | 3836 -> 3836 / 4088 | 144 -> 144 / 144 |
|
||||
| libs/RevoEX/src/vf/dskmng/pdm_partition | 19 -> 19 / 19 | 6108 -> 6108 / 6108 | 0 -> 0 / 0 |
|
||||
| libs/RevoEX/src/vf/develop/sd_drv | 16 -> 16 / 16 | 3608 -> 3608 / 3608 | 992 -> 992 / 992 |
|
||||
| libs/RVLMiddleware/TMC_JPEG/src/buffer/idct_block_var | 0 -> 0 / 2 | 0 -> 0 / 2844 | 0 -> 0 / 0 |
|
||||
| libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse | 3 -> 3 / 6 | 1348 -> 1348 / 5088 | 0 -> 0 / 0 |
|
||||
| libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8 | 2 -> 2 / 13 | 15164 -> 15164 / 15948 | 0 -> 0 / 0 |
|
||||
| libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 | 7 -> 7 / 13 | 2648 -> 2648 / 6184 | 0 -> 0 / 0 |
|
||||
| libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 | 2 -> 2 / 13 | 660 -> 660 / 6596 | 0 -> 0 / 0 |
|
||||
| libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32 | 0 -> 0 / 1 | 0 -> 0 / 1104 | 0 -> 0 / 0 |
|
||||
| libs/NW4R/src/lyt/lyt_window | 20 -> 20 / 21 | 9848 -> 9848 / 11352 | 316 -> 316 / 316 |
|
||||
| libs/RVL_SDK/src/kpad/KPAD | 28 -> 28 / 29 | 12316 -> 12316 / 13056 | 8032 -> 8032 / 8032 |
|
||||
| libs/RVL_SDK/src/wad/wad | 35 -> 35 / 40 | 13180 -> 13180 / 24500 | 528 -> 528 / 528 |
|
||||
| libs/RVL_SDK/src/fa/pdm_partition | 19 -> 19 / 20 | 3380 -> 3380 / 3716 | 0 -> 0 / 0 |
|
||||
| libs/RVL_SDK/src/fa/driver/sd_drv | 22 -> 22 / 26 | 9260 -> 9260 / 11760 | 3592 -> 3592 / 3592 |
|
||||
| libs/RVL_SDK/src/nup/nup | 20 -> 20 / 23 | 7748 -> 7748 / 10764 | 1720 -> 1720 / 1720 |
|
||||
| libs/RVL_SDK/src/kbd/kbd_lib | 17 -> 17 / 21 | 3728 -> 3728 / 5764 | 5296 -> 5296 / 5296 |
|
||||
|
||||
### Fresh open-function list and attempt coverage
|
||||
|
||||
104 functions remain below 100% in these units. Every entry has at least three distinct prior compiled source attempts cited above; those historical attempts were not rerun or counted as new sweep trials. The current sweep added 33 compiled trials, retained two exact functions, and restored all other source experiments. The audit and disposition sections record why a new object split is unsupported for the other units.
|
||||
|
||||
- `src/system/iplKeyboard create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap`: 94.00944%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/system/odh LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli`: 98.08219%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/system/odh huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl`: 95.57189%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/utility/iplESMisc DeleteUnauthorizedData__Q33ipl7utility6ESMiscFPQ23EGG4Heap`: 99.14254%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/iplwww/www_wiisetting Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue`: 99.86043%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/BS2/BS2Mach BS2StartGame`: 98.72774%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/BS2/BS2Mach BS2StartGCGame`: 97.82895%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/BS2/BS2Mach CheckBS2CommandStatus`: 99.50739%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/BS2/BS2Mach BS2Tick`: 98.799484%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/BS2/BS2Update UpdateThread`: 94.83023%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/address/iplAddress start_drag_event__Q33ipl5scene7AddressFPCcPCQ33ipl10controller9Interface`: 99.84305%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/address/iplAddress onEventDerived__Q33ipl5scene7AddressFUlUlPCQ33ipl10controller9Interface`: 98.42593%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/address/iplAddressEdit create__Q33ipl5scene11AddressEditFv`: 97.5561%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/address/iplAddressEdit get_friendinfo__Q33ipl5scene11AddressEditFv`: 88.03571%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/address/iplAddressEdit update_friendinfo__Q33ipl5scene11AddressEditFv`: 99.42105%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager isMoveEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl`: 99.830505%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager isCopyEnable__Q33ipl5scene17MemoryCardManagerFUcUlPl`: 99.830505%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager isBannerEnable__Q33ipl5scene17MemoryCardManagerFUcs`: 92.30769%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager _create_icon__Q33ipl5scene17MemoryCardManagerFUcsl`: 87.55%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager getComment__Q33ipl5scene17MemoryCardManagerFUcsi`: 98.94309%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager create_banner__Q33ipl5scene17MemoryCardManagerFUcs`: 90.42453%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/memoryCard/iplMemoryCardManager getBlocks__Q33ipl5scene17MemoryCardManagerFUcs`: 92.0%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/cardSequence/iplCardSequence cardThreadMain`: 97.9402%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/cardSequence/iplCardSequence loadCardFileIcons`: 90.37305%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/cardSequence/iplCardSequence runCardMoveOrCopy`: 97.88651%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect create__Q33ipl5scene15SDChannelSelectFv`: 97.73972%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: 97.81188%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: 97.833336%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: 98.007935%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl`: 97.55125%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelSelect/iplSDChannelSelect flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv`: 99.65714%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelTitle/iplSDChannelTitle iplSDChannelTitle_flushSaveBeforeExit`: 98.5946%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelMemory/iplSDMemory create__Q33ipl5scene8SDMemoryFPQ23EGG4HeapPQ33ipl4nand10LayoutFilePQ33ipl5scene15SDChannelSelect`: 99.15884%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/sdChannelMemory/iplSDMemory drawTransferTitles__Q33ipl5scene8SDMemoryFv`: 93.456764%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/scene/setting/iplSetting scanAP__Q33ipl5scene7SettingFv`: 99.20221%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiCellPhone create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator`: 99.8949%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiInputForm calcCursorPos__Q39textinput9inputform4BaseFff`: 93.05215%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiInputForm create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer`: 96.40169%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiCandidateBox create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator`: 95.99148%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiCandidateBox createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator`: 98.49537%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiSignWindow create__Q49textinput8keyboard10signwindow12LayoutByNW4RFP12MEMAllocator`: 99.86425%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiString inputChar__Q39textinput8tistring9DecolatedFw`: 90.757355%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/keyboard/tiZiString update__Q39textinput8tistring6WithZiFv`: 98.36996%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm CHANSVmConvertToFloatFromStr`: 97.59036%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm VmDateDtor`: 94.96703%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm VmStringSplit`: 98.04054%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm CHANSVmFormatString`: 99.84919%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm VmBlobGetHexString`: 98.71951%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm VmBlobPackCommon`: 97.949104%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm VmBlobUnpack`: 98.452614%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm VmWinEmuWrite`: 99.62687%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `src/channelScript/CHANSVm CHANSVmStep`: 96.98723%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/cdb/CDBRecord CDBRecordEncrypt`: 99.19014%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/net/md5 ProcessBlock`: 95.55556%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/net/aes AESiEncryptBlock`: 65.81013%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/net/aes AESiDecryptBlock`: 78.95618%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/nhttp/NHTTP_recvbuf NHTTPi_compareTokenN_HdrRecvBuf`: 97.32258%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/nhttp/NHTTP_stdlib_RVL NHTTPi_strnicmp`: 99.76471%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/nhttp/NHTTP_stdlib_RVL NHTTPi_compareToken`: 99.73333%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/nwc24/NWC24Download NWC24InitDlTask`: 98.923615%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RevoEX/src/so/SOBasic SOGetSockName`: 96.666664%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/buffer/idct_block_var TMCJPEGDEC_IdctBlock_Lumi`: 86.178986%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/buffer/idct_block_var TMCJPEGDEC_IdctBlock_Col`: 92.927315%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse TMCJPEGDEC_exif_parse`: 99.43396%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse TMCJPEGDEC_IFD0_tag_parse`: 99.49065%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/exif/exif_parse TMCJPEGDEC_IFD1_tag_parse`: 96.14876%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoY8U8V8 TMCJPEGDEC_set_converterY8U8V8`: 92.78571%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_set_converterRGB565`: 93.91765%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV411toRGB565`: 91.17512%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV411toRGB565edge`: 95.42453%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV422toRGB565`: 97.132355%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV420toRGB565`: 95.42553%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGB565 TMCJPEGDEC_converterYUV420toRGB565edge`: 97.850876%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_set_converterRGBA8`: 93.91765%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV411toRGBA8`: 82.70661%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV411toRGBA8edge`: 94.28571%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV422toRGBA8`: 88.195946%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV422toRGBA8edge`: 92.0354%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV420toRGBA8`: 90.973854%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV420toRGBA8edge`: 87.5%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV211toRGBA8`: 91.15385%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV211toRGBA8edge`: 92.17391%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV444toRGBA8`: 90.670105%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/texturecvtr/Texture_MCUtoRGBA8 TMCJPEGDEC_converterYUV444toRGBA8edge`: 88.90909%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32 TMCJPEGDEC_decode_iquant`: 99.710144%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/NW4R/src/lyt/lyt_window DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc`: 98.17819%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/kpad/KPAD KPADInit`: 97.810814%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/wad/wad WADImportGetBlocks`: 94.24161%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/wad/wad WADImportEx`: 99.02269%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/wad/wad WAD_815C1288`: 96.803276%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/wad/wad WADBackupEx`: 97.385124%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/wad/wad WADImportDVDExForBS`: 97.49049%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/fa/pdm_partition pdm_part_is_master_boot_sector`: 87.39286%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_init`: 93.125%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_finalize`: 92.63158%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_store_mbr_buf`: 99.75247%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/fa/driver/sd_drv pfd_sddrv_build_fat32_mbr_bpb`: 95.202705%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/nup/nup __nupParseServerInfo__FP14NUPContextInfoPcPcUx`: 98.108406%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/nup/nup __nupGetBootVersion__FP14NUPContextInfoP14ESTitleVersion`: 99.35583%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/nup/nup __nupGetTitleSize__FP12NUPTitleInfo`: 99.100716%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib kbdEventHandler`: 99.83871%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib kbdProcMod`: 99.90234%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib kbd_led_handler`: 99.72%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
- `libs/RVL_SDK/src/kbd/kbd_lib KBDSetModState`: 99.40476%; three historical attempts verified; see per-unit audit/disposition and coverage above.
|
||||
|
||||
The original descriptive names of the two newly separated tiZiString buffers are unknown. ElementWorkBuffer and PredictionBuffer are inferred from the clear/conversion/search consumers. Their extents and locations preserve the measured section bytes, all canonical relocation targets and the full unit data total. No padding, forced objects or link-status changes were introduced.
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user