Compare commits

..

1 Commits

Author SHA1 Message Date
coah
c6fbcbe532 Refresh completion code total after removing overlapping extent 2026-10-02 02:55:15 -05:00
121 changed files with 1637 additions and 50318 deletions

View File

@@ -2,8 +2,6 @@ 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.
# 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 +15,7 @@ concurrency:
cancel-in-progress: true
permissions:
contents: read
contents: write
jobs:
progress:
@@ -50,8 +48,15 @@ jobs:
- name: Report
run: build/tools/objdiff-cli report generate -p . -o build/43U/report.json -f json
- name: Summary
- name: Update README
run: python3 tools/update_readme_progress.py build/43U/report.json README.md "$GITHUB_SHA"
- name: Commit
run: |
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
if git diff --quiet README.md; then exit 0; fi
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add README.md
git commit -m "docs: update progress [skip ci]"
git pull --rebase origin main || { git rebase --abort; echo "main moved, next run will update"; exit 0; }
git push origin HEAD:main

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.59% | 90.81% | 71.43% | 99.37% |
| 99.48% | 88.74% | 64.70% | 98.77% |
units 956/1027 complete, functions 12365/12563 matched.
units 932/1027 complete, functions 12274/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -11,8 +11,6 @@ splits: 'config/43U/splits.txt'
ldscript_template: 'config/ldscript_ipl2.lcf'
force_active:
- SOGetSockOpt
- SOSetInterfaceOpt
- fprintf
- leap_days
- __msl_time2tm

View File

@@ -44,7 +44,7 @@ UpdateDiskID = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
TicketViewsBuf = .bss:0x810ADF80; // type:object size:0x3600 scope:local align:32
Flags0 = .bss:0x810B1580; // type:object size:0x800 scope:local
Flags1 = .bss:0x810B1D80; // type:object size:0x800 scope:local
Thread = .bss:0x810B2580; // type:object size:0x318 scope:local
Thread = .bss:0x810B2580; // type:object size:0x1318 scope:local
UpdateHeader0 = .bss:0x810B38A0; // type:object size:0x20 scope:local
UpdateHeader1 = .bss:0x810B38C0; // type:object size:0x20 scope:local
viewsBuf = .bss:0x810B38E0; // type:object size:0x3600 scope:local
@@ -87,8 +87,7 @@ m_allocator__Q23ipl5scene = .bss:0x810BD498; // type:object size:0x10
AOSSi_NcdIfConfig = .bss:0x810BD4A8; // type:object size:0x15E data:byte
AOSSi_NcdIpConfig = .bss:0x810BD608; // type:object size:0x7C4 data:4byte
sRakuAllocator = .bss:0x810BDDD0; // type:object size:0x10
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xC data:4byte
sRakuConfiguration = .bss:0x810BDDEC; // type:object size:0xE8
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
sRakuMsgQueue = .bss:0x810BDED4; // type:object size:0x20
AOSS_810BDEF8 = .bss:0x810BDEF8; // type:object size:0x20 data:4byte
AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
@@ -104,7 +103,7 @@ 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
s_player_thread_stack = .bss:0x810C2580; // type:object size:0x4000 scope:local
lbl_810C6580 = .bss:0x810C6580; // type:object size:0xC
lbl_810C6580 = .bss:0x810C6580; // type:object size:0x10
layoutGatherDestructorRecord = .bss:0x810C6590; // type:object size:0xC data:4byte
unInputedWCharColorDestructorRecord = .bss:0x810C659C; // type:object size:0xC data:4byte
charColorDestructorRecord = .bss:0x810C65A8; // type:object size:0xC data:4byte
@@ -4577,9 +4576,9 @@ enqueueNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB254; // type:
enqueueLoadNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB308; // type:function size:0x5C
enqueuePageNotice__Q33ipl5scene15SDChannelSelectFv = .text:0x813DB364; // type:function size:0x5C
enqueueResultNotice__Q33ipl5scene15SDChannelSelectFUl = .text:0x813DB3C0; // type:function size:0x5C
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB41C; // type:function size:0x5C
enqueueChannelNotice__Q33ipl5scene15SDChannelSelectFUlUlUlUl = .text:0x813DB41C; // type:function size:0x5C
enqueueMoveNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB478; // type:function size:0x5C
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUxUl = .text:0x813DB4D4; // type:function size:0x5C
enqueueStateNotice__Q33ipl5scene15SDChannelSelectFUlUlUlUl = .text:0x813DB4D4; // type:function size:0x5C
enqueueErrorNotice__Q33ipl5scene15SDChannelSelectFUlUl = .text:0x813DB530; // type:function size:0x5C
enqueueCommandNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB58C; // type:function size:0x60
enqueueDeleteNotice__Q33ipl5scene15SDChannelSelectFUlUlUl = .text:0x813DB5EC; // type:function size:0x60
@@ -4799,8 +4798,8 @@ iplSDChannelTitle_setPaneMessage = .text:0x813E8D14; // type:function size:0xB8
iplSDChannelTitle_loadBannerMetaFiles = .text:0x813E8DCC; // type:function size:0xA4
iplSDChannelTitle_fetchTmdViewTask = .text:0x813E8E70; // type:function size:0x94
iplSDChannelTitle_passesParentalCheck = .text:0x813E8F04; // type:function size:0x100
onEvent__Q33ipl5scene23SDTitlePaneEventHandlerFUlUlPv = .text:0x813E9004; // type:function size:0x2E8
onEventDerived__Q33ipl5scene25SDTitleButtonEventHandlerFUlUlPCQ33ipl10controller9Interface = .text:0x813E92EC; // type:function size:0x17C
iplSDChannelTitle_onTitlePaneEvent = .text:0x813E9004; // type:function size:0x2E8
iplSDChannelTitle_onTitleButtonEvent = .text:0x813E92EC; // type:function size:0x17C
startResetting__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9468; // type:function size:0xC
@20@__dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9474; // type:function size:0x8
__ct__Q33ipl5scene8SDButtonFPQ23EGG4Heap = .text:0x813E947C; // type:function size:0x9C
@@ -4815,7 +4814,7 @@ reset_gui__Q33ipl5scene8SDButtonFv = .text:0x813E9BC0; // type:function size:0x1
startPointEvent__Q33ipl5scene8SDButtonFPCcPQ33ipl10controller9Interface = .text:0x813E9D08; // type:function size:0x258
startLeftEvent__Q33ipl5scene8SDButtonFPCc = .text:0x813E9F60; // type:function size:0x220
isActive__Q33ipl5scene8SDButtonCFv = .text:0x813EA180; // type:function size:0xC
setEventHandler__Q33ipl5scene8SDButtonFPQ23gui12EventHandler = .text:0x813EA18C; // type:function size:0x14
setEventHandler__Q33ipl5scene8SDButtonFPQ23gui12EventHandlerPQ23gui12EventHandler = .text:0x813EA18C; // type:function size:0x14
setText__Q33ipl5scene8SDButtonFPCcPCw = .text:0x813EA1A0; // type:function size:0xB4
animation__Q33ipl5scene8SDButtonFi = .text:0x813EA254; // type:function size:0x1C4
initArrowAppearance__Q33ipl5scene8SDButtonFib = .text:0x813EA418; // type:function size:0xD0
@@ -5159,7 +5158,7 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFP12RakuProgress = .text:0x813FDA04; // type:function size:0x6C scope:local
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
@@ -13803,10 +13802,10 @@ __ieee754_sqrt = .text:0x8160CD34; // type:function size:0x248
nan = .text:0x8160CF7C; // type:function size:0x4
sqrt = .text:0x8160CF80; // type:function size:0x4
GetTRKConnected = .text:0x8160CF84; // type:function size:0x10
TRKAccessFile = .text:0x8160CFA0; // type:function size:0x8
TRKOpenFile = .text:0x8160CFA8; // type:function size:0x8
TRKCloseFile = .text:0x8160CFB0; // type:function size:0x8
TRKPositionFile = .text:0x8160CFB8; // type:function size:0x8
TRKAccessFile = .text:0x8160CFA0; // type:function
TRKOpenFile = .text:0x8160CFA8; // type:function
TRKCloseFile = .text:0x8160CFB0; // type:function
TRKPositionFile = .text:0x8160CFB8; // type:function
__TRK_write_console = .text:0x8160CFC0; // type:function size:0xBC
__read_console = .text:0x8160D07C; // type:function size:0xBC
EnableMetroTRKInterrupts = .text:0x8160D138; // type:function size:0x20
@@ -16150,11 +16149,6 @@ lbl_8164EF14 = .data:0x8164EF14; // type:object size:0x34
__vt__Q33ipl5scene27CsChanTtlButtonEventHandler = .data:0x8164EF48; // type:object size:0x1C
__vt__Q33ipl5scene24ChannelTitleEventHandler = .data:0x8164EF64; // type:object size:0x18
__vt__Q33ipl5scene12ChannelTitle = .data:0x8164EF7C; // type:object size:0x68
lbl_8164EFE4 = .data:0x8164EFE4; // type:object size:0x5C
lbl_8164F040 = .data:0x8164F040; // type:object size:0x18
lbl_8164F058 = .data:0x8164F058; // type:object size:0x20
lbl_8164F078 = .data:0x8164F078; // type:object size:0x20
lbl_8164F098 = .data:0x8164F098; // type:object size:0x20
@10125 = .data:0x8164F0B8; // type:object size:0xD scope:local data:string
...data.0 = .data:0x8164F0B8; // type:label scope:local
@10126 = .data:0x8164F0C5; // type:object size:0xD scope:local data:string
@@ -16996,66 +16990,34 @@ lbl_81654F23 = .data:0x81654F23; // type:object size:0x12 data:string
lbl_81654F35 = .data:0x81654F35; // type:object size:0x19 data:string
lbl_81654F4E = .data:0x81654F4E; // type:object size:0x26 data:string
lbl_81654F74 = .data:0x81654F74; // type:object size:0x1F data:string
@18027 = .data:0x81654F98; // type:object size:0xC scope:local data:string
@18028 = .data:0x81654FA4; // type:object size:0xC scope:local data:string
@18029 = .data:0x81654FB0; // type:object size:0xD scope:local data:string
@18030 = .data:0x81654FBD; // type:object size:0xD scope:local data:string
@18031 = .data:0x81654FCA; // type:object size:0xC scope:local data:string
@18032 = .data:0x81654FD6; // type:object size:0xC scope:local data:string
@18033 = .data:0x81654FE2; // type:object size:0x9 scope:local data:string
sButtonGroups__Q23ipl5scene = .data:0x81654FEC; // type:object size:0x1C scope:local
@18034 = .data:0x81655008; // type:object size:0x2B scope:local data:string
@18035 = .data:0x81655033; // type:object size:0x29 scope:local data:string
@18036 = .data:0x8165505C; // type:object size:0x2A scope:local data:string
@18037 = .data:0x81655086; // type:object size:0x24 scope:local data:string
@18038 = .data:0x816550AA; // type:object size:0x23 scope:local data:string
@18039 = .data:0x816550CD; // type:object size:0x24 scope:local data:string
sButtonAnimationNames__Q23ipl5scene = .data:0x816550F4; // type:object size:0x18 scope:local
@18040 = .data:0x8165510C; // type:object size:0xD scope:local data:string
@18041 = .data:0x81655119; // type:object size:0x13 scope:local data:string
@18042 = .data:0x8165512C; // type:object size:0x12 scope:local data:string
sBannerAnimationNames__Q23ipl5scene = .data:0x81655140; // type:object size:0xC scope:local
sTexturePaneNames__Q23ipl5scene = .data:0x8165514C; // type:object size:0x30 scope:local
@22820 = .data:0x8165517C; // type:object size:0xE scope:local data:string
@22960 = .data:0x8165518A; // type:object size:0x1D scope:local data:string
@22961 = .data:0x816551A7; // type:object size:0xB scope:local data:string
@22962 = .data:0x816551B2; // type:object size:0xB scope:local data:string
@22963 = .data:0x816551BD; // type:object size:0xB scope:local data:string
@22964 = .data:0x816551C8; // type:object size:0x1C scope:local data:string
@22965 = .data:0x816551E4; // type:object size:0x23 scope:local data:string
@22966 = .data:0x81655207; // type:object size:0x25 scope:local data:string
@22967 = .data:0x8165522C; // type:object size:0xB scope:local data:string
@22968 = .data:0x81655237; // type:object size:0x20 scope:local data:string
@22970 = .data:0x81655257; // type:object size:0x21 scope:local data:string
@22972 = .data:0x81655278; // type:object size:0xD scope:local data:string
@22975 = .data:0x81655285; // type:object size:0xB scope:local data:string
@22976 = .data:0x81655290; // type:object size:0xC scope:local data:string
@23080 = .data:0x8165529C; // type:object size:0x7C scope:local
@23094 = .data:0x81655318; // type:object size:0xF scope:local data:string
@23172 = .data:0x81655327; // type:object size:0x1A scope:local data:string
@23173 = .data:0x81655341; // type:object size:0x1C scope:local data:string
@23174 = .data:0x8165535D; // type:object size:0xF scope:local data:string
@23175 = .data:0x8165536C; // type:object size:0xE scope:local data:string
@23176 = .data:0x8165537A; // type:object size:0x19 scope:local data:string
@23177 = .data:0x81655393; // type:object size:0xA scope:local data:string
@23178 = .data:0x8165539D; // type:object size:0xB scope:local data:string
@23179 = .data:0x816553A8; // type:object size:0x14 scope:local data:string
@23181 = .data:0x816553BC; // type:object size:0xE scope:local data:string
@23314 = .data:0x816553CA; // type:object size:0xD scope:local data:string
@23343 = .data:0x816553D7; // type:object size:0xB scope:local data:string
@23344 = .data:0x816553E2; // type:object size:0xB scope:local data:string
@23345 = .data:0x816553ED; // type:object size:0x11 scope:local data:string
@23366 = .data:0x816553FE; // type:object size:0xB scope:local data:string
@23587 = .data:0x81655409; // type:object size:0x10 scope:local data:string
@23645 = .data:0x81655419; // type:object size:0x14 scope:local data:string
@23769 = .data:0x8165542D; // type:object size:0x14 scope:local data:string
@23878 = .data:0x81655441; // type:object size:0x12 scope:local data:string
@23964 = .data:0x81655453; // type:object size:0xF scope:local data:string
@24191 = .data:0x81655462; // type:object size:0x16 scope:local data:string
@24247 = .data:0x81655478; // type:object size:0x10 scope:local data:string
@24248 = .data:0x81655488; // type:object size:0x14 scope:local data:string
@24249 = .data:0x8165549C; // type:object size:0xF scope:local data:string
@24250 = .data:0x816554AB; // type:object size:0x16 scope:local data:string
lbl_81654F98 = .data:0x81654F98; // type:object size:0xC data:string
lbl_81654FA4 = .data:0x81654FA4; // type:object size:0xC data:string
lbl_81654FB0 = .data:0x81654FB0; // type:object size:0xD data:string
lbl_81654FBD = .data:0x81654FBD; // type:object size:0xD data:string
lbl_81654FCA = .data:0x81654FCA; // type:object size:0xC data:string
lbl_81654FD6 = .data:0x81654FD6; // type:object size:0xC data:string
lbl_81654FE2 = .data:0x81654FE2; // type:object size:0x26
lbl_81655008 = .data:0x81655008; // type:object size:0x2B data:string
lbl_81655033 = .data:0x81655033; // type:object size:0x29 data:string
lbl_8165505C = .data:0x8165505C; // type:object size:0x2A data:string
lbl_81655086 = .data:0x81655086; // type:object size:0x24 data:string
lbl_816550AA = .data:0x816550AA; // type:object size:0x23 data:string
lbl_816550CD = .data:0x816550CD; // type:object size:0x3F
lbl_8165510C = .data:0x8165510C; // type:object size:0xD data:string
lbl_81655119 = .data:0x81655119; // type:object size:0x13 data:string
lbl_8165512C = .data:0x8165512C; // type:object size:0x12 data:string
lbl_81655140 = .data:0x81655140; // type:object size:0x3C
lbl_8165517C = .data:0x8165517C; // type:object size:0x120
jumptable_8165529C = .data:0x8165529C; // type:object size:0x7C scope:local
lbl_81655318 = .data:0x81655318; // type:object size:0xB2
lbl_816553CA = .data:0x816553CA; // type:object size:0x34
lbl_816553FE = .data:0x816553FE; // type:object size:0xB data:string
lbl_81655409 = .data:0x81655409; // type:object size:0x10 data:string
lbl_81655419 = .data:0x81655419; // type:object size:0x14 data:string
lbl_8165542D = .data:0x8165542D; // type:object size:0x14 data:string
lbl_81655441 = .data:0x81655441; // type:object size:0x12 data:string
lbl_81655453 = .data:0x81655453; // type:object size:0xF data:string
lbl_81655462 = .data:0x81655462; // type:object size:0x62
__vt__Q33ipl5scene25SDTitleButtonEventHandler = .data:0x816554C4; // type:object size:0x1C
__vt__Q33ipl5scene23SDTitlePaneEventHandler = .data:0x816554E0; // type:object size:0x18
__vt__Q33ipl5scene14SDChannelTitle = .data:0x816554F8; // type:object size:0x68
@@ -17635,7 +17597,7 @@ __vt__Q49textinput8keyboard13cellphonetype12EventHandler = .data:0x8165C758; //
__vt__Q49textinput8keyboard13cellphonetype4Base = .data:0x8165C778; // type:object size:0xA8
scP_txtScrll_UP = .data:0x8165C820; // type:object size:0xE data:string
scP_txtScrll_DOWN = .data:0x8165C830; // type:object size:0x10 data:string
csButtonAnimations__Q29textinput9inputform = .data:0x8165C840; // type:object size:0x80
lbl_8165C840 = .data:0x8165C840; // type:object size:0x80
scN_JPNUSAEUR = .data:0x8165C8C0; // type:object size:0xC data:string
scN_separateBarAll = .data:0x8165C8CC; // type:object size:0x11 data:string
scT_2l_TextBox = .data:0x8165C8E0; // type:object size:0xD data:string
@@ -17646,30 +17608,28 @@ scT_title_textKOR = .data:0x8165C928; // type:object size:0x10 data:string
scN_separateBarCHN = .data:0x8165C938; // type:object size:0x11 data:string
scT_2l_TextBoxCHN = .data:0x8165C950; // type:object size:0x10 data:string
scT_title_textCHN = .data:0x8165C960; // type:object size:0x10 data:string
@6599 = .data:0x8165C970; // type:object size:0x20 data:2byte
@13162 = .data:0x8165C990; // type:object size:0xA0 scope:local
@13178 = .data:0x8165CA30; // type:object size:0x28 scope:local
@13457 = .data:0x8165CA58; // type:object size:0x34 scope:local
@13456 = .data:0x8165CA8C; // type:object size:0xC0 scope:local
@13510 = .data:0x8165CB4C; // type:object size:0x94 scope:local
@13512 = .data:0x8165CBE0; // type:object size:0xD data:string
@13580 = .data:0x8165CBF0; // type:object size:0x22 scope:local data:string
@13639 = .data:0x8165CC14; // type:object size:0xE data:string
@13640 = .data:0x8165CC28; // type:object size:0x10 data:string
@13654 = .data:0x8165CC38; // type:object size:0x11 scope:local data:string
@13724 = .data:0x8165CC4C; // type:object size:0xD data:string
@14933 = .data:0x8165CC5C; // type:object size:0x1C scope:local
lbl_8165C970 = .data:0x8165C970; // type:object size:0x20 data:2byte
jumptable_8165C990 = .data:0x8165C990; // type:object size:0xA0 scope:local
jumptable_8165CA30 = .data:0x8165CA30; // type:object size:0x28 scope:local
jumptable_8165CA58 = .data:0x8165CA58; // type:object size:0x34 scope:local
jumptable_8165CA8C = .data:0x8165CA8C; // type:object size:0xC0 scope:local
jumptable_8165CB4C = .data:0x8165CB4C; // type:object size:0x94 scope:local
lbl_8165CBE0 = .data:0x8165CBE0; // type:object size:0x34
lbl_8165CC14 = .data:0x8165CC14; // type:object size:0xE data:string
lbl_8165CC28 = .data:0x8165CC28; // type:object size:0x24
lbl_8165CC4C = .data:0x8165CC4C; // type:object size:0xD data:string
jumptable_8165CC5C = .data:0x8165CC5C; // type:object size:0x1C scope:local
__vt__Q39textinput9inputform19NormalButtonAnmPane = .data:0x8165CC78; // type:object size:0x2C
__vt__Q39textinput9inputform7AnmPane = .data:0x8165CCA4; // type:object size:0x2C
__vt__Q39textinput9inputform12EventHandler = .data:0x8165CCD0; // type:object size:0x20
__vt__Q39textinput9inputform12LayoutByNW4R = .data:0x8165CCF0; // type:object size:0x240
__vt__Q39textinput9inputform4Base = .data:0x8165CF30; // type:object size:0x1A8
__vt__Q39textinput9inputform10EditBuffer = .data:0x8165D0D8; // type:object size:0xC
__vt__Q39textinput9inputform10EditBuffer = .data:0x8165D0D8; // type:object size:0x10
__vt__Q39textinput8tistring8WithAtok = .data:0x8165D0E8; // type:object size:0x140
__vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x14
__vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x30
__vt__Q39textinput4util9Animation = .data:0x8165D258; // type:object size:0x24
@STRING@onOutOfLength__Q29textinput13EventObserverFv = .data:0x8165D27C; // type:object size:0xD scope:local data:string
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x41 data:string
lbl_8165D258 = .data:0x8165D27C; // type:object size:0xD data:string
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x44
scT_prdc_Text_00 = .data:0x8165D2D0; // type:object size:0xF data:string
scP_prdc_scrl_Left = .data:0x8165D2E0; // type:object size:0x11 data:string
scCandidatePaneData = .data:0x8165D2F8; // type:object size:0x68C
@@ -17678,47 +17638,47 @@ scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
@10530 = .data:0x8165DA48; // type:object size:0x1C scope:local
@6761 = .data:0x8165DA64; // type:object size:0xF scope:local data:string
@6762 = .data:0x8165DA74; // type:object size:0xF scope:local data:string
@6763 = .data:0x8165DA84; // type:object size:0xF scope:local data:string
@6764 = .data:0x8165DA94; // type:object size:0xF scope:local data:string
@6765 = .data:0x8165DAA4; // type:object size:0xF scope:local data:string
@6766 = .data:0x8165DAB4; // type:object size:0xF scope:local data:string
@6767 = .data:0x8165DAC4; // type:object size:0xF scope:local data:string
@6768 = .data:0x8165DAD4; // type:object size:0xF scope:local data:string
@6769 = .data:0x8165DAE4; // type:object size:0xF scope:local data:string
@6770 = .data:0x8165DAF4; // type:object size:0xF scope:local data:string
@6771 = .data:0x8165DB04; // type:object size:0xF scope:local data:string
@6772 = .data:0x8165DB14; // type:object size:0xF scope:local data:string
@6773 = .data:0x8165DB24; // type:object size:0xF scope:local data:string
@6774 = .data:0x8165DB34; // type:object size:0xF scope:local data:string
@6775 = .data:0x8165DB44; // type:object size:0xF scope:local data:string
@6776 = .data:0x8165DB54; // type:object size:0xF scope:local data:string
@6777 = .data:0x8165DB64; // type:object size:0xF scope:local data:string
@6778 = .data:0x8165DB74; // type:object size:0xF scope:local data:string
@6779 = .data:0x8165DB84; // type:object size:0xF scope:local data:string
@6782 = .data:0x8165DB94; // type:object size:0xF scope:local data:string
@6783 = .data:0x8165DBA4; // type:object size:0xF scope:local data:string
@6784 = .data:0x8165DBB4; // type:object size:0xF scope:local data:string
@6785 = .data:0x8165DBC4; // type:object size:0xF scope:local data:string
@6786 = .data:0x8165DBD4; // type:object size:0xF scope:local data:string
@6787 = .data:0x8165DBE4; // type:object size:0xF scope:local data:string
@6788 = .data:0x8165DBF4; // type:object size:0xF scope:local data:string
@6789 = .data:0x8165DC04; // type:object size:0xF scope:local data:string
@6790 = .data:0x8165DC14; // type:object size:0xF scope:local data:string
@6791 = .data:0x8165DC24; // type:object size:0xF scope:local data:string
@6792 = .data:0x8165DC34; // type:object size:0xF scope:local data:string
@6793 = .data:0x8165DC44; // type:object size:0xF scope:local data:string
@6794 = .data:0x8165DC54; // type:object size:0xF scope:local data:string
@6795 = .data:0x8165DC64; // type:object size:0xF scope:local data:string
@6796 = .data:0x8165DC74; // type:object size:0xF scope:local data:string
@6797 = .data:0x8165DC84; // type:object size:0xF scope:local data:string
@6798 = .data:0x8165DC94; // type:object size:0xF scope:local data:string
@6799 = .data:0x8165DCA4; // type:object size:0xF scope:local data:string
@6800 = .data:0x8165DCB4; // type:object size:0xF scope:local data:string
@6801 = .data:0x8165DCC4; // type:object size:0xF scope:local data:string
@10601 = .data:0x8165DCD4; // type:object size:0xF scope:local data:string
jumptable_8165DA48 = .data:0x8165DA48; // type:object size:0x1C scope:local
lbl_8165DA64 = .data:0x8165DA64; // type:object size:0xF data:string
lbl_8165DA74 = .data:0x8165DA74; // type:object size:0xF data:string
lbl_8165DA84 = .data:0x8165DA84; // type:object size:0xF data:string
lbl_8165DA94 = .data:0x8165DA94; // type:object size:0xF data:string
lbl_8165DAA4 = .data:0x8165DAA4; // type:object size:0xF data:string
lbl_8165DAB4 = .data:0x8165DAB4; // type:object size:0xF data:string
lbl_8165DAC4 = .data:0x8165DAC4; // type:object size:0xF data:string
lbl_8165DAD4 = .data:0x8165DAD4; // type:object size:0xF data:string
lbl_8165DAE4 = .data:0x8165DAE4; // type:object size:0xF data:string
lbl_8165DAF4 = .data:0x8165DAF4; // type:object size:0xF data:string
lbl_8165DB04 = .data:0x8165DB04; // type:object size:0xF data:string
lbl_8165DB14 = .data:0x8165DB14; // type:object size:0xF data:string
lbl_8165DB24 = .data:0x8165DB24; // type:object size:0xF data:string
lbl_8165DB34 = .data:0x8165DB34; // type:object size:0xF data:string
lbl_8165DB44 = .data:0x8165DB44; // type:object size:0xF data:string
lbl_8165DB54 = .data:0x8165DB54; // type:object size:0xF data:string
lbl_8165DB64 = .data:0x8165DB64; // type:object size:0xF data:string
lbl_8165DB74 = .data:0x8165DB74; // type:object size:0xF data:string
lbl_8165DB84 = .data:0x8165DB84; // type:object size:0xF data:string
lbl_8165DB94 = .data:0x8165DB94; // type:object size:0xF data:string
lbl_8165DBA4 = .data:0x8165DBA4; // type:object size:0xF data:string
lbl_8165DBB4 = .data:0x8165DBB4; // type:object size:0xF data:string
lbl_8165DBC4 = .data:0x8165DBC4; // type:object size:0xF data:string
lbl_8165DBD4 = .data:0x8165DBD4; // type:object size:0xF data:string
lbl_8165DBE4 = .data:0x8165DBE4; // type:object size:0xF data:string
lbl_8165DBF4 = .data:0x8165DBF4; // type:object size:0xF data:string
lbl_8165DC04 = .data:0x8165DC04; // type:object size:0xF data:string
lbl_8165DC14 = .data:0x8165DC14; // type:object size:0xF data:string
lbl_8165DC24 = .data:0x8165DC24; // type:object size:0xF data:string
lbl_8165DC34 = .data:0x8165DC34; // type:object size:0xF data:string
lbl_8165DC44 = .data:0x8165DC44; // type:object size:0xF data:string
lbl_8165DC54 = .data:0x8165DC54; // type:object size:0xF data:string
lbl_8165DC64 = .data:0x8165DC64; // type:object size:0xF data:string
lbl_8165DC74 = .data:0x8165DC74; // type:object size:0xF data:string
lbl_8165DC84 = .data:0x8165DC84; // type:object size:0xF data:string
lbl_8165DC94 = .data:0x8165DC94; // type:object size:0xF data:string
lbl_8165DCA4 = .data:0x8165DCA4; // type:object size:0xF data:string
lbl_8165DCB4 = .data:0x8165DCB4; // type:object size:0xF data:string
lbl_8165DCC4 = .data:0x8165DCC4; // type:object size:0xF data:string
lbl_8165DCD4 = .data:0x8165DCD4; // type:object size:0xF data:string
__vt__Q39textinput12candidatebox13PredictWindow = .data:0x8165DCE4; // type:object size:0x2C
__vt__Q39textinput12candidatebox12OnOffAnmPane = .data:0x8165DD10; // type:object size:0x2C
__vt__Q39textinput12candidatebox22CandidateScrollAnmPane = .data:0x8165DD3C; // type:object size:0x2C
@@ -17820,18 +17780,18 @@ __vt__Q39textinput11nw4rmanager6Layout = .data:0x8165F818; // type:object size:0
__vt__Q39textinput11nw4rmanager8PaneFifo = .data:0x8165F890; // type:object size:0x1C scope:weak
__vt__Q39textinput11nw4rmanager13AnimPaneGroup = .data:0x8165F8AC; // type:object size:0x1C
__vt__Q39textinput11nw4rmanager7AnmPane = .data:0x8165F8C8; // type:object size:0x24
@8031 = .data:0x8165F8F0; // type:object size:0xD data:string
@8076 = .data:0x8165F900; // type:object size:0x1B data:string
@8086 = .data:0x8165F920; // type:object size:0x18 data:string
@8090 = .data:0x8165F938; // type:object size:0x16 data:string
@8115 = .data:0x8165F950; // type:object size:0x1B data:string
@8148 = .data:0x8165F96C; // type:object size:0x16 data:string
@8156 = .data:0x8165F988; // type:object size:0x18 data:string
@8168 = .data:0x8165F9A0; // type:object size:0x16 data:string
lbl_8165F8F0 = .data:0x8165F8F0; // type:object size:0xD data:string
lbl_8165F900 = .data:0x8165F900; // type:object size:0x1B data:string
lbl_8165F920 = .data:0x8165F920; // type:object size:0x18 data:string
lbl_8165F938 = .data:0x8165F938; // type:object size:0x16 data:string
lbl_8165F950 = .data:0x8165F950; // type:object size:0x1B data:string
lbl_8165F96C = .data:0x8165F96C; // type:object size:0x16 data:string
lbl_8165F988 = .data:0x8165F988; // type:object size:0x18 data:string
lbl_8165F9A0 = .data:0x8165F9A0; // type:object size:0x16 data:string
__vt__Q29textinput7Manager = .data:0x8165F9B8; // type:object size:0xD0
__vt__Q49textinput8keyboard10signwindow6Sample = .data:0x8165FA88; // type:object size:0x10C
__vt__Q49textinput8keyboard10signwindow6Sample = .data:0x8165FA88; // type:object size:0x110
__vt__Q39textinput11predictlang6Sample = .data:0x8165FB98; // type:object size:0xE0
__vt__Q39textinput11predictlang4Base = .data:0x8165FC78; // type:object size:0x24
__vt__Q39textinput11predictlang4Base = .data:0x8165FC78; // type:object size:0x28
__vt__Q39textinput7toolbar6Sample = .data:0x8165FCA0; // type:object size:0xD0
__vt__Q39textinput9inputform6Sample = .data:0x8165FD70; // type:object size:0x240
__vt__Q39textinput12candidatebox6Sample = .data:0x8165FFB0; // type:object size:0x130
@@ -18044,13 +18004,13 @@ csCNKeyboard__Q39textinput8keyboard6pctype = .data:0x81667850; // type:object si
@196 = .data:0x81667C78; // type:object size:0x10 scope:local data:wstring
cLanguageIndependentString__Q29textinput15langindependent = .data:0x81667C88; // type:object size:0x190
__vt__Q29textinput15CommandReceiver = .data:0x81667E18; // type:object size:0x20
@8346 = .data:0x81667E38; // type:object size:0x19 data:string
@8347 = .data:0x81667E58; // type:object size:0x10 data:string
@8369 = .data:0x81667E68; // type:object size:0x11 data:string
@8385 = .data:0x81667E7C; // type:object size:0x16 data:string
@8386 = .data:0x81667E94; // type:object size:0x19 data:string
@8402 = .data:0x81667EB0; // type:object size:0x16 data:string
@8410 = .data:0x81667EC8; // type:object size:0x11 data:string
lbl_81667E38 = .data:0x81667E38; // type:object size:0x19 data:string
lbl_81667E58 = .data:0x81667E58; // type:object size:0x10 data:string
lbl_81667E68 = .data:0x81667E68; // type:object size:0x11 data:string
lbl_81667E7C = .data:0x81667E7C; // type:object size:0x16 data:string
lbl_81667E94 = .data:0x81667E94; // type:object size:0x19 data:string
lbl_81667EB0 = .data:0x81667EB0; // type:object size:0x16 data:string
lbl_81667EC8 = .data:0x81667EC8; // type:object size:0x11 data:string
__vt__Q49textinput6extend2bg4Base = .data:0x81667EE0; // type:object size:0x10
__vt__Q49textinput6extend4memo18DisappearMemoState = .data:0x81667EF0; // type:object size:0x58
__vt__Q49textinput6extend4memo13EditMemoState = .data:0x81667F48; // type:object size:0x58
@@ -20765,12 +20725,15 @@ lbl_81694B4C = .sdata2:0x81694B4C; // type:object size:0x4 align:4 data:float
lbl_81694B50 = .sdata2:0x81694B50; // type:object size:0x4 align:4 data:float
lbl_81694B58 = .sdata2:0x81694B58; // type:object size:0x8 align:8 data:double
sMissingTitle__Q23ipl5scene = .sdata2:0x81694B60; // type:object size:0x8 data:wstring
@22804 = .sdata2:0x81694B68; // type:object size:0x4 scope:local align:4 data:float
@22973 = .sdata2:0x81694B6C; // type:object size:0x4 scope:local align:4 data:float
@22974 = .sdata2:0x81694B70; // type:object size:0x4 scope:local align:4 data:float
@18592 = .sdata2:0x81694B74; // type:object size:0x4 scope:local data:byte
@23648 = .sdata2:0x81694B78; // type:object size:0x8 scope:local align:8 data:double
@24146 = .sdata2:0x81694B80; // type:object size:0x4 scope:local align:4 data:float
lbl_81694B68 = .sdata2:0x81694B68; // type:object size:0x4 align:4 data:float
lbl_81694B6C = .sdata2:0x81694B6C; // type:object size:0x4 align:4 data:float
lbl_81694B70 = .sdata2:0x81694B70; // type:object size:0x4 align:4 data:float
lbl_81694B74 = .sdata2:0x81694B74; // type:object size:0x1 data:byte
lbl_81694B75 = .sdata2:0x81694B75; // type:object size:0x1 data:byte
lbl_81694B76 = .sdata2:0x81694B76; // type:object size:0x1 data:byte
lbl_81694B77 = .sdata2:0x81694B77; // type:object size:0x1 data:byte
lbl_81694B78 = .sdata2:0x81694B78; // type:object size:0x8 align:8 data:double
lbl_81694B80 = .sdata2:0x81694B80; // type:object size:0x4 align:4 data:float
scBalloonMsg__Q23ipl5scene = .sdata2:0x81694B88; // type:object size:0x8 scope:local
@11491 = .sdata2:0x81694B90; // type:object size:0x4 scope:local align:4 data:float
@11492 = .sdata2:0x81694B94; // type:object size:0x4 scope:local align:4 data:float
@@ -20849,9 +20812,9 @@ lbl_81694C98 = .sdata2:0x81694C98; // type:object size:0x4 align:4 data:float
lbl_81694C9C = .sdata2:0x81694C9C; // type:object size:0x4 align:4 data:float
lbl_81694CA0 = .sdata2:0x81694CA0; // type:object size:0x4 align:4 data:float
lbl_81694CA8 = .sdata2:0x81694CA8; // type:object size:0x8 align:8 data:double
@4196 = .sdata2:0x81694CB0; // type:object size:0x4 align:4 data:float
@4197 = .sdata2:0x81694CB4; // type:object size:0x4 align:4 data:float
@4202 = .sdata2:0x81694CB8; // type:object size:0x8 align:8 data:double
lbl_81694CB0 = .sdata2:0x81694CB0; // type:object size:0x4 align:4 data:float
lbl_81694CB4 = .sdata2:0x81694CB4; // type:object size:0x4 align:4 data:float
lbl_81694CB8 = .sdata2:0x81694CB8; // type:object size:0x8 align:8 data:double
@3511 = .sdata2:0x81694CC0; // type:object size:0x4 scope:local align:4 data:float
@3561 = .sdata2:0x81694CC4; // type:object size:0x4 scope:local align:4 data:float
@3625 = .sdata2:0x81694CC8; // type:object size:0x8 scope:local align:8 data:double
@@ -21281,7 +21244,7 @@ lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x1 data:byte
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
@@ -21499,7 +21462,7 @@ lbl_81695998 = .sdata2:0x81695998; // type:object size:0x1 data:byte
lbl_81695999 = .sdata2:0x81695999; // type:object size:0x1 data:byte
lbl_8169599C = .sdata2:0x8169599C; // type:object size:0x1 data:byte
lbl_8169599D = .sdata2:0x8169599D; // type:object size:0x1 data:byte
lbl_816959A0 = .sdata2:0x816959A0; // type:object size:0x1 data:byte
lbl_816959A0 = .sdata2:0x816959A0; // type:object size:0x8 data:byte
@3654 = .sdata2:0x816959A8; // type:object size:0x4 scope:local align:4 data:float
@3714 = .sdata2:0x816959AC; // type:object size:0x4 scope:local align:4 data:float
lbl_816959B0 = .sdata2:0x816959B0; // type:object size:0x8 align:8 data:double
@@ -22489,7 +22452,7 @@ scBtnSoundType__Q23ipl5scene = .sdata:0x81697258; // type:object size:0x8 scope:
@12749 = .sdata:0x8169727C; // type:object size:0x5 scope:local data:string
lbl_81697288 = .sdata:0x81697288; // type:object size:0x2
lbl_8169728A = .sdata:0x8169728A; // type:object size:0x4 data:string
voiceVe$3399 = .sdata:0x81697290; // type:object size:0x4
lbl_81697290 = .sdata:0x81697290; // type:object size:0x4
@4605 = .sdata:0x81697298; // type:object size:0x4 scope:local data:string
lbl_816972A0 = .sdata:0x816972A0; // type:object size:0x8
lbl_816972A8 = .sdata:0x816972A8; // type:object size:0x8 data:wstring
@@ -23778,7 +23741,7 @@ csZiStringColorRight__Q29textinput9inputform = .sbss:0x81698D10; // type:object
csUnderlateColor__Q29textinput9inputform = .sbss:0x81698D14; // type:object size:0x4 data:4byte
csUnInputedWCharColorSpace__Q29textinput9inputform = .sbss:0x81698D18; // type:object size:0x4 data:4byte
sfColorPhase__Q29textinput9inputform = .sbss:0x81698D1C; // type:object size:0x4 align:4 data:float
defaultEventObserver__9textinput = .sbss:0x81698D20; // type:object size:0x4 data:4byte
lbl_81698D20 = .sbss:0x81698D20; // type:object size:0x4 data:4byte
s_dakuten_map__Q29textinput4util = .sbss:0x81698D28; // type:object size:0x8 scope:local data:4byte
s_handaku_map__Q29textinput4util = .sbss:0x81698D30; // type:object size:0x8 scope:local data:4byte
s_small_map__Q29textinput4util = .sbss:0x81698D38; // type:object size:0x8 scope:local data:4byte
@@ -23835,7 +23798,7 @@ result$1126 = .sbss:0x81698E48; // type:object size:0x4 data:4byte
soState = .sbss:0x81698E50; // type:object size:0x1 scope:local data:byte
soError = .sbss:0x81698E54; // type:object size:0x4 scope:local data:4byte
soRegistered = .sbss:0x81698E58; // type:object size:0x4 scope:local data:4byte
soSocketRegistered = .sbss:0x81698E60; // type:object size:0x4 scope:local data:4byte
soSocketRegistered = .sbss:0x81698E60; // type:object size:0x8 scope:local data:4byte
sslRegistered = .sbss:0x81698E68; // type:object size:0x4 scope:local data:4byte
l_initialized = .sbss:0x81698E6C; // type:object size:0x4 scope:local data:4byte
VFipf_sys_set = .sbss:0x81698E70; // type:object size:0x4 scope:global data:4byte

View File

@@ -738,11 +738,11 @@ config.libs = [
]
),
IPLSection("board", [
Object(Matching, "scene/board/iplBoard.cpp"),
Object(Equivalent, "scene/board/iplBoard.cpp"),
Object(Matching, "scene/board/iplBoardObject.cpp"),
Object(Matching, "scene/board/iplBoardSD.cpp"),
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
Object(Matching, "scene/board/iplFocusObject.cpp"),
Object(Equivalent, "scene/board/iplFocusObject.cpp"),
]
),
IPLSection("button", [
@@ -772,7 +772,7 @@ config.libs = [
]
),
IPLSection("channelTitle", [
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
]
),
IPLSection("faceSelect", [
@@ -850,7 +850,7 @@ config.libs = [
),
IPLSection("sdChannelSelect", [
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelSelect.cpp"),
Object(Matching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
Object(NonMatching, "scene/sdChannelSelect/iplSDChannelObj.cpp"),
]
),
IPLSection("sdChannelTitle", [
@@ -874,10 +874,10 @@ config.libs = [
Object(Matching, "scene/setting/iplParental.cpp"),
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
Object(Matching, "scene/setting/iplUSBAP.cpp"),
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
Object(NonMatching, "scene/setting/AOSSLink.c"),
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
Object(NonMatching, "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 off"]),
]
@@ -901,7 +901,7 @@ config.libs = [
),
IPLSection("bannerSound", [
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
Object(Matching, "bannerSound/AxAdpcmPlayer.cpp"),
Object(Equivalent, "bannerSound/AxAdpcmPlayer.cpp"),
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
]
@@ -927,7 +927,7 @@ config.libs = [
Object(Matching, "keyboard/tiPkData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
Object(Matching, "keyboard/tiLanguageIndependentData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
@@ -989,7 +989,7 @@ config.libs = [
Object(NonMatching, "clib/zi8cgetc.c"),
Object(Matching, "clib/zi8cinfo.c"),
Object(Matching, "clib/zi8copy.c"),
Object(Matching, "clib/zi8dawg.c"),
Object(NonMatching, "clib/zi8dawg.c"),
Object(Matching, "clib/zi8getc.c"),
Object(NonMatching, "clib/zi8getc2.c"),
Object(Matching, "clib/zi8getSW.c"),
@@ -1005,7 +1005,7 @@ config.libs = [
Object(Matching, "clib/zi8ZHuwd.c"),
Object(NonMatching, "clib/zidawg1.c"),
Object(Matching, "clib/zikorean.c"),
Object(Matching, "clib/ziswordw.c"),
Object(NonMatching, "clib/ziswordw.c"),
Object(NonMatching, "clib/zkokeyp.c"),
Object(Matching, "clib/zierror.c"),
Object(NonMatching, "clib/zmtkey.c"),
@@ -1045,7 +1045,7 @@ config.libs = [
Object(Matching, "net/crc.c"),
Object(NonMatching, "net/md5.c"),
Object(Matching, "net/sha1.c"),
Object(Matching, "net/hmac.c"),
Object(NonMatching, "net/hmac.c"),
Object(Matching, "net/neterrorcode.c"),
Object(Matching, "net/NETVersion.c"),
Object(NonMatching, "net/aes.c"),
@@ -1060,9 +1060,9 @@ config.libs = [
Object(NonMatching, "nhttp/NHTTP_recvbuf.c"),
Object(Matching, "nhttp/NHTTP_request.c"),
Object(Matching, "nhttp/NHTTP_response.c"),
Object(Matching, "nhttp/NHTTP_socket_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
Object(Matching, "nhttp/NHTTP_thread.c"),
Object(NonMatching, "nhttp/NHTTP_thread.c"),
Object(Matching, "nhttp/d_nhttp_private.c"),
Object(Matching, "nhttp/d_nhttp.c"),
Object(Matching, "nhttp/d_nhttp_common.c"),
@@ -1075,12 +1075,12 @@ config.libs = [
Object(Matching, "nwc24/NWC24Utils.c"),
Object(Matching, "nwc24/NWC24Manage.c"),
Object(Matching, "nwc24/NWC24MsgObj.c"),
Object(Matching, "nwc24/NWC24MBoxCtrl.c"),
Object(Matching, "nwc24/NWC24Mime.c"),
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
Object(NonMatching, "nwc24/NWC24Mime.c"),
Object(Matching, "nwc24/NWC24Stream.c"),
Object(Matching, "nwc24/NWC24Parser.c"),
Object(Matching, "nwc24/NWC24MsgCommit.c"),
Object(Matching, "nwc24/NWC24MsgRead.c"),
Object(NonMatching, "nwc24/NWC24MsgCommit.c"),
Object(NonMatching, "nwc24/NWC24MsgRead.c"),
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
Object(Matching, "nwc24/NWC24Schedule.c"),
Object(NonMatching, "nwc24/NWC24DateParser.c"),
@@ -1097,8 +1097,8 @@ config.libs = [
RevoEXLib("so", [
Object(Matching, "so/SOCommon.c"),
Object(NonMatching, "so/SOBasic.c"),
Object(Matching, "so/SOInformation.c"),
Object(Matching, "so/SOOption.c"),
Object(NonMatching, "so/SOInformation.c"),
Object(NonMatching, "so/SOOption.c"),
]
),
RevoEXLib("ssl", [
@@ -1212,7 +1212,7 @@ config.libs = [
Object(NonMatching, "exif/exif_parse.c"),
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
Object(Matching, "reschange/idct_resolution_change_var.c"),
Object(NonMatching, "reschange/idct_resolution_change_var.c"),
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
@@ -1692,19 +1692,19 @@ config.libs = [
Object(Matching, "fa/pdm_disk.c"),
Object(NonMatching, "fa/pdm_partition.c"),
Object(NonMatching, "fa/pf_cache.c"),
Object(Matching, "fa/pf_cluster.c"),
Object(Matching, "fa/pf_dir.c"),
Object(NonMatching, "fa/pf_cluster.c"),
Object(NonMatching, "fa/pf_dir.c"),
Object(Matching, "fa/pf_entry.c"),
Object(Matching, "fa/pf_entry_iterator.c"),
Object(Matching, "fa/pf_fat.c"),
Object(NonMatching, "fa/pf_entry_iterator.c"),
Object(NonMatching, "fa/pf_fat.c"),
Object(Matching, "fa/pf_fat12.c"),
Object(Matching, "fa/pf_fat16.c"),
Object(Matching, "fa/pf_fat32.c"),
Object(Matching, "fa/pf_fatfs.c"),
Object(Matching, "fa/pf_file.c"),
Object(Matching, "fa/pf_path.c"),
Object(NonMatching, "fa/pf_path.c"),
Object(Matching, "fa/pf_sector.c"),
Object(Matching, "fa/pf_volume.c"),
Object(NonMatching, "fa/pf_volume.c"),
Object(Matching, "fa/pf_volume_apiadd.c"),
Object(Matching, "fa/pf_cp932.c"),
Object(Matching, "fa/pf_api_util.c"),
@@ -1860,7 +1860,7 @@ config.libs = [
Object(Matching, "fa/msc/puh_msc.c"),
Object(Matching, "fa/msc/puh_msc_cmd.c"),
Object(Matching, "fa/msc/puh_msc_blk.c"),
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
]
),
RVLSDKLib("sdi", [

View File

@@ -55,7 +55,7 @@ namespace textinput {
public:
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
#ifdef TIINPUTFORM_IMPLEMENTATION
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
#else
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);

View File

@@ -34,14 +34,14 @@ namespace gui {
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
virtual void draw() {} // 0x18 (0x06)
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
virtual ~Interface(); // 0x1C (0x07)
#else
virtual ~Interface() {} // 0x1C (0x07)
#endif
};
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
class __declspec(novtable) EventHandler {
#else
class EventHandler {

View File

@@ -24,7 +24,7 @@ namespace ipl {
mbDisableCon(bDisableCon) {}
#endif
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
virtual ~PaneManager();
#else
virtual ~PaneManager() {}

View File

@@ -143,11 +143,7 @@ namespace ipl {
#else
VEC3 operator-(const VEC3& rhs) const { return VEC3(x - rhs.x, y - rhs.y, z - rhs.z); }
#endif
#ifdef IPL_FOCUS_OBJECT_CPP
VEC3 operator*(f32 val) const;
#else
VEC3 operator*(f32 val) const { return VEC3(x * val, y * val, z * val); }
#endif
VEC3 operator*(f64 val) const {
nw4r::math::VEC3 vecOut;
VEC3Scale(&vecOut, this, (f32)val);

View File

@@ -53,7 +53,24 @@ namespace ipl {
mBScroller.init();
}
BOOL calc(bool canScroll);
BOOL calc(bool canScroll) __attribute__((never_inline)) /*for now*/ {
BOOL result = FALSE;
if (canScroll) {
if (mBScroller.calc()) {
result = TRUE;
}
}
mScroller.calc();
f32 movable = mScroller.movable_pos(mBScroller.getSpeed());
mScroller.addScroll(movable);
mBScroller.addSoundFreq(movable);
return result;
}
BOOL is_busy() const {
BOOL result = TRUE;

View File

@@ -65,11 +65,7 @@ namespace ipl {
virtual BOOL isReady() const { return FALSE; }
/** @brief If the user can power off/reset the system */
#ifdef IPL_SD_CHANNEL_TITLE_CPP
virtual BOOL isResetAcceptable() { return TRUE; }
#else
virtual BOOL isResetAcceptable() const { return TRUE; }
#endif
/** @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 */

View File

@@ -102,7 +102,12 @@ namespace ipl {
static const char* getButtonName(int button) { return smButtonName[button]; }
#endif
void setEventHandler(::gui::EventHandler * event);
#ifdef IPL_SD_CHANNEL_SELECT_CPP
void setEventHandler(::gui::EventHandler * event,
::gui::EventHandler * optOutEvent = NULL);
#else
void setEventHandler(::gui::EventHandler * event, ::gui::EventHandler * optOutEvent);
#endif
void setText(const char* paneName, u32 msgId);
void setText(const char* paneName, const wchar_t* text);
@@ -145,7 +150,7 @@ namespace ipl {
ANIM_MAX,
};
int mAnimWait;
int unk_0x54;
layout::Object* mpLayout; // 0x58
nand::LayoutFile* mpLayoutFile; // 0x5C

View File

@@ -203,9 +203,9 @@ namespace ipl {
bool enqueueLoadNotice();
bool enqueuePageNotice();
bool enqueueResultNotice(u32 result);
bool enqueueChannelNotice(u64 titleId, u32 value);
bool enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value);
bool enqueueMoveNotice(u32 controller, u32 page, u32 index);
bool enqueueStateNotice(u64 titleId, u32 state);
bool enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state);
bool enqueueErrorNotice(u32 page, u32 index);
bool enqueueCommandNotice(u32 page, u32 index, u32 command);
bool enqueueDeleteNotice(u32 controller, u32 page, u32 index);

View File

@@ -62,17 +62,17 @@ namespace ipl {
void start_left_event(const char* paneName);
void start_trig_event(const char* paneName);
typedef struct CmdEntry {
typedef struct Unk {
int command; // 0x00
u32 msgID; // 0x04
} CmdEntry;
} Unk;
CmdEntry mCmdQueue[64];
Unk unk_0x64[64];
int mCmdCapacity;
int mCmdCount;
int mCmdReadIdx;
int mCmdWriteIdx;
int unk_0x264;
int unk_0x268;
int unk_0x26C;
int unk_0x270;
int mSettingArg; // 0x274

View File

@@ -145,13 +145,6 @@ namespace ipl {
mpCommonFile = commonFile;
mpLangFile = langFile;
}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~LangFile() {}
virtual void read() {}
virtual bool isFinished() { return false; }
virtual int checkData() { return 0; }
virtual bool isFatalError() { return false; }
#else
virtual ~LangFile(); // 0x08
virtual void read(); // 0x0C
@@ -159,7 +152,6 @@ namespace ipl {
virtual bool isFinished(); // 0x14
virtual int checkData(); // 0x18
virtual bool isFatalError(); // 0x1C
#endif
File* getCmnFile() const { return mpCommonFile; }
File* getLangFile() const { return mpLangFile; }
@@ -173,11 +165,7 @@ namespace ipl {
public:
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
virtual ~LayoutFile() {} // 0x08
#else
virtual ~LayoutFile(); // 0x08
#endif
};
} // namespace nand
} // namespace ipl

View File

@@ -38,19 +38,6 @@ namespace EGG {
virtual void calc(); // 0x30
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x34
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x38
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x3C
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x44
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x48
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, u32 id); // 0x50
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, unsigned int id); // 0x50
virtual bool holdSound(nw4r::snd::SoundHandle* pHandle, const char* pName); // 0x58
#else
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x34
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.StartSound(pHandle, id); } // 0x38
virtual bool startSound(nw4r::snd::SoundHandle* pHandle, const char* pName) NO_INLINE {
@@ -79,7 +66,6 @@ namespace EGG {
u32 id = changeNameToId(pName);
return mSoundArchivePlayer.HoldSound(pHandle, id);
} // 0x58
#endif
u32 changeNameToId(const char* pName) { return mpArchive->ConvertLabelStringToSoundId(pName); }
const char* changeIdToName(u32 id) { return mpArchive->GetSoundLabelString(id); }

View File

@@ -19,10 +19,6 @@ namespace EGG {
~SoundHeapMgr() { destroySoundHeap(); }
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
virtual bool loadState(s32 id); // 0x08
virtual s32 getCurrentLevel(); // 0x0C
#else
virtual bool loadState(s32 id) {
#ifdef IPL_SOUND_MATCHING
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
@@ -39,7 +35,6 @@ namespace EGG {
} // 0x08
virtual s32 getCurrentLevel() { return mHeap.GetCurrentLevel(); } // 0x0C
#endif
s32 saveState() { return mHeap.SaveState(); }

View File

@@ -1,5 +1,3 @@
#define EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
#include <egg/core.h>
namespace EGG {

View File

@@ -1120,7 +1120,6 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
case 's':
if (format.argument_options == wchar_argument) {
wchar_t* wcs_ptr = va_arg(args, wchar_t*);
int wideLength;
if (wcs_ptr == NULL) {
wcs_ptr = L"";
@@ -1128,24 +1127,22 @@ static int __wpformatter(void* (*write_proc)(void*, const wchar_t*, size_t),
if (format.alternate_form) {
wchar_t first = *wcs_ptr++;
wideLength = (unsigned char)first;
num_chars = (unsigned char)first;
if (format.precision_specified && wideLength > format.precision) {
wideLength = format.precision;
if (format.precision_specified && num_chars > format.precision) {
num_chars = format.precision;
}
} else if (format.precision_specified) {
wideLength = format.precision;
num_chars = format.precision;
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, wideLength)) != 0) {
wideLength = string_end - wcs_ptr;
if ((string_end = wmemchr((wchar_t*)wcs_ptr, 0, num_chars)) != 0) {
num_chars = string_end - wcs_ptr;
}
} else {
wideLength = wcslen(wcs_ptr);
num_chars = wcslen(wcs_ptr);
}
num_chars = wideLength;
buff_ptr = wcs_ptr;
break;
} else {

View File

@@ -1,45 +1,32 @@
// Yes, versions other than 4.3U align by 8.
#if defined(VERSION_43U)
#pragma function_align 32
#else
#pragma function_align 8
#endif
#endif // VERSION_43U
#include <TRK_Hollywood_Revolution.h>
#pragma force_active on
// clang-format off
asm DSIOResult TRKAccessFile(MessageCommandID cmd, unsigned int handle, int* count, unsigned char* buffer) {
#ifdef __MWERKS__
// Encapsulating function to get the file to align properly
asm void __targsupp() {
// clang-format off
#ifdef __MWERKS__
nofralloc
twi 31, r0, 0
blr
#endif
entry TRKAccessFile
twi 31, r0, 0
blr
entry TRKOpenFile
twi 31, r0, 0
blr
entry TRKCloseFile
twi 31, r0, 0
blr
entry TRKPositionFile
twi 31, r0, 0
blr
#endif // __MWERKS__
// clang-format on
}
#pragma function_align 8
asm DSIOResult TRKOpenFile() {
#ifdef __MWERKS__
nofralloc
twi 31, r0, 0
blr
#endif
}
asm DSIOResult TRKCloseFile() {
#ifdef __MWERKS__
nofralloc
twi 31, r0, 0
blr
#endif
}
asm DSIOResult TRKPositionFile() {
#ifdef __MWERKS__
nofralloc
twi 31, r0, 0
blr
#endif
}
// clang-format on

View File

@@ -19,13 +19,8 @@ namespace nw4r {
template <typename T>
class AutoLock : private NonCopyable {
public:
#ifdef EGG_AUDIO_EXPMGR_NO_INLINE_VIRTUALS
explicit AutoLock(T& rLockObj);
~AutoLock();
#else
explicit AutoLock(T& rLockObj) : mLockObj(rLockObj) { Lock(rLockObj); }
~AutoLock() { Unlock(mLockObj); }
#endif
private:
T& mLockObj; // 0x00

View File

@@ -1,13 +1,13 @@
#include <nw4r/db/assert.h>
extern "C" const u8 scLytFatalColorR;
extern "C" const u8 scLytFatalColorG;
extern "C" const u8 scLytFatalColorB;
extern "C" const u8 scLytFatalColorA;
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#undef NW4R_ASSERT
#define NW4R_GLOBAL_ASSERT(x) \
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
@@ -17,15 +17,6 @@ extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system
} \
}
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {255, 255, 255, 0}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
} \
}
#include <nw4r/lyt/window.h>
#include <nw4r/lyt/common.h>
@@ -497,7 +488,7 @@ namespace nw4r {
}
Material* Window::GetFrameMaterial(u32 frameIdx) const {
NW4R_GLOBAL_ASSERT(frameIdx < WINDOWFRAME_MAX);
NW4R_ASSERT(frameIdx < WINDOWFRAME_MAX);
if (frameIdx >= mFrameNum) {
return NULL;
}
@@ -510,8 +501,3 @@ namespace nw4r {
}
} // namespace lyt
} // namespace nw4r
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;

View File

@@ -314,7 +314,7 @@ namespace nw4r {
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
u32 glgrInnerLen;
HeaderedGlyphGroups* pGlgr;
const ArchiveFontBinaryLayout* font;
ArchiveFontBinaryLayout* font;
u8* glgrEnd;
u32 expectedMaxSize;
@@ -337,7 +337,7 @@ namespace nw4r {
// Copy the glgr to work
{
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
pGlgr = &font->glgr;
glgrEnd = (u8*)pGlgr + (u32)ctx->mNextBlockHdr.size;
memcpy(pGlgr, &ctx->mNextBlockHdr, sizeof(BinaryBlockHeader));
@@ -368,21 +368,21 @@ namespace nw4r {
u32 sheetOffsetsScratchSize;
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
dataBlockCount = font->hdr.dataBlocks; // 0x0E
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
// countName = font->glgr.inner.nameCount;
countSheet = font->glgr.inner.sheetCount;
// count0A = font->glgr.inner.smthCount_0x0a;
// count0C = font->glgr.inner.smthCount_0x0c;
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
stepSheetFlags = detail::CalcSizeFlagSet(countSheet);
flagsSheetsOff = detail::CalcOffsetSheetFlags(font->glgr.inner.nameCount, countSheet, font->glgr.inner.smthCount_0x0a,
font->glgr.inner.smthCount_0x0c);
flagsSheets = (const u32*)font + (flagsSheetsOff >> 2);
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
pGlgr = &font->glgr;
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
// return CONSTRUCT_STATE_FATAL_ERR;

View File

@@ -10,12 +10,14 @@ static TMCHuffmanEntry readHuffmanEntry(const TMCHuffmanEntry* entries, u32 inde
return entries[index];
}
static void readHuffmanLimit(const TMCHuffmanEntry* entries, TMCHuffmanEntry* limit) {
limit->bitLength = entries->bitLength;
limit->symbol = entries->symbol;
static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
TMCHuffmanEntry limit;
limit.bitLength = entries->bitLength;
limit.symbol = entries->symbol;
return limit;
}
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
u32 bitData;
u32 code;
u32 length;
@@ -49,21 +51,17 @@ static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table,
code |= (bitData >> bitCount) & 1;
read_entry:
{
readHuffmanLimit(entry, limit);
*decoded = *limit;
if (code > (u32)decoded->bitLength) {
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
if (code > (u32)decoded.bitLength) {
continue;
}
{
u32 relativeCode = code - entry->bitLength;
u32 symbolIndex = relativeCode + entry->symbol;
return symbols[symbolIndex & 0xFF];
}
code = code - entry->bitLength + entry->symbol;
return symbols[code & 0xFF];
}
}
}
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work, TMCHuffmanEntry* limit, TMCHuffmanEntry* decoded) {
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
u32 bitData;
u32 code;
u32 length;
@@ -96,26 +94,18 @@ static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, co
code |= (bitData >> bitCount) & 1;
read_entry:
{
readHuffmanLimit(entry, limit);
*decoded = *limit;
if (code > (u32)decoded->bitLength) {
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
if (code > (u32)decoded.bitLength) {
continue;
}
{
u32 relativeCode = code - entry->bitLength;
u32 symbolIndex = relativeCode + entry->symbol;
return symbols[symbolIndex & 0xFF];
}
code = code - entry->bitLength + entry->symbol;
return symbols[code & 0xFF];
}
}
}
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
TMCHuffmanEntry dcEntry;
TMCHuffmanEntry dcDecoded;
TMCHuffmanEntry dcLimit;
TMCHuffmanEntry acDecoded;
TMCHuffmanEntry acLimit;
u8* huff_sym;
const TMCHuffmanEntry* ac_fast;
s32 idx;
@@ -157,7 +147,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
} else {
huff_sym = work->pDCHuffSym;
huff_tbl = work->pDCHuffTbl;
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &dcLimit, &dcDecoded);
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
if (r < 0) {
return r;
}
@@ -217,7 +207,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
r = acEntry.symbol;
} else {
bit_pos = work->bitCount;
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work, &acLimit, &acDecoded);
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
if (r < 0) {
return r;
}

View File

@@ -16,7 +16,7 @@ static u16 readU16(const u8* p, u16 byteOrder) {
}
static u16 readExifU16(const u8* data, u16 byteOrder) {
u16 value = data[0] | data[1] << 8;
u32 value = data[0] | data[1] << 8;
if (byteOrder == 0x4949) {
return (u16)value;
}
@@ -246,9 +246,9 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
u32 ifdOffset;
const u8* entries;
u16 remaining;
u16 index;
s32 entriesSize;
u16 count;
s32 entriesSize;
u16 index;
pInfo->thumbnailData = (u8*)data;
pInfo->dataEnd = (u8*)data + size;
pInfo->nextIfdOffset = 0;
@@ -339,7 +339,7 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
}
static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder, const u8* entry) {
s32 tag;
u16 tag;
u16 type;
tag = readU16(entry, byteOrder);

View File

@@ -15,13 +15,9 @@ static s8 clampS8(s32 v) {
void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
s32 bd;
s32 d;
s32 c;
s32 a;
s32 cd;
s32 oddrot;
s32 evsum;
s32 rot;
s32 d;
s32 b;
s32* sp;
@@ -30,41 +26,57 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
s32 tmp[64];
s32 i;
s32 evsum, rot, oddrot, cd;
sp = block + 24;
dp = tmp + 24;
for (i = 0; i < 4; i++) {
s32 a, b, c, d;
s32 odddiff, bd, evsum, cd, rot, oddrot;
a = sp[0];
b = sp[1];
c = sp[2];
d = sp[3];
odddiff = b - d;
for (i = 0; i < 2; i++) {
a = sp[0]; // 0x0
b = sp[1]; // 0x4
c = sp[2]; // 0x8
d = sp[3]; // 0xc
bd = b + d;
evsum = a + c;
cd = a - c;
rot = (odddiff * 0xB5) >> 8;
oddrot = rot + bd;
dp[0] = evsum + oddrot;
dp[1] = cd + rot;
dp[2] = cd - rot;
oddrot = (0xB5 * (sp[1] - sp[3]) >> 8) + bd;
rot = (0xB5 * (sp[1] - sp[3])) >> 8;
dp[1] = (a - c) + rot;
dp[2] = (a - c) - rot;
dp[3] = evsum - oddrot;
sp -= 8;
dp -= 8;
dp[0] = evsum + oddrot;
b = sp[-7]; // -0x1c
d = sp[-5]; // -0x14
bd = b + d;
rot = ((b - d) * 0xB5) >> 8;
oddrot = rot + bd;
a = sp[-8]; // -0x20
c = sp[-6]; // -0x18
dp[-8] = (a + c) + oddrot;
dp[-7] = (a - c) + rot;
dp[-6] = (a - c) - rot;
dp[-5] = (a + c) - oddrot;
sp -= 16;
dp -= 16;
}
{
u32 idx = 3;
sp = tmp + 3;
for (i = 0; i < 4; i++) {
u8* bp = conv_row_ptr + idx;
a = tmp[idx] + 0x40000;
b = tmp[idx + 8];
d = tmp[idx + 24];
c = tmp[idx + 16];
a = sp[0] + 0x40000;
b = sp[8];
d = sp[24];
c = sp[16];
evsum = a + c;
cd = a - c;
@@ -78,6 +90,7 @@ void TMCJPEGDEC_IdctBlock4x4(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag
bp[pitch * 2] = clampU8((cd - rot) >> 11);
bp[pitch * 4 - pitch] = clampU8((evsum - oddrot) >> 11);
sp--;
idx -= 1;
}
}
@@ -118,37 +131,38 @@ void TMCJPEGDEC_IdctBlock4x4_Col(s32* sp, u8* conv_row_ptr, u16 pitch, s32 zigza
s32 a, b, c, d;
s32 evsum, evdiff, oddsum, odddiff, rot, oddrot;
for (i = 0; i < 4; i++) {
a = src[0];
b = src[1];
c = src[2];
d = src[3];
odddiff = b - d;
oddsum = b + d;
evsum = a + c;
evdiff = a - c;
rot = (odddiff * 0xB5) >> 8;
oddrot = rot + oddsum;
dst[0] = evsum + oddrot;
dst[1] = evdiff + rot;
dst[2] = evdiff - rot;
dst[3] = evsum - oddrot;
src -= 8;
dst -= 8;
for (i = 0; i < 2; i++) {
s32 a0 = src[0], b0 = src[1], c0 = src[2], d0 = src[3];
s32 a1 = src[-8], b1 = src[-7], c1 = src[-6], d1 = src[-5];
s32 odddiff0 = b0 - d0;
s32 oddsum0 = b0 + d0;
s32 evsum0 = a0 + c0;
s32 evdiff0 = a0 - c0;
s32 rot0 = (odddiff0 * 0xB5) >> 8;
s32 odddiff1 = b1 - d1;
s32 oddsum1 = b1 + d1;
s32 evsum1 = a1 + c1;
s32 evdiff1 = a1 - c1;
s32 rot1 = (odddiff1 * 0xB5) >> 8;
dst[0] = evsum0 + (oddsum0 + rot0);
dst[1] = evdiff0 + rot0;
dst[2] = evdiff0 - rot0;
dst[3] = evsum0 - (oddsum0 + rot0);
dst[-8] = evsum1 + (oddsum1 + rot1);
dst[-7] = evdiff1 + rot1;
dst[-6] = evdiff1 - rot1;
dst[-5] = evsum1 - (oddsum1 + rot1);
src -= 16;
dst -= 16;
}
src = tmp + 3;
for (i = 3; i >= 0; i--) {
s32 evdiff;
s32 a;
s32 c;
s32 b;
s32 evsum;
s32 d;
s32 oddsum;
s32 odddiff;
s32 rot;
s32 oddrot;
u8* out = conv_row_ptr + i;
a = src[0];
b = src[8];
@@ -156,7 +170,7 @@ void TMCJPEGDEC_IdctBlock4x4_Col(s32* sp, u8* conv_row_ptr, u16 pitch, s32 zigza
d = src[24];
odddiff = b - d;
oddsum = d + b;
oddsum = b + d;
evsum = a + c;
evdiff = a - c;
rot = odddiff * 0xB5 >> 8;

View File

@@ -166,23 +166,23 @@ s32 TMCJPEGDEC_set_converterRGBA8(TMCCJPEGDecWork* work) {
}
static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
s32 red;
s8 crValue;
u8* luminance;
u8* cb;
u8* cr;
TMCCJPEGDecState* state;
u8* texture;
s32 height;
s32 column;
s32 yEnd;
s32 xEnd;
s32 green;
s32 yEnd;
s32 column;
s32 tileWidth;
s32 blueOffset;
u16* output;
s32 tileRow;
s32 lumaSkip;
s8 crValue;
s32 red;
s32 chromaSkip;
s32 width;
s32 cbValue;
@@ -216,7 +216,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
cbValue = (s8)*cb++;
crValue = (s8)*cr++;
redOffset = (crValue * 359) >> 8;
greenOffset = -(crValue * 183 + cbValue * 88) >> 8;
greenOffset = -(cbValue * 88 + crValue * 183) >> 8;
blueOffset = (cbValue * 454) >> 8;
}
{
@@ -224,7 +224,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 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;
@@ -238,7 +238,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 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;
@@ -252,7 +252,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 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;
@@ -266,7 +266,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 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;
@@ -285,20 +285,20 @@ static void TMCJPEGDEC_converterYUV411toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
}
static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
s32 chromaSkip;
s32 tileRow;
s32 xEnd;
u8* texture;
TMCCJPEGDecState* state;
s32 column;
u8* luminance;
u8* cb;
u8* cr;
TMCCJPEGDecState* state;
s32 tileWidth;
u8* texture;
s32 width;
s32 height;
u8* cr;
s32 column;
s32 lumaSkip;
s32 xEnd;
s32 yEnd;
s32 tileWidth;
s32 lumaSkip;
s32 chromaSkip;
s32 tileRow;
u16* output;
s32 cbValue;
s8 crValue;
@@ -345,7 +345,7 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
red = blue + redOffset;
green = blue + greenOffset;
blue = blue + blueOffset;
if ((green | red | blue) >> 8) {
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;
@@ -366,11 +366,11 @@ static void TMCJPEGDEC_converterYUV411toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
s32 chromaSkip;
s32 lumaSkip;
s32 blue;
s32 cbValue;
s32 tileWidth;
TMCCJPEGDecState* state;
u16* output;
s32 xEnd;
u8* texture;
s32 width;
s32 height;
@@ -379,7 +379,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
s32 red;
u8* cr;
s32 column;
s32 xEnd;
u16* output;
s32 yEnd;
s32 redOffset;
s32 tileRow;
@@ -387,7 +387,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
s32 blueOffset;
s32 value;
s32 green;
s32 blue;
s32 lumaSkip;
s32 crValue;
luminance = work->convBuf + 4;
@@ -415,7 +415,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 8) {
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;
@@ -426,7 +426,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 8) {
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;
@@ -441,21 +441,21 @@ static void TMCJPEGDEC_converterYUV422toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
}
static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
s32 blue;
u16* output;
s32 xEnd;
s32 column;
u8* luminance;
u8* cb;
u8* cr;
TMCCJPEGDecState* state;
s32 tileWidth;
u8* luminance;
u8* texture;
s32 width;
s32 height;
u8* cb;
u8* texture;
s32 column;
s32 chromaSkip;
s32 xEnd;
s32 yEnd;
s32 lumaSkip;
s32 chromaSkip;
s32 tileRow;
u16* output;
s32 cbValue;
s32 crValue;
s32 redOffset;
@@ -463,7 +463,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
s32 blueOffset;
s32 value;
s32 red;
s32 lumaSkip;
s32 blue;
s32 green;
luminance = work->convBuf + 4;
@@ -502,7 +502,7 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
red = value + redOffset;
blue = value + blueOffset;
green = value + greenOffset;
if ((red | green | blue) >> 8) {
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;
@@ -517,19 +517,19 @@ static void TMCJPEGDEC_converterYUV422toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
}
static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
s32 tileRow;
s32 blue;
s8 crValue;
s32 chromaSkip;
u8* luminance;
TMCCJPEGDecState* state;
u8* texture;
s32 xEnd;
s32 width;
s32 height;
s32 green;
s32 blue;
s32 blueOffset;
u8* texture;
s32 lumaSkip;
s32 yEnd;
s32 xEnd;
s32 tileRow;
s32 value;
s32 column;
u8* cr;
@@ -538,7 +538,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
s32 redOffset;
u8* cb;
u16* output;
s32 blueOffset;
s32 green;
s32 red;
s32 cbValue;
@@ -578,7 +578,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
if ((red | green | blue) >> 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;
@@ -593,7 +593,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 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;
@@ -620,11 +620,11 @@ static void TMCJPEGDEC_converterYUV420toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x, s32 y) {
u8* luminance = work->convBuf + 4;
u8* cb = work->convBuf + 260;
s32 width;
u8* cr = work->convBuf + 324;
TMCCJPEGDecState* state = work->pState;
s32 tileWidth = (state->convWidth >> 2) << 1;
u8* texture = state->pTexBuffer;
u8* cr = work->convBuf + 324;
s32 width;
s32 height;
if (state->dataSizeX == (u32)x) {
width = state->stepXExt;
@@ -660,7 +660,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
s32 green = value + greenOffset;
s32 red = value + redOffset;
s32 blue = value + blueOffset;
if ((green | red | blue) >> 8) {
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;
@@ -686,7 +686,7 @@ static void TMCJPEGDEC_converterYUV420toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
u16* output;
s32 tileRow;
s32 column;
s32 redOffset;
TMCCJPEGDecState* state;
s32 lumaSkip;
@@ -695,7 +695,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
u8* cb;
u8* cr;
s32 height;
s32 column;
s32 tileRow;
s32 chromaSkip;
s32 width;
s32 xEnd;
@@ -742,7 +742,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 8) {
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;
@@ -770,7 +770,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
u16* output;
s32 lumaSkip;
s32 blue;
u8* texture;
s32 tileRow;
u8* luminance;
u8* cb;
u8* cr;
@@ -783,7 +783,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
s32 greenOffset;
s32 yEnd;
s32 cbValue;
s32 tileRow;
u8* texture;
s32 blueOffset;
s32 red;
s8 crValue;
@@ -831,7 +831,7 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
green = value + greenOffset;
red = value + redOffset;
blue = value + blueOffset;
if ((red | green | blue) >> 8) {
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;
@@ -856,20 +856,20 @@ static void TMCJPEGDEC_converterYUV211toRGBA8edge(TMCCJPEGDecWork* work, s32 x,
static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32 y) {
u16* output;
s32 tileWidth;
s32 tileRow;
s32 rowSkip;
u8* texture;
s32 xEnd;
u8* luminance;
u8* cb;
u8* cr;
TMCCJPEGDecState* state;
s32 crValue;
s8 crValue;
s32 height;
s32 width;
s32 column;
s32 xEnd;
s32 rowSkip;
s32 yEnd;
s32 tileWidth;
u8* texture;
s32 row;
s32 red;
s32 cbValue;
@@ -899,7 +899,7 @@ static void TMCJPEGDEC_converterYUV444toRGBA8(TMCCJPEGDecWork* work, s32 x, s32
green = value + (-(cbValue * 88 + crValue * 183) >> 8);
red = value + ((crValue * 359) >> 8);
blue = value + ((cbValue * 454) >> 8);
if ((red | green | blue) >> 8) {
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;

View File

@@ -171,7 +171,9 @@ s32 TMCJPEGDEC_set_converterY8U8V8(TMCCJPEGDecWork* work) {
static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
s32 rowSkip;
u8* output;
s32 chromaXEnd;
u32 tileRow;
u32 chromaTileWidth;
s32 chromaYEnd;
u8* lumaTexture;
TMCCJPEGDecState* state;
@@ -214,17 +216,17 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
}
luminance += rowSkip;
}
tileWidth = state->chromaWidth >> 3;
chromaTileWidth = state->chromaWidth >> 3;
x = (u32)x >> 2;
width = 8 / state->scaleFactor;
height = 8 / state->scaleFactor;
xEnd = x + width;
chromaXEnd = x + width;
chromaYEnd = y + height;
for (; y < chromaYEnd; y++) {
for (column = x; column < xEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
for (column = x; column < chromaXEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
cb++;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
cr++;
}
cb += 8 - width;
@@ -233,6 +235,7 @@ static void TMCJPEG_814EFEAC(TMCCJPEGDecWork* work, s32 x, s32 y) {
}
static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
u32 chromaTileWidth;
TMCCJPEGDecState* state;
u8* lumaTexture;
u8* luminance;
@@ -247,9 +250,9 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
u8* output;
u8* cb;
u8* cr;
s32 width;
s32 tileOffset;
s32 xEnd;
s32 tileOffset;
s32 width;
u32 tileWidth;
luminance = work->convBuf + 4;
@@ -284,13 +287,13 @@ static void TMCJPEG_814F043C(TMCCJPEGDecWork* work, s32 x, s32 y) {
x = (u32)x >> 2;
width = (width + 3) >> 2;
xEnd = x + width;
tileWidth = state->chromaWidth >> 3;
chromaTileWidth = state->chromaWidth >> 3;
chromaEnd = y + height;
for (; y < chromaEnd; y++) {
for (column = x; column < xEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
cb++;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
cr++;
}
cb += 8 - width;
@@ -303,7 +306,9 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
u8* lumaTexture;
u8* luminance;
s32 column;
s32 chromaXEnd;
s32 row;
u32 chromaTileWidth;
TMCCJPEGDecState* state;
s32 width;
s32 height;
@@ -314,6 +319,7 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
u8* cb;
u32 tileWidth;
u8* cr;
s32 chromaRowSkip;
row = y;
luminance = work->convBuf + 4;
@@ -338,22 +344,24 @@ static void TMCJPEG_814F0A58(TMCCJPEGDecWork* work, s32 x, s32 y) {
x = (u32)x >> 1;
width = 8 / state->scaleFactor;
height = 8 / state->scaleFactor;
xEnd = x + width;
chromaXEnd = x + width;
chromaYEnd = y + height;
tileWidth = state->chromaWidth >> 3;
for (row = y; row < chromaYEnd; row++) {
for (column = x; column < xEnd; column += 1) {
(cbTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cb + 128;
chromaTileWidth = state->chromaWidth >> 3;
chromaRowSkip = 8 - width;
for (; y < chromaYEnd; y++) {
for (column = x; column < chromaXEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
cb++;
(crTexture + ((row & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (row >> 2) * tileWidth) << 5)] = *cr + 128;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
cr++;
}
cb += 8 - width;
cb += chromaRowSkip;
cr += 8 - width;
}
}
static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
u32 chromaTileWidth;
TMCCJPEGDecState* state;
u8* lumaTexture;
u8* luminance;
@@ -368,9 +376,9 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
u8* output;
u8* cb;
u8* cr;
s32 width;
s32 tileOffset;
s32 xEnd;
s32 tileOffset;
s32 width;
u32 tileWidth;
luminance = work->convBuf + 4;
@@ -405,13 +413,13 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
x = (u32)x >> 1;
width = (width + 1) >> 1;
xEnd = x + width;
tileWidth = state->chromaWidth >> 3;
chromaTileWidth = state->chromaWidth >> 3;
chromaEnd = y + height;
for (; y < chromaEnd; y++) {
for (column = x; column < xEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
cb++;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
cr++;
}
cb += 8 - width;
@@ -420,21 +428,23 @@ static void TMCJPEG_814F11C4(TMCCJPEGDecWork* work, s32 x, s32 y) {
}
static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
s32 chromaYEnd;
u8* lumaTexture;
s32 height;
u8* luminance;
s32 chromaYEnd;
s32 column;
u8* lumaTexture;
s32 chromaXEnd;
u8* luminance;
u32 chromaTileWidth;
u8* cbTexture;
s32 row;
s32 width;
u8* crTexture;
s32 xEnd;
u32 tileWidth;
u8* cb;
TMCCJPEGDecState* state;
s32 yEnd;
s32 width;
s32 xEnd;
u8* cr;
u32 tileWidth;
s32 row;
row = y;
luminance = work->convBuf + 4;
@@ -460,14 +470,14 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
y = (u32)y >> 1;
width = 8 / state->scaleFactor;
height = 8 / state->scaleFactor;
xEnd = x + width;
chromaXEnd = x + width;
chromaYEnd = y + height;
tileWidth = state->chromaWidth >> 3;
chromaTileWidth = state->chromaWidth >> 3;
for (; y < chromaYEnd; y++) {
for (column = x; column < xEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
for (column = x; column < chromaXEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
cb++;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
cr++;
}
cb += 8 - width;
@@ -476,6 +486,7 @@ static void TMCJPEG_814F17E0(TMCCJPEGDecWork* work, s32 x, s32 y) {
}
static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
u32 chromaTileWidth;
TMCCJPEGDecState* state;
u8* lumaTexture;
u8* luminance;
@@ -486,13 +497,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
u8* crTexture;
u32 tileRow;
s32 height;
s32 width;
s32 yEnd;
u8* output;
u8* cb;
u8* cr;
s32 xEnd;
s32 tileOffset;
s32 yEnd;
s32 width;
u32 tileWidth;
luminance = work->convBuf + 4;
@@ -528,13 +539,13 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
x = (u32)x >> 1;
width = (width + 1) >> 1;
xEnd = x + width;
tileWidth = state->chromaWidth >> 3;
chromaTileWidth = state->chromaWidth >> 3;
chromaEnd = y + ((height + 1) >> 1);
for (; y < chromaEnd; y++) {
for (column = x; column < xEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
cb++;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
cr++;
}
cb += 8 - width;
@@ -543,8 +554,9 @@ static void TMCJPEG_814F1F48(TMCCJPEGDecWork* work, s32 x, s32 y) {
}
static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
u8* lumaTexture;
u32 chromaTileWidth;
TMCCJPEGDecState* state;
u8* lumaTexture;
u8* luminance;
s32 column;
s32 row;
@@ -584,13 +596,13 @@ static void TMCJPEG_814F2570(TMCCJPEGDecWork* work, s32 x, s32 y) {
luminance += 8 - width;
}
y = (u32)y >> 1;
tileWidth = state->chromaWidth >> 3;
chromaTileWidth = state->chromaWidth >> 3;
chromaEnd = y + 8 / state->scaleFactor;
for (; y < chromaEnd; y++) {
for (column = x; column < xEnd; column += 1) {
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cb + 128;
(cbTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cb + 128;
cb++;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * tileWidth) << 5)] = *cr + 128;
(crTexture + ((y & 3) << 3) + (column & 7))[(s32)(((column >> 3) + (y >> 2) * chromaTileWidth) << 5)] = *cr + 128;
cr++;
}
cb += 8 - width;

View File

@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
ziU8 unk_0x17;
ziU8 subLanguage; // 0x18
ziU8 unk_0x19;
ziU16 separator; // 0x1A
ziU16 unk_0x1A;
ziU8 unk_0x1C[3];
ziU8 unk_0x1F;
ziU16 unk_0x20[0x40];

View File

@@ -796,11 +796,11 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
if (remaining != 0) {
remaining--;
} else {
totalCandidates = totalCandidates + 1;
totalCandidates++;
if (options->countOnly == '\0') {
*output++ = spellingBuffer[spellingIndex];
*output++ = 0;
candidateCount = candidateCount + 1;
candidateCount++;
}
else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
if (candidateCount >= params->maxCandidates) goto finishSpelling;
@@ -940,7 +940,8 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
for (tableIndex = 0; tableIndex < params->count;) {
while (*output != 0) {
if (*output != 0x27) {
*output++ |= 0xf300;
*output |= 0xf300;
output++;
} else {
*output++ = 0xf360;
}
@@ -1000,10 +1001,10 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
}
if (Zi8IsDupWordW(output,(ziU8)phoneticIndex,work) == 0) {
if (remaining == 0) {
totalCandidates = totalCandidates + 1;
totalCandidates++;
if (options->countOnly == 0) {
output += phoneticIndex + 1;
++candidateCount;
candidateCount++;
} else if ((int)totalCandidates >= options->maxCount) goto finishSpelling;
if (candidateCount >= params->maxCandidates) goto finishSpelling;
} else {

View File

@@ -285,9 +285,9 @@ static ziBool ZiIsLetterHyphen(ziWChar character ZI_NEED_WORK) {
else return ZI8_FALSE;
}
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ZiAlphaWork* work) {
void Zi8ChangeWordCase(ziWChar* word, ziU8 language, ziPtr work) {
enum { LOWER_CASE, UPPER_CASE } upper = LOWER_CASE;
if (work->caseMode == 3) {
if (((ZiAlphaWork*)work)->caseMode == 3) {
Zi8ChangeCharCase(1, word++, language, work);
} else if (((ZiAlphaWork*)work)->caseMode == 1) {
upper = UPPER_CASE;

View File

@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
}
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
++spelling;
}
if (!*spelling || spelling == end) {
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
return 1;
}
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
break;
}
if (*spelling != *candidate) {
@@ -753,7 +753,8 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
if (!componentTable) {
componentCount = Zi8GetTableCount(1, 7, work);
componentOrdinals = (ziU8*)Zi8GetTableAddress(1, 7, work);
componentTable = componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
componentCursor = (ziU8*)Zi8GetTableAddress(1, 2, work);
componentTable = componentCursor;
componentCursor += 8;
--componentCount;
componentIndex = componentCount;
@@ -2868,7 +2869,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
ziU8 count;
ziWChar spacedElements[256];
struct { ziWChar separator; } savedState;
savedState.separator = ZI_WORK->separator;
savedState.separator = ZI_WORK->unk_0x1A;
if (elementCount <= 1 || !charCount) {
return elementCount;
}
@@ -2881,9 +2882,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
if (spacedIndex == elementCount) {
return elementCount;
}
ZI_WORK->separator = 0xF360;
ZI_WORK->unk_0x1A = 0xF360;
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
ZI_WORK->separator = savedState.separator;
ZI_WORK->unk_0x1A = savedState.separator;
spacedIndex = elementIndex = count = 0;
while (charCount && elementIndex < elementCount) {
if (spacedElements[spacedIndex] == 0xF360) {

View File

@@ -187,7 +187,8 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
ZI_WORK->unk_0x1764 = (ziU8*)group;
if (ZI_WORK->unk_0x1764 == 0) {
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
ZI_WORK->unk_0x1764 = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK);
ZI_WORK->unk_0x1764 = (ziU8*)tableAddress;
}
}
if (ZI_WORK->unk_0x1764 != 0) {

View File

@@ -21,7 +21,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
ZI_WORK->unk_0x0A = 0xFF;
ZI_WORK->unk_0x10 = 0x64;
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
ZI_WORK->separator = 0x20;
ZI_WORK->unk_0x1A = 0x20;
ZI_WORK->unk_0x1C[2] = 0;
ZI_WORK->unk_0x1B30 = 0;
ZI_WORK->unk_0x1B3A = 0;

View File

@@ -49,25 +49,22 @@ void Zi8CopyZHSpelling(ziU8* source, ziWChar* output, ziU16 capacity, int size,
}
}
}
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option, struct __zi8_work_data_s* __zi8_work_data) {
ziU8 ZADP_Zi8SetPDremoveOpt(ziU8 option ZI_NEED_WORK) {
ziU8 previous;
previous = __zi8_work_data->pdRemoveOpt;
__zi8_work_data->pdRemoveOpt = option;
previous = ZI_WORK->pdRemoveOpt;
ZI_WORK->pdRemoveOpt = option;
Zi8LogError(100, __zi8_work_data);
return previous;
}
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;
int wordSize;
int copied;
ziU32 entrySize;
int wordSize, copied;
ziU8* word;
int index;
ziU32 entrySize;
int fallback = 0;
ziPudHeader* table;
ziU8* byteOutput;
ziPudSection* section;
if (!(ZI_WORK->pudCount <= 16 && ZI_WORK->pudCount != 0 && ZI_WORK->pudTable[ZI_WORK->pudCount - 1] != 0)) {
Zi8LogError(0x4B0, __zi8_work_data);
return 0;
@@ -81,8 +78,8 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
index = 0;
while (index < table->languageCount) {
if (section->language == language) break;
section++;
index++;
section++;
}
if (index >= table->languageCount) {
Zi8LogError(0x4F6, __zi8_work_data);
@@ -103,20 +100,18 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
entrySize = wordSize;
if (language == 1) {
if (ZI_WORK->unk_0x17 > *word) goto next;
wordSize--;
entrySize--;
entrySize = wordSize - 1;
word++;
wordSize = ZiGetZHWordSize((ziWChar*)word, entrySize);
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && length < wordSize && word[length] == 0x20) goto matchText;
} else if (ZI_WORK->unk_0x31E != 0 && complete != 0 && wordSize > length && word[length] == 0x20) goto matchText;
if ((ziS32)length > (ziS32)wordSize || (complete != 0 && wordSize != length) || (complete == 0 && wordSize == length)) {
next:
ZI_WORK->unk_0x318++;
word += entrySize;
} else {
if (language == 1) {
bytePattern = (ziU8*)pattern;
for (index = 0; index < length; index++) {
if (word[index] != bytePattern[index]) goto next;
if (word[index] != ((ziU8*)pattern)[index]) goto next;
}
goto matched;
}
@@ -139,12 +134,11 @@ matched:
return 1;
}
if (language == 1) {
byteOutput = (ziU8*)output;
for (index = copied = 0; index < (ziS32)wordSize && copied < capacity; copied++) {
byteOutput[index] = word[index];
index++;
byteOutput[index] = word[index];
index++;
index = 0;
for (copied = 0; index < (ziS32)wordSize && copied < capacity; copied++) {
((ziU8*)output)[index] = word[index];
((ziU8*)output)[index + 1] = word[index + 1];
index += 2;
}
Zi8CopyZHSpelling(word, spelling, spellingCapacity, entrySize, wordSize);
} else {
@@ -174,16 +168,16 @@ matched:
}
}
}
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 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
ziU32 result;
if (continuation == 0) __zi8_work_data->pudCount = 1;
if (continuation == 0) ZI_WORK->pudCount = 1;
for (;;) {
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
if ((ziU8)result != 0) break;
if (++__zi8_work_data->pudCount <= 16) {
if (++ZI_WORK->pudCount <= 16) {
continuation = 0;
} else {
__zi8_work_data->pudCount = 1;
ZI_WORK->pudCount = 1;
break;
}
}

View File

@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
}
if (pdst[k - 1] != 0xF360 &&
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
pdst[k++] = ZI_WORK->separator;
pdst[k++] = ZI_WORK->unk_0x1A;
}
psrc += i;
n -= i;

View File

@@ -15,11 +15,11 @@ void Zi8Memset(ziPtr, ziU32, ziU32);
ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
ziU8 length;
ziU8 position;
ziUwdNode* previous;
ziUwdNode* current;
ziUwdNode* added;
ziUserWord* candidate;
ziU8 position;
if (ZI_WORK->uwdCount >= 32) {
Zi8LogError(0x19D, __zi8_work_data);
return 0;
@@ -41,7 +41,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
current = ZI_WORK->uwdList;
while (current != 0) {
candidate = (ziUserWord*)current->word;
if (ZI_WORK->unk_0x12E == 1 && candidate->priority < word->priority) break;
if (ZI_WORK->unk_0x12E == 1 && word->priority > candidate->priority) break;
if (candidate->length == length) {
position = 0;
while (position < length) {
@@ -56,7 +56,8 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
previous = current;
current = current->next;
}
added = &ZI_WORK->uwdNodes[ZI_WORK->uwdCount++];
length = ZI_WORK->uwdCount++;
added = &ZI_WORK->uwdNodes[length];
if (previous == 0) {
ZI_WORK->uwdList = added;
added->next = current;
@@ -86,24 +87,23 @@ void Zi8_8148047C(ziPtr __zi8_work_data) {
ZI_WORK->uwdList = 0;
}
ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
ziUserDictionary* dictionary;
ziWChar folded;
int fallback = 0;
int visited = 0;
int prefixLength;
int position, previousOffset;
ziU32 size;
ziU8 entryLanguage;
ziU32 entryLength;
ziU8* cursor;
ziU8* begin;
ziU8* boundary;
ziU8* end;
ziUserWord* candidate;
ziUserWord* previous;
ziUserWord* result;
ziUserDictionary* dictionary;
int firstSegment;
ziU32 size;
int headerSize;
int entryLanguage;
volatile int entryLength;
int previousOffset;
int visited = 0;
int fallback = 0;
ziWChar folded;
ziU8* text;
int position;
int prefixLength;
Zi8LogError(100, __zi8_work_data);
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
Zi8ReplaceLastError(0x19C, __zi8_work_data);
@@ -111,17 +111,16 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
}
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
if (continuation != 0) {
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
result = Zi8_814803F4(__zi8_work_data);
entryLength = 0;
if (text != 0) {
language = ((ziUserWord*)text)->language;
entryLength = ((ziUserWord*)text)->length;
if (result != 0) {
entryLanguage = result->language;
entryLength = result->length;
if (entryLength >= capacity) {
Zi8_8148047C(__zi8_work_data);
return 0;
}
text = ((ziUserWord*)text)->text;
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
}
return entryLength;
}
@@ -131,20 +130,17 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
else {
prefixLength = 0;
for (position = currentLength - 2; position >= 0;) {
if (currentWord[position] == 0x20) break;
position--;
prefixLength++;
}
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
position++;
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
else {
ZI_WORK->unk_0x140 = 1;
ZI_WORK->unk_0x141[prefixLength + 4] = ZI_WORK->unk_0x141[0] = prefixLength + 5;
ZI_WORK->unk_0x141[0] = prefixLength + 5;
ZI_WORK->unk_0x141[prefixLength + 4] = prefixLength + 5;
ZI_WORK->unk_0x141[1] = language;
ZI_WORK->unk_0x141[2] = prefixLength;
previousOffset = 4;
while (prefixLength > 0) {
for (; prefixLength > 0; prefixLength--, position++) {
folded = currentWord[position];
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
ZI_WORK->unk_0x184[previousOffset] = 0;
@@ -156,56 +152,48 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
ZI_WORK->unk_0x140 = 0;
break;
}
prefixLength--;
position++;
}
}
}
if (ZI_WORK->unk_0x140 == 0 && length == 0) return 0;
rescan:
cursor = begin = dictionary->entries + dictionary->current;
begin = dictionary->entries + dictionary->current;
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
end = (ziU8*)dictionary + dictionary->end + 7;
cursor = begin;
if (begin < boundary) firstSegment = 1;
else firstSegment = 0;
while ((cursor < boundary && firstSegment) || (cursor < end && !firstSegment)) {
while (firstSegment ? cursor < boundary : cursor < end) {
size = *cursor;
if ((ziS32)ZI_WORK->unk_0x13C > visited++ || (((ziUserWord*)cursor)->size & 0xC0) != 0) {
next:
if ((cursor += size) > end) {
if (firstSegment) break;
firstSegment = 1;
size = cursor - end - 1;
cursor = dictionary->entries + size;
}
} else {
candidate = (ziUserWord*)cursor;
position = visited++;
if ((ziS32)ZI_WORK->unk_0x13C <= position && (size & 0xC0) == 0) {
previous = (ziUserWord*)(cursor + size);
if ((ziU8*)previous > end) previous = (ziUserWord*)(dictionary->entries + (cursor - end - 1));
text = cursor;
headerSize = *text++;
entryLanguage = *text++;
entryLength = *text++;
text++;
if (entryLanguage == language && entryLength >= length && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
if ((ziU8*)previous > end) previous = (ziUserWord*)(cursor + ((ziU8*)dictionary - end) + 7);
entryLanguage = candidate->language;
entryLength = candidate->length;
if (entryLanguage == language && length <= entryLength && entryLength < capacity && (complete == 0 || entryLength == length) && (complete != 0 || entryLength != length)) {
for (position = 0; position < length; position++) {
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF010) {
if (pattern[position] != Zi8ConvertUC2Key(text[position], language, __zi8_work_data)) goto next;
} else {
folded = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF010) {
folded = Zi8ConvertUC2WC(candidate->text[position], language, __zi8_work_data);
if (folded != pattern[position] && (!ZI_WORK->unk_0x1F || !Zi8ChangeCharCase(0, &folded, language, __zi8_work_data) || folded != pattern[position])) goto next;
}
} else if (pattern[position] != Zi8ConvertUC2Key(candidate->text[position], language, __zi8_work_data)) goto next;
}
if (ZI_WORK->unk_0x140 != 0) {
if (ZI_WORK->unk_0x141[0] != previous->size || ZI_WORK->unk_0x141[1] != previous->language || ZI_WORK->unk_0x141[2] != previous->length) goto next;
prefixLength = 4;
position = ZI_WORK->unk_0x141[2] + 4;
for (; prefixLength < position; prefixLength++) {
if (ZI_WORK->unk_0x141[prefixLength] != ((ziU8*)previous)[prefixLength] && ZI_WORK->unk_0x184[prefixLength] != ((ziU8*)previous)[prefixLength]) goto next;
for (position = 4; position < ZI_WORK->unk_0x141[2] + 4; position++) {
if (ZI_WORK->unk_0x141[position] != ((ziU8*)previous)[position] && ZI_WORK->unk_0x184[position] != ((ziU8*)previous)[position]) goto next;
}
}
Zi8_81480224((ziUserWord*)cursor, __zi8_work_data);
Zi8_81480224(candidate, __zi8_work_data);
}
goto next;
}
next:
cursor += size;
if (end < cursor) {
if (firstSegment) break;
firstSegment = 1;
cursor = dictionary->entries + (cursor - end - 1);
}
}
if (ZI_WORK->unk_0x140 != 0 && length != 0) {
@@ -213,24 +201,23 @@ next:
visited = 0;
goto rescan;
}
if (length == 1 && complete != 0 && continuation == 0) {
if (complete == 1 && length != 0 && continuation == 0) {
complete = 0;
fallback = 1;
visited = 0;
goto rescan;
}
}
text = (ziU8*)Zi8_814803F4(__zi8_work_data);
if (text != 0) {
language = ((ziUserWord*)text)->language;
entryLength = ((ziUserWord*)text)->length;
result = Zi8_814803F4(__zi8_work_data);
entryLength = 0;
if (result != 0) {
entryLanguage = result->language;
entryLength = result->length;
if (entryLength >= capacity) {
Zi8_8148047C(__zi8_work_data);
return 0;
}
text = ((ziUserWord*)text)->text;
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(text[position], language, __zi8_work_data);
return entryLength;
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
}
return 0;
return entryLength;
}

View File

@@ -1,7 +1,7 @@
#include <zi8clib/zierror.h>
#include <zi8clib/zitypes.h>
extern const ziU16 nodeHeaderTable[16];
extern ziU16 nodeHeaderTable[16];
ziU32 ZiDAWGGetChild(ziU32 node) {
ziU32 base;
@@ -22,10 +22,11 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
node += offset;
if (((ziU32)header & 2) != 0) {
if ((*(ziU8*)node & 0x80) != 0) {
offset = ((*(ziU8*)node & 0x7f) << 16) +
((((ziU32)*((ziU8*)node + 1) & 0xffff) << 8) + *((ziU8*)node + 2)) + 0x8000;
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
offset += *((ziU8*)node + 2);
} else {
offset = (((ziU32)*(ziU8*)node & 0xffff) << 8) + (ziU32)*((ziU8*)node + 1);
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
offset += (ziU32)*((ziU8*)node + 1);
}
} else if (((ziU32)header & 8) != 0) {
if ((*(ziU8*)node & 0x80) != 0) {
@@ -41,17 +42,10 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
return node;
}
typedef struct ziDawgLongOffset {
ziU8 flags;
ziU8 middle;
ziU8 low;
} ziDawgLongOffset;
typedef char ziDawgLongOffsetSizeCheck[(sizeof(ziDawgLongOffset) == 3) ? 1 : -1];
ziU8* ZiDAWGGetSibling(ziU8* cursor) {
ziS32 depth;
ziU8* node;
ziU16 header;
ziU8* node;
ziS32 depth;
ziS32 offset;
depth = 0;
@@ -77,14 +71,14 @@ ziU8* ZiDAWGGetSibling(ziU8* cursor) {
}
if ((*cursor & 0x80) != 0) {
node += (((const ziDawgLongOffset*)cursor)->flags & 0x7f) * 0x10000 +
(((ziU32)(ziU16)cursor[1] << 8) +
((const ziDawgLongOffset*)cursor)->low) + 0x8000;
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
(ziU32)cursor[2] + 0x8000;
} else {
node = cursor[1] + (node + (ziU16)*cursor * 0x100);
}
return node;
} else {
cursor = node;
do {
header = nodeHeaderTable[cursor[0] >> 4];
if ((cursor[0] & 0xf) == 0xf) {
@@ -133,7 +127,7 @@ ziU8 ZiDAWGgetEOWattribute(ziU32 node) {
return (nodeHeaderTable[*(ziU8*)node >> 4] & 0x10) > 0;
}
ziU32 ZiDAWGgetCHARattribute(zi8DawgCtx* context, ziU32 node, ziPtr __zi8_work_data) {
ziU32 ZiDAWGgetCHARattribute(ziPtr context, ziU32 node, ziPtr __zi8_work_data) {
ziU8 key;
ziU32 attribute;
@@ -143,15 +137,15 @@ ziU32 ZiDAWGgetCHARattribute(zi8DawgCtx* context, ziU32 node, ziPtr __zi8_work_d
key = (ziU32)*(ziU8*)node & 0xf;
}
if (key > context->cap) {
if (key > ((zi8DawgCtx*)context)->cap) {
Zi8LogError(0x138b, __zi8_work_data);
return 0;
}
attribute = key << 24;
attribute |= ((ziU8*)context->p0C)[key] << 16;
attribute |= (((ziU32)((ziU8*)context->p08)[key * 2] & 0xFFFF) << 8) +
((ziU8*)context->p08 + key * 2)[1];
attribute |= ((ziU8*)((zi8DawgCtx*)context)->p0C)[key] << 16;
attribute += ((ziU32)((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2] & 0xFFFF) << 8;
attribute += ((ziU8*)((zi8DawgCtx*)context)->p08)[key * 2 + 1];
Zi8LogError(0x64, __zi8_work_data);
return attribute;
}
@@ -164,9 +158,9 @@ ziU32 ZiDAWGGetGraph(ziPtr context) {
ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
ziU32 graph;
ziU8 depth;
ziU32 end;
ziS32 result;
ziU32 end;
ziU8 depth;
graph = ZiDAWGGetGraph(context);
result = 0;
@@ -209,7 +203,7 @@ checkEntry:
break;
}
end = (((ziU16)entry[0] << 8) + entry[1]) * 10 + ((ziU32)entry + 10);
end = (ziU32)(entry + (((ziU16)entry[0] << 8) + entry[1]) * 10 + 10);
entry += 10;
depth++;
keys++;

View File

@@ -25,29 +25,29 @@ ziU8 Zi8GetFormatVersion(ziU8 ZI_NEED_WORK);
ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
typedef struct ziEncodedOrdinal {
ziU8 low;
ziU8 high;
} ziEncodedOrdinal;
typedef char ziEncodedOrdinalSizeCheck[(sizeof(ziEncodedOrdinal) == 2) ? 1 : -1];
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
ziChineseEntry* table = 0;
ziU8* baseData = 0;
ziU8 group = 0;
ziU8 remaining = 0;
ziU16 value = 0;
int offset;
ziU8 group;
ziU8 remaining;
ziU16 value;
ziWChar* cursor;
ziSearchState search;
ziGetParam request;
ziWChar ordinals[65];
int count;
int countLeft;
int unmatched;
ziChineseEntry* entry;
ziWChar* cursor;
ziChineseEntry* table;
ziU8* data;
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
ziU32 savedFormats = ZI_WORK->unk_0x1410;
ziU8 savedCount = ZI_WORK->unk_0x1418;
ziSearchState search = {0};
search.flags = 0;
search.word = 0;
search.length = 0;
search.position = 0;
search.capacity = 0;
search.options = 0;
Zi8LogError(100, __zi8_work_data);
if (word == 0 || *word == 0) {
Zi8ReplaceLastError(300, __zi8_work_data);
@@ -59,8 +59,8 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
}
((ziU8*)&search.length)[0] = count;
((ziU8*)&search.flags)[2] = 1;
search.word = word;
((ziU16*)&search.capacity)[0] = 64;
search.word = word;
request.language = language;
request.getMode = 0;
request.subLanguage = 7;
@@ -84,70 +84,65 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 6;
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 7;
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 8;
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->unk_0x1418 = 2;
else ZI_WORK->unk_0x1418 = 1;
} else if (ZI_WORK->unk_0x1C[0] == 0) ZI_WORK->unk_0x1418 = 1;
else ZI_WORK->unk_0x1418 = 2;
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
ZI_WORK->unk_0x1410 = savedFormats;
ZI_WORK->unk_0x1418 = savedCount;
if (count != 0) return 1;
}
if (language != 1) {
Zi8ReplaceLastError(0x26C, __zi8_work_data);
return 0;
}
{
if (language == 1) {
count = 0;
while (word[count] != 0) {
do {
ordinals[count] = Zi8Uni2Ord(word[count], __zi8_work_data);
if (ordinals[count] == 0xFFFF) return 0;
count++;
if (count == 64) return 0;
}
} while (word[count] != 0);
{
if (count-- == 1) return 1;
if (count == 1) return 1;
count--;
ordinals[count] |= 0x8000;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
table = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data);
entry = table + ordinals[0];
baseData = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
baseData += ((entry->offsetHigh & 15) << 16 | (entry->offsetLow[1] | (entry->offsetLow[0] << 8)));
data = baseData;
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data);
data += ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
if (ZI_WORK->cangjieEnabled != 0) {
switch (*data & 7) {
case 2:
countLeft = 2;
offset = 2;
break;
case 3:
case 4:
countLeft = 3;
offset = 3;
break;
case 5:
countLeft = 4;
offset = 4;
break;
default:
countLeft = 1;
offset = 1;
break;
}
data += countLeft;
data += offset;
}
if ((*data & 0x80) != 0) {
group = 0;
data += ((*data & 0x7F) >> 4) + 1;
} else return 0;
if ((*data & 0x80) == 0) return 0;
group = 0;
data += ((*data & 0x7F) >> 4) + 1;
while ((group & 0x80) == 0) {
group = *data++;
for (remaining = group & 15; remaining != 0; remaining--) {
countLeft = count;
unmatched = count;
cursor = ordinals;
while (countLeft > 0) {
value = ((ziU32)(ziU16)data[1] << 8) |
((const ziEncodedOrdinal*)data)->low;
while (unmatched > 0) {
value = data[0] | (data[1] << 8);
data += 2;
if (value != *++cursor) break;
countLeft--;
cursor++;
if (value != *cursor) break;
unmatched--;
if (value & 0x8000) break;
}
if (countLeft == 0) return 1;
if (unmatched == 0) return 1;
if (!(value & 0x8000)) {
data++;
while (!(*data & 0x80)) data += 2;
@@ -158,7 +153,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
Zi8LogError(0x2BD, __zi8_work_data);
return 0;
}
}
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
return 0;
}
ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {

View File

@@ -30,7 +30,8 @@ ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word
index = ZI_WORK->oemIdx;
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
if (ZI_WORK->oemMatch == 0) goto failed;
if ((ziS32)length >= (ziS32)--capacity) {
capacity--;
if ((ziS32)length >= (ziS32)capacity) {
failed:
return 0;
}

View File

@@ -72,11 +72,7 @@ struct DVDCommandBlock {
DVDCommandBlock* prev; // 0x04
u32 command; // 0x08
#ifdef BS2_MACH_VOLATILE_DVD_STATE
volatile s32 state;
#else
s32 state; // 0x0C
#endif
u32 offset; // 0x10
u32 length; // 0x14

View File

@@ -86,14 +86,9 @@ s32 uhf_msc_blk_mount(FADisk* disk) {
return ((device->flags >> 2) & 1) - 1;
}
static inline u16 ReadTransferBlocks(u32 remaining, u32 limit) {
u16 count = limit;
if (remaining <= limit) { count = remaining; }
return count;
}
s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* completed) {
struct { UHF_MSC_DEVICE* device; u16 blocks; } transfer;
UHF_MSC_DEVICE* device;
u16 transfer_blocks;
s32 error;
u32 block_size;
u8* transfer_buffer;
@@ -108,24 +103,24 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
if (blocks == 0) {
return 0;
}
transfer.device = NULL;
device = NULL;
{
u32 index;
UHF_MSC_DEVICE* candidate;
for (candidate = uhg_msc_blk_device_tbl, index = 0; index < 8; candidate++, index++) {
if (candidate->disk == disk) {
transfer.device = &uhg_msc_blk_device_tbl[index];
device = &uhg_msc_blk_device_tbl[index];
break;
}
}
}
if (transfer.device == NULL) {
if (device == NULL) {
return -1;
}
if (!(transfer.device->flags & 4)) {
if (!(device->flags & 4)) {
return -1;
}
block_size = transfer.device->block_size;
block_size = device->block_size;
if (block_size == 0) {
return -1;
}
@@ -143,18 +138,21 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
transfer_buffer = buffer;
}
do {
transfer.blocks = ReadTransferBlocks(blocks, transfer_limit);
error = usbh_msc_read10(transfer.device, sector, transfer.blocks, transfer_buffer, sense);
transfer_blocks = transfer_limit;
if (blocks <= transfer_limit) {
transfer_blocks = blocks;
}
error = usbh_msc_read10(device, sector, transfer_blocks, transfer_buffer, sense);
if (error == 0) {
if (!cacheable) {
memcpy(buffer, transfer_buffer, transfer.blocks * block_size);
buffer += transfer.blocks * block_size;
memcpy(buffer, transfer_buffer, transfer_blocks * block_size);
buffer += transfer_blocks * block_size;
} else {
transfer_buffer += transfer.blocks * block_size;
transfer_buffer += transfer_blocks * block_size;
}
blocks -= transfer.blocks;
sector += transfer.blocks;
*completed += transfer.blocks;
blocks -= transfer_blocks;
sector += transfer_blocks;
*completed += transfer_blocks;
if (blocks == 0) {
break;
}
@@ -164,8 +162,8 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
case 11:
break;
case 34:
if (transfer.device->disk != NULL) {
pdm_disk_notify_media_insert(transfer.device->disk);
if (device->disk != NULL) {
pdm_disk_notify_media_insert(device->disk);
}
break;
default:

View File

@@ -550,15 +550,7 @@ 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;
}
#pragma dont_inline on
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;
@@ -617,9 +609,11 @@ 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_overlap = num_sector;
num_overlap += sector;
last_sector = PFCACHE_RecordPageEndOverlap(p_page, num_overlap, p_num_success, &num_rest_sector);
num_overlap = p_page->size - ((p_page->sector + p_page->size) - (num_sector + sector));
last_sector = p_page->sector + num_overlap - 1;
*p_num_success += num_overlap;
num_rest_sector -= num_overlap;
p_page->stat |= 2;
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) {

View File

@@ -603,35 +603,31 @@ pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_s32 PFCLUSTER_DeleteCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_u32 cluster_index, pf_u32 num_clusters, pf_u32* p_deleted_clusters) {
struct ClusterDeletion {
pf_u32 length;
pf_u32 cluster_size;
pf_u32 position;
};
struct ClusterDeletion deletion;
pf_s32 err;
pf_u32 previous_cluster;
pf_u32 next_cluster;
pf_u32 first_deleted_cluster;
pf_u32 last_deleted_cluster;
PF_VOLUME* p_vol;
pf_u32 cluster_size;
pf_u32 byte_position;
p_vol = p_ent->p_vol;
deletion.cluster_size = p_vol->bpb.bytes_per_sector << p_vol->bpb.log2_sectors_per_cluster;
deletion.position = cluster_index * deletion.cluster_size;
cluster_size = p_vol->bpb.bytes_per_sector << p_vol->bpb.log2_sectors_per_cluster;
byte_position = cluster_index * cluster_size;
err = PFFAT_TraceClustersChain(&p_iter->ffd, *p_iter->ffd.p_start_cluster,
deletion.position, &previous_cluster, &first_deleted_cluster);
byte_position, &previous_cluster, &first_deleted_cluster);
if (err != 0) return err;
if (cluster_index == 0) first_deleted_cluster = p_ent->start_cluster;
deletion.length = num_clusters * deletion.cluster_size;
if (deletion.length > p_ent->file_size - deletion.position) deletion.length = p_ent->file_size - deletion.position;
err = PFFAT_TraceClustersChain(&p_iter->ffd, first_deleted_cluster, deletion.length, &last_deleted_cluster, &next_cluster);
num_clusters = num_clusters * cluster_size;
if (num_clusters > p_ent->file_size - byte_position) num_clusters = p_ent->file_size - byte_position;
err = PFFAT_TraceClustersChain(&p_iter->ffd, first_deleted_cluster, num_clusters, &last_deleted_cluster, &next_cluster);
if (err != 0) return err;
if (cluster_index == 0) {
if (next_cluster == PFFAT_GetValueOfEOC2(p_vol)) next_cluster = 0;
p_ent->start_cluster = next_cluster;
}
p_ent->file_size -= deletion.length;
p_ent->file_size -= num_clusters;
PFENT_getcurrentDateTimeForEnt(&p_ent->modify_date, &p_ent->modify_time);
p_ent->access_date = p_ent->modify_date;
err = PFENT_updateEntry(p_ent, 1);
@@ -640,13 +636,13 @@ pf_s32 PFCLUSTER_DeleteCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
err = PFCACHE_FlushDataCacheSpecific(p_vol, PF_NULL);
if (err != 0) return err;
}
err = PFFAT_FreeChain(&p_iter->ffd, first_deleted_cluster, -1U, deletion.length);
err = PFFAT_FreeChain(&p_iter->ffd, first_deleted_cluster, -1U, num_clusters);
if (err != 0) return err;
if (cluster_index != 0) {
err = PFFAT_WriteValueToSpecifiedCluster(p_vol, previous_cluster, next_cluster);
if (err != 0) return err;
}
*p_deleted_clusters = deletion.length / deletion.cluster_size;
if (deletion.length % deletion.cluster_size != 0) ++*p_deleted_clusters;
*p_deleted_clusters = num_clusters / cluster_size;
if (num_clusters % cluster_size != 0) ++*p_deleted_clusters;
return 0;
}

View File

@@ -140,19 +140,15 @@ extern pf_s32 PFVOL_CheckCurrentDir(PF_VOLUME* volume, pf_u32 start_cluster);
extern pf_s32 PFENT_RemoveEntry(PF_DIR_ENT* entry, PF_ENT_ITER* iter);
extern pf_s32 PFFAT_FreeChain(PFDIR_FFD* ffd, pf_u32 start_cluster, pf_u32 chain_index, pf_u32 size);
static inline PF_CUR_DIR* current_directories(PFDIR_VOLUME_DIRS* state) {
return state->current_dirs;
}
static inline pf_u32 current_directory_is_open(PF_VOLUME* volume, const PF_DIR_ENT* entry) {
static inline pf_u32 current_directory_is_open(PF_VOLUME* volume, pf_u32 cluster) {
pf_u32 index;
for (index = 0; index < 4; index++) {
if (volume == pf_vol_set.volume_state.volumes[index].p_vol) {
PFDIR_VOLUME_DIRS* state = (PFDIR_VOLUME_DIRS*)pf_vol_set.volume_state.volumes[index].p_vol;
PF_CUR_DIR* directory = current_directories(state);
if (pf_vol_set.volume_state.volumes[index].p_vol == volume) {
PFDIR_VOLUME_DIRS* state = (PFDIR_VOLUME_DIRS*)volume;
PF_CUR_DIR* directory = state->current_dirs;
pf_u32 slot;
for (slot = 0; slot < 4; slot++, directory++) {
if ((directory->stat & 1) != 0 && directory->directory.start_cluster == entry->start_cluster) { return 1; }
if ((directory->stat & 1) != 0 && directory->directory.start_cluster == cluster) { return 1; }
}
}
}
@@ -385,7 +381,7 @@ pf_s32 PFDIR_p_readdir(PFDIR_DIR* dir, PFDIR_READ_RESULT* result) {
return 0;
}
extern pf_s32 PFENT_findEntry(PFDIR_FFD*, PF_DIR_ENT*, pf_u32, PFDIR_STR*, pf_u32, pf_u32);
extern pf_s32 PFENT_findEntry(PFDIR_FFD*, PF_DIR_ENT*, pf_u32, PFDIR_STR*, pf_u8, pf_u32*, pf_u32*);
extern pf_s32 PFFAT_GetSectorSpecified(PFDIR_FFD*, pf_u32, pf_u32, pf_u32*);
extern pf_s32 PFPATH_transformInUnicode(pf_u16*, const pf_s8*);
extern void PFPATH_SetSearchPattern(pf_s8*, pf_u16*, PFDIR_STR*);
@@ -412,9 +408,17 @@ extern void PFPATH_AdjustExtShortName(pf_s8* name, pf_u32 position);
extern pf_s32 PFCACHE_AllocateDataPage(PF_VOLUME* volume, pf_u32 sector, PF_CACHE_PAGE** page, pf_u32* size);
extern void PFCACHE_FreeDataPage(PF_VOLUME* volume, PF_CACHE_PAGE* page);
static inline void set_dot_entry(pf_u8* buffer) {
pf_u32 index;
buffer[0] = '.';
for (index = 1; index < 11; index++) { buffer[index] = ' '; }
buffer[1] = ' ';
buffer[2] = ' ';
buffer[3] = ' ';
buffer[4] = ' ';
buffer[5] = ' ';
buffer[6] = ' ';
buffer[7] = ' ';
buffer[8] = ' ';
buffer[9] = ' ';
buffer[10] = ' ';
}
static inline void set_dot_dot_entry(pf_u8* buffer) {
@@ -449,7 +453,7 @@ extern pf_s32 PFENT_ITER_GetEntryOfPattern(PF_ENT_ITER* iter, PF_DIR_ENT* entry,
extern pf_s32 PFENT_ITER_FindEntry(PF_ENT_ITER* iter, PF_DIR_ENT* entry, PFDIR_STR* pattern,
pf_u8 attributes, pf_u32 start, pf_u32* found);
extern pf_s32 PFENT_findEntry(PFDIR_FFD* ffd, PF_DIR_ENT* entry, pf_u32 start, PFDIR_STR* pattern,
pf_u32 required_attributes, pf_u32 forbidden_attributes);
pf_u8 attributes, pf_u32* logical_position, pf_u32* entry_position);
extern pf_u32 PFSTR_GetCodeMode(PFDIR_STR* path);
extern const pf_s8* PFSTR_GetStrPos(PFDIR_STR* path, pf_u32 target);
extern pf_s32 PFPATH_SplitPathPattern(PF_STR* path, PFDIR_STR* directory, PFDIR_STR* pattern);
@@ -463,16 +467,6 @@ extern pf_s32 PFFILE_FsexecOpenFile(PF_DIR_ENT* entry, PF_ENT_ITER* iter, pf_u32
extern pf_s32 PFPATH_cmpName(const pf_s8* short_name, PFDIR_STR* pattern, pf_u32 short_search);
extern pf_s32 PFPATH_cmpNameUni(const pf_u16* name, PFDIR_STR* pattern);
pf_s32 PFDIR_p_mkdir(PF_VOLUME* volume, PF_STR* path, pf_u32 option, PF_DTA* data) {
pf_u32 index;
pf_u32* next_sector;
pf_u16 filename_length;
pf_u16 original_offset;
pf_u8 checksum;
pf_u8 lfn_count = 0;
pf_u32 cluster;
pf_u32 lfn_index;
pf_u32 entry_sector;
pf_s32 error;
PF_DIR_ENT parent_entry;
PF_DIR_ENT entry;
pf_s8 normalized_name[512];
@@ -486,9 +480,19 @@ pf_s32 PFDIR_p_mkdir(PF_VOLUME* volume, PF_STR* path, pf_u32 option, PF_DTA* dat
pf_u32 found;
pf_u32 page_size;
PF_CACHE_PAGE* page;
pf_u8 lfn_count = 0;
pf_u32 sector = 0;
pf_u32 written;
pf_u32 position;
pf_u32 entry_sector;
pf_u16 filename_length;
pf_u16 original_offset;
pf_u8 checksum;
pf_u32 cluster;
pf_u32 index;
pf_u32 lfn_index;
pf_u32* next_sector;
pf_s32 error;
error = PFPATH_SplitPath((PFDIR_STR*)path, &directory, &filename);
if (error != 0) { return error; }
@@ -866,15 +870,12 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
pf_u32 found;
pf_u16 time;
pf_u8 deleted_marker[1] = {0xE5};
pf_s32 filename_length;
pf_u32* next_sector;
pf_s32 allocation_error = 0;
pf_u32 sector;
pf_u16 saved_initial_char = 0;
pf_u32 sector;
pf_u32* next_sector;
pf_s32 filename_length;
pf_s32 parse_error;
const pf_s8* filename;
pf_u32 remaining_lfns;
pf_u32 lfn_index;
pf_s32 allocation_error = 0;
pf_s32 error;
pf_u32 index;
PF_DIR_ENT* update_entry;
@@ -910,11 +911,11 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
}
PFSTR_SetLocalStr(&destination_name, (pf_u32)normalized_name);
if (PFSTR_GetCodeMode(&destination_name) == 1) {
filename = PFSTR_GetStrPos(&destination_name, 1);
const pf_s8* filename = PFSTR_GetStrPos(&destination_name, 1);
error = pf_strcmp(PFSTR_GetStrPos(&directory, 1), filename);
} else {
filename = PFSTR_GetStrPos(&destination_name, 1);
error = pf_w_strcmp((const pf_u16*)PFSTR_GetStrPos(&directory, 1), (const pf_u16*)filename);
const pf_u16* filename = (const pf_u16*)PFSTR_GetStrPos(&destination_name, 1);
error = pf_w_strcmp((const pf_u16*)PFSTR_GetStrPos(&directory, 1), filename);
}
if (error != 0) {
error = PFENT_ITER_GetEntryOfPath(&destination_iter, &destination_entry,
@@ -924,24 +925,23 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
}
destination_entry.start_cluster = source_parent.start_cluster;
PFFAT_InitFFD(&destination_iter.ffd, &destination_hint, volume, &destination_entry.start_cluster);
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0);
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0, 0);
if (error == 0) { return 8; }
if (error != 0 && error != 3) { return error; }
if ((source_entry.attr & 0x10) == 0) {
if (PFFILE_IsOpened(&source_entry) != 0) { return 0x13; }
} else {
if (directory_is_open(&source_entry) != 0) { return 0x13; }
if (current_directory_is_open(source_entry.p_vol, &source_entry) != 0) { return 0x1C; }
if (current_directory_is_open(source_entry.p_vol, source_entry.start_cluster) != 0) { return 0x1C; }
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)"..", 1, 0, 2) == 0) { return 0x1C; }
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)".", 1, 0, 1) == 0) { return 0x1C; }
{
pf_u32 directory_sector;
PFDIR_SFD* file = ((PFDIR_VOLUME_DIRS*)volume)->sfds;
directory_sector = volume->bpb.first_data_sector +
pf_u32 directory_sector = volume->bpb.first_data_sector +
((source_entry.start_cluster - 2) << volume->bpb.log2_sectors_per_cluster);
for (index = 0; index < 5; index++, file++) {
if ((file->stat & 1) != 0 && (file->stat & 2) != 0) {
if (volume == file->dir_entry.p_vol && directory_sector == file->dir_entry.entry_sector) { return 0x13; }
if (file->dir_entry.p_vol == volume && file->dir_entry.entry_sector == directory_sector) { return 0x13; }
found = 0;
error = PFENT_ITER_FindCluster(&file->dir_entry, source_entry.start_cluster, &found);
if (error != 0) { return error; }
@@ -961,13 +961,12 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
destination_entry.num_entry_LFNs = 0;
PFENT_getcurrentDateTimeForEnt(&destination_entry.access_date, &time);
error = PFENT_updateEntry(&destination_entry, 1);
if (error != 0) { return error; }
goto return_allocation_error;
goto finish_rename;
}
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
saved_initial_char = source_entry.long_name[0];
source_entry.long_name[0] = 0;
for (lfn_index = 1; lfn_index <= source_entry.num_entry_LFNs; lfn_index++) {
for (index = 1; index <= source_entry.num_entry_LFNs; index++) {
error = PFENT_ITER_Retreat(&source_iter, 0);
if (error != 0) { return error; }
error = PFSEC_WriteData(volume, deleted_marker, source_iter.sector,
@@ -1005,7 +1004,7 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
if (allocation_error != 0) {
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
source_entry.long_name[0] = saved_initial_char;
source_entry.entry_offset -= ((pf_u32)source_entry.num_entry_LFNs << 5) & (0xffU << 5);
source_entry.entry_offset -= (pf_u16)(source_entry.num_entry_LFNs * 32);
}
update_entry = &source_entry;
} else {
@@ -1014,13 +1013,13 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
PFENT_getcurrentDateTimeForEnt(&destination_entry.access_date, &time);
update_entry = &destination_entry;
}
remaining_lfns = update_entry->num_entry_LFNs;
if (remaining_lfns != 0 && (update_entry->small_letter_flag & 0x18) == 0) {
index = update_entry->num_entry_LFNs;
if (index != 0 && (update_entry->small_letter_flag & 0x18) == 0) {
sector = update_entry->entry_sector;
next_sector = previous_chain;
while (remaining_lfns >= 1) {
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, update_entry, remaining_lfns,
update_entry->check_sum, remaining_lfns == update_entry->num_entry_LFNs);
while (index >= 1) {
PFENT_storeLFNEntryFieldsToBuf(entry_buffer, update_entry, index,
update_entry->check_sum, index == update_entry->num_entry_LFNs);
error = PFSEC_WriteData(volume, entry_buffer, sector, update_entry->entry_offset, 32, &written, 0);
if (error != 0) { return error; }
if (written != 32) { return 0x11; }
@@ -1029,13 +1028,13 @@ pf_s32 PFDIR_p_rename(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
update_entry->entry_offset = 0;
sector = *next_sector++;
}
remaining_lfns--;
index--;
}
update_entry->entry_sector = sector;
}
error = PFENT_updateEntry(update_entry, 1);
if (error != 0) { return error; }
return_allocation_error:
finish_rename:
if (error != 0) { allocation_error = error; }
return allocation_error;
}
pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
@@ -1058,16 +1057,15 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
pf_u32 found;
pf_u16 time;
pf_u8 deleted_marker[1] = {0xE5};
pf_s32 filename_length;
pf_u32* next_sector;
pf_u32 parent_cluster;
pf_u16 saved_initial_char = 0;
pf_u32 sector;
pf_u32* next_sector;
pf_s32 filename_length;
pf_s32 parse_error;
pf_s32 allocation_error;
pf_s32 error;
pf_u16 saved_initial_char = 0;
pf_u32 lfn_index;
pf_u32 index;
pf_u32 lfn_index;
PF_DIR_ENT* update_entry;
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
@@ -1085,7 +1083,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
if (error != 0) { return error; }
destination_entry.start_cluster = destination_parent.start_cluster;
PFFAT_InitFFD(&destination_iter.ffd, &destination_hint, volume, &destination_entry.start_cluster);
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0);
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &destination_name, 0x7F, 0, 0);
if (error == 0) {
if (destination_entry.entry_sector == source_entry.entry_sector &&
destination_entry.entry_offset == source_entry.entry_offset) { return 0; }
@@ -1096,19 +1094,18 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
if (PFFILE_IsOpened(&source_entry) != 0) { return 0x13; }
} else {
if (directory_is_open(&source_entry) != 0) { return 0x13; }
if (current_directory_is_open(source_entry.p_vol, &source_entry) != 0) { return 0x1C; }
if (current_directory_is_open(source_entry.p_vol, source_entry.start_cluster) != 0) { return 0x1C; }
error = PFPATH_SplitPath((PFDIR_STR*)old_path, &directory, &source_name);
if (error != 0) { return error; }
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)"..", 1, 0, 2) == 0) { return 10; }
if (PFSTR_StrNCmp(&source_name, (const pf_s8*)".", 1, 0, 1) == 0) { return 10; }
{
pf_u32 directory_sector;
PFDIR_SFD* file = ((PFDIR_VOLUME_DIRS*)volume)->sfds;
directory_sector = volume->bpb.first_data_sector +
pf_u32 directory_sector = volume->bpb.first_data_sector +
((source_entry.start_cluster - 2) << volume->bpb.log2_sectors_per_cluster);
for (index = 0; index < 5; index++, file++) {
if ((file->stat & 1) != 0 && (file->stat & 2) != 0) {
if (volume == file->dir_entry.p_vol && directory_sector == file->dir_entry.entry_sector) { return 0x13; }
if (file->dir_entry.p_vol == volume && file->dir_entry.entry_sector == directory_sector) { return 0x13; }
found = 0;
error = PFENT_ITER_FindCluster(&file->dir_entry, source_entry.start_cluster, &found);
if (error != 0) { return error; }
@@ -1118,11 +1115,12 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
}
destination_entry.start_cluster = destination_parent.start_cluster;
for (;;) {
pf_u32 parent_cluster;
if (destination_entry.start_cluster == 1 || destination_entry.start_cluster == 0) { break; }
PFFAT_InitFFD(&destination_iter.ffd, &destination_hint, volume, &destination_entry.start_cluster);
PFSTR_InitStr(&parent_name, (const pf_s8*)"..", 1);
PFSTR_SetLocalStr(&parent_name, 0);
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &parent_name, 0x7F, 0);
error = PFENT_findEntry(&destination_iter.ffd, &destination_entry, 0, &parent_name, 0x7F, 0, 0);
if (error != 0) { return error; }
parent_cluster = destination_entry.start_cluster;
if (parent_cluster == 1 || parent_cluster == 0) { break; }
@@ -1142,10 +1140,9 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
parse_error = PFPATH_parseShortName(destination_entry.short_name, &destination_name);
if (destination_entry.short_name[0] == 0) { return 2; }
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
pf_u32 entry_index;
saved_initial_char = source_entry.long_name[0];
source_entry.long_name[0] = 0;
for (entry_index = 1; entry_index <= source_entry.num_entry_LFNs; entry_index++) {
for (index = 1; index <= source_entry.num_entry_LFNs; index++) {
error = PFENT_ITER_Retreat(&source_iter, 0);
if (error != 0) { return error; }
error = PFSEC_WriteData(volume, deleted_marker, source_iter.sector,
@@ -1183,7 +1180,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
if (allocation_error != 0) {
if (source_entry.num_entry_LFNs != 0 && (source_entry.small_letter_flag & 0x18) == 0) {
source_entry.long_name[0] = saved_initial_char;
source_entry.entry_offset -= ((pf_u32)source_entry.num_entry_LFNs << 5) & (0xffU << 5);
source_entry.entry_offset -= (source_entry.num_entry_LFNs & 0xff) * 32;
}
update_entry = &source_entry;
} else {
@@ -1195,7 +1192,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
PFFAT_InitFFD(&source_iter.ffd, &source_hint, volume, &source_entry.start_cluster);
PFSTR_InitStr(&parent_name, (const pf_s8*)"..", 1);
PFSTR_SetLocalStr(&parent_name, 0);
error = PFENT_findEntry(&source_iter.ffd, &source_entry, 0, &parent_name, 0x7F, 0);
error = PFENT_findEntry(&source_iter.ffd, &source_entry, 0, &parent_name, 0x7F, 0, 0);
if (error != 0) { return error; }
if (destination_parent.start_cluster == 1 || destination_parent.start_cluster == 0 ||
(destination_parent.start_cluster == 2 && volume->bpb.fat_type == FAT_32)) {
@@ -1233,164 +1230,6 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
return allocation_error;
}
pf_s32 PFDIR_p_fsnext(PF_DTA* data) {
PFDIR_FFD ffd;
PFDIR_FAT_HINT hint;
PF_DIR_ENT entry;
PFDIR_STR pattern;
pf_u32 logical_position = 0;
pf_u32 entry_position = 0;
pf_u32 code_mode;
pf_s32 index = 0;
pf_s32 error;
if ((data->status & 1) == 1) {
code_mode = 1;
error = PFSTR_InitStr(&pattern, data->reg_exp, code_mode);
} else {
code_mode = 2;
error = PFSTR_InitStr(&pattern, (const pf_s8*)((PF_DTAW*)data)->reg_expW, code_mode);
}
if (error != 0) {
return error;
}
PFSTR_SetLocalStr(&pattern, (pf_u32)data->reg_exp);
while (entry_position < 999999) {
if (data->parent_pos >= 999999) { return 10; }
entry.start_cluster = data->parent_start_cluster;
PFFAT_InitFFD(&ffd, &hint, data->p_vol, &entry.start_cluster);
error = PFENT_findEntryPos(&ffd, &entry, data->parent_pos, &pattern, data->attr, 0,
&logical_position, &entry_position);
if (error != 0) { return error; }
data->parent_pos = entry_position + 1;
if (entry_position == 999999) { return 3; }
else { break; }
}
pf_strcpy(data->FileName, entry.short_name);
if ((data->status & 2) == 2) {
PFPATH_transformInUnicode(((PF_DTAW*)data)->FileNameW, data->FileName);
}
if (entry.long_name[0] != 0) {
if ((pf_vol_set.setting & 2) == 2) {
pf_vol_set.setting &= 0xFFFFFFFC;
pf_vol_set.setting |= 1;
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
pf_vol_set.setting &= 0xFFFFFFFC;
pf_vol_set.setting |= 2;
} else {
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
}
if ((data->status & 2) == 2) {
pf_w_strcpy(((PF_DTAW*)data)->LongNameW, entry.long_name);
}
} else {
data->LongName[0] = 0;
if ((data->status & 2) == 2) {
((PF_DTAW*)data)->LongNameW[0] = 0;
}
}
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files != 0) {
for (index = 0; index < 5; index++) {
if ((((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 1) != 0 && (((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 2) != 0 &&
entry.p_vol == ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.p_vol &&
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_sector == entry.entry_sector &&
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_offset == entry.entry_offset) {
data->FileSize = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.file_size;
data->Time = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_time;
data->Date = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_date;
data->Attribute = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.attr;
data->num_entry_LFNs = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.num_entry_LFNs;
data->ordinal = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.ordinal;
data->check_sum = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.check_sum;
break;
}
}
}
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files == 0 || index == 5) {
data->FileSize = entry.file_size;
data->Time = entry.modify_time;
data->Date = entry.modify_date;
data->Attribute = entry.attr;
data->num_entry_LFNs = entry.num_entry_LFNs;
data->ordinal = entry.ordinal;
data->check_sum = entry.check_sum;
}
return 0;
}
pf_s32 PFDIR_p_fsfirst(PF_VOLUME* volume, PF_STR* path, pf_u8 attributes, PF_DTA* data) {
PFDIR_STR directory;
PFDIR_STR pattern;
PF_DIR_ENT entry;
PF_ENT_ITER iter;
pf_s32 error;
error = PFPATH_SplitPathPattern(path, &directory, &pattern);
if (error != 0) {
return error;
}
error = PFENT_ITER_GetEntryOfPattern(&iter, &entry, volume, &directory);
if (error != 0) {
return error;
}
if ((entry.attr & 0x10) == 0) {
return 0x14;
}
data->parent_start_cluster = entry.start_cluster;
data->parent_pos = 0;
data->p_vol = entry.p_vol;
data->attr = attributes;
data->status = 0;
if (PFSTR_GetCodeMode(&pattern) == 1) {
PFPATH_SetSearchPattern(data->reg_exp, 0, &pattern);
data->status |= 1;
} else {
PFPATH_SetSearchPattern(data->reg_exp, ((PF_DTAW*)data)->reg_expW, &pattern);
data->status |= 2;
}
return PFDIR_p_fsnext(data);
}
pf_s32 PFDIR_p_fsexec_chmod(PF_DTA* data, PF_DIR_ENT* entry, pf_u32 mode, pf_u32 attributes) {
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)entry->p_vol;
pf_u16 date;
pf_u16 time;
pf_u8 create_time_ms;
pf_s32 index = 0;
pf_s32 error;
if ((attributes & 0x40) != 0) {
attributes = (pf_u8)(attributes & ~0x40);
}
if ((entry->attr & 0x10) != 0) {
if ((attributes & 4) != 0) {
return 10;
}
if (directory_is_open(entry) != 0) { return 0x13; }
entry->attr = attributes | 0x10;
} else {
if ((attributes & 0x10) != 0) {
return 10;
}
if (PFFILE_IsOpened(entry) != 0) {
return 0x13;
}
entry->attr = attributes;
}
PFENT_getcurrentDateTimeForEnt(&entry->access_date, &time);
error = PFENT_updateEntry(entry, 0);
if (error != 0) {
return error;
}
if ((mode & 0x80000000) == 0) {
data->Attribute = entry->attr;
}
error = PFCACHE_FlushDataCacheSpecific(entry->p_vol, 0);
if (error != 0) { return error; }
return 0;
}
pf_s32 PFDIR_p_fsexec_remove(PF_DTA* data, PF_DIR_ENT* entry, PF_ENT_ITER* iter) {
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)entry->p_vol;
PFDIR_FAT_HINT hint;
@@ -1444,6 +1283,47 @@ pf_s32 PFDIR_p_fsexec_remove(PF_DTA* data, PF_DIR_ENT* entry, PF_ENT_ITER* iter)
return release_directory_chain(&iter->ffd, start_cluster, chain_size);
}
pf_s32 PFDIR_p_fsexec_chmod(PF_DTA* data, PF_DIR_ENT* entry, pf_u32 mode, pf_u32 attributes) {
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)entry->p_vol;
pf_u16 date;
pf_u16 time;
pf_u8 create_time_ms;
pf_s32 index = 0;
pf_s32 error;
if ((attributes & 0x40) != 0) {
attributes = (pf_u8)(attributes & ~0x40);
}
if ((entry->attr & 0x10) != 0) {
if ((attributes & 4) != 0) {
return 10;
}
if (directory_is_open(entry) != 0) { return 0x13; }
entry->attr = attributes | 0x10;
} else {
if ((attributes & 0x10) != 0) {
return 10;
}
if (PFFILE_IsOpened(entry) != 0) {
return 0x13;
}
entry->attr = attributes;
}
PFENT_getcurrentDateTimeForEnt(&entry->access_date, &time);
error = PFENT_updateEntry(entry, 0);
if (error != 0) {
return error;
}
if ((mode & 0x80000000) == 0) {
data->Attribute = entry->attr;
}
error = PFCACHE_FlushDataCacheSpecific(entry->p_vol, 0);
if (error != 0) { return error; }
return 0;
}
pf_s32 PFDIR_p_fsexec_fopen(PF_DTA* data, PF_DIR_ENT* entry, PF_ENT_ITER* iter, pf_u32 flags,
pf_u32 mode) {
pf_s8 long_name[13];
@@ -2030,3 +1910,121 @@ void PFDIR_chdmod(PF_STR* path, pf_u8 attributes) {
}
volume_dirs->cache.signature = 0;
}
pf_s32 PFDIR_p_fsnext(PF_DTA* data) {
PFDIR_FFD ffd;
PFDIR_FAT_HINT hint;
PF_DIR_ENT entry;
PFDIR_STR pattern;
pf_u32 logical_position = 0;
pf_u32 entry_position = 0;
pf_u32 code_mode;
pf_s32 index = 0;
pf_s32 error;
if ((data->status & 1) == 1) {
code_mode = 1;
error = PFSTR_InitStr(&pattern, data->reg_exp, code_mode);
} else {
code_mode = 2;
error = PFSTR_InitStr(&pattern, (const pf_s8*)((PF_DTAW*)data)->reg_expW, code_mode);
}
if (error != 0) {
return error;
}
PFSTR_SetLocalStr(&pattern, (pf_u32)data->reg_exp);
while (entry_position < 999999) {
if (data->parent_pos >= 999999) { return 10; }
entry.start_cluster = data->parent_start_cluster;
PFFAT_InitFFD(&ffd, &hint, data->p_vol, &entry.start_cluster);
error = PFENT_findEntryPos(&ffd, &entry, data->parent_pos, &pattern, data->attr, 0,
&logical_position, &entry_position);
if (error != 0) { return error; }
data->parent_pos = entry_position + 1;
if (entry_position == 999999) { return 3; }
else { break; }
}
pf_strcpy(data->FileName, entry.short_name);
if ((data->status & 2) == 2) {
PFPATH_transformInUnicode(((PF_DTAW*)data)->FileNameW, data->FileName);
}
if (entry.long_name[0] != 0) {
if ((pf_vol_set.setting & 2) == 2) {
pf_vol_set.setting &= 0xFFFFFFFC;
pf_vol_set.setting |= 1;
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
pf_vol_set.setting &= 0xFFFFFFFC;
pf_vol_set.setting |= 2;
} else {
PFPATH_transformFromUnicodeToNormal(data->LongName, entry.long_name);
}
if ((data->status & 2) == 2) {
pf_w_strcpy(((PF_DTAW*)data)->LongNameW, entry.long_name);
}
} else {
data->LongName[0] = 0;
if ((data->status & 2) == 2) {
((PF_DTAW*)data)->LongNameW[0] = 0;
}
}
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files != 0) {
for (index = 0; index < 5; index++) {
if ((((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 1) != 0 && (((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].stat & 2) != 0 &&
entry.p_vol == ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.p_vol &&
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_sector == entry.entry_sector &&
((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.entry_offset == entry.entry_offset) {
data->FileSize = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.file_size;
data->Time = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_time;
data->Date = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.modify_date;
data->Attribute = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.attr;
data->num_entry_LFNs = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.num_entry_LFNs;
data->ordinal = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.ordinal;
data->check_sum = ((PFDIR_VOLUME_DIRS*)data->p_vol)->sfds[index].dir_entry.check_sum;
break;
}
}
}
if (((PFDIR_VOLUME_DIRS*)data->p_vol)->num_opened_files == 0 || index == 5) {
data->FileSize = entry.file_size;
data->Time = entry.modify_time;
data->Date = entry.modify_date;
data->Attribute = entry.attr;
data->num_entry_LFNs = entry.num_entry_LFNs;
data->ordinal = entry.ordinal;
data->check_sum = entry.check_sum;
}
return 0;
}
pf_s32 PFDIR_p_fsfirst(PF_VOLUME* volume, PF_STR* path, pf_u8 attributes, PF_DTA* data) {
PFDIR_STR directory;
PFDIR_STR pattern;
PF_DIR_ENT entry;
PF_ENT_ITER iter;
pf_s32 error;
error = PFPATH_SplitPathPattern(path, &directory, &pattern);
if (error != 0) {
return error;
}
error = PFENT_ITER_GetEntryOfPattern(&iter, &entry, volume, &directory);
if (error != 0) {
return error;
}
if ((entry.attr & 0x10) == 0) {
return 0x14;
}
data->parent_start_cluster = entry.start_cluster;
data->parent_pos = 0;
data->p_vol = entry.p_vol;
data->attr = attributes;
data->status = 0;
if (PFSTR_GetCodeMode(&pattern) == 1) {
PFPATH_SetSearchPattern(data->reg_exp, 0, &pattern);
data->status |= 1;
} else {
PFPATH_SetSearchPattern(data->reg_exp, ((PF_DTAW*)data)->reg_expW, &pattern);
data->status |= 2;
}
return PFDIR_p_fsnext(data);
}

View File

@@ -511,8 +511,8 @@ pf_s32 PFENT_ITER_FindCluster(PF_DIR_ENT* p_ent, pf_u32 cluster, pf_bool* p_is_f
iter.ffd.cluster_link.buffer = PF_NULL;
iter.log2_entries_per_sector = p_ent->p_vol->bpb.log2_bytes_per_sector - 5;
iter.file_sector_index = sector_index;
iter.offset_mask = (1U << iter.log2_entries_per_sector) - 1;
entries_per_sector = 1U << iter.log2_entries_per_sector;
entries_per_sector = 1 << iter.log2_entries_per_sector;
iter.offset_mask = entries_per_sector - 1;
iter.p_vol = p_ent->p_vol;
iter.sector = p_ent->entry_sector;
iter.offset = p_ent->entry_offset;
@@ -726,29 +726,25 @@ pf_s32 PFENT_ITER_GetEntryOfIter(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
return 0;
}
static inline pf_u32 CopyLongNameFragment(PFITER_ENT_ITER* iter, pf_u8* destination, pf_u32 offset) {
pf_memcpy(destination, &iter->buf[1], 10);
pf_memcpy(destination + 10, &iter->buf[14], 12);
pf_memcpy(destination + 22, &iter->buf[28], 4);
return offset + 26;
}
pf_s32 PFENT_ITER_GetLFNEntryName(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
pf_u32 index;
pf_u8* destination;
pf_u32 i;
pf_u32 index;
pf_s32 err;
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
i = 0;
for (index = 0; i < p_ent->num_entry_LFNs; ++i) {
index = 0;
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
pf_u16* destination;
err = PFENT_ITER_Retreat(p_iter, 0);
if (err != 0) return err;
err = PFENT_ITER_LoadEntry(p_iter);
if (err != 0) return err;
destination = (pf_u8*)p_ent->long_name + index;
index = CopyLongNameFragment(p_iter, destination, index);
destination = &p_ent->long_name[index];
pf_memcpy(destination, &p_iter->buf[1], 10);
pf_memcpy(destination + 5, &p_iter->buf[14], 12);
pf_memcpy(destination + 11, &p_iter->buf[28], 4);
index += 13;
}
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) >> 1] = 0;
p_ent->long_name[index] = 0;
}
return 0;
}

View File

@@ -1458,19 +1458,6 @@ s32 PFFAT_CountFreeClusters(PF_VOLUME* volume, u32* numFreeClusters)
return 0;
}
static inline s32 PFFAT_ClearEntryWithBuf(PF_VOLUME* volume, u32 cluster, PF_CACHE_PAGE* page) {
switch (volume->bpb.fat_type) {
case FAT_12:
return PFFAT12_WriteFATEntryWithBuf(volume, (u16)cluster, 0, page);
case FAT_16:
return PFFAT16_WriteFATEntryWithBuf(volume, cluster, 0, page);
case FAT_32:
return PFFAT32_WriteFATEntryWithBuf(volume, cluster, 0, page);
default:
return 15;
}
}
s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
u32 size)
{
@@ -1536,9 +1523,9 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
}
if (nextCluster == 0) {
s32 firstFlushError;
u32 fatSector;
PF_CACHE_PAGE* flushPage;
u16 fatIndex;
const PF_CACHE_PAGE* flushPage;
u32 fatSector;
firstFlushError = 0;
flushPage = page;
@@ -1559,20 +1546,34 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
PFCACHE_FreeDataPage(volume, page);
return 0;
}
{
s32 writeError;
if (chainIndex != -1) {
writeError = PFFAT_WriteClusterWithBuf(file, startCluster, chainIndex,
0, 1, page);
chainIndex++;
} else {
writeError = PFFAT_ClearEntryWithBuf(volume, startCluster, page);
}
if (writeError != 0) {
PFCACHE_FreeDataPage(volume, page);
return writeError;
if (chainIndex != -1) {
error = PFFAT_WriteClusterWithBuf(file, startCluster, chainIndex,
0, 1, page);
chainIndex++;
} else {
currentPage = page;
switch (volume->bpb.fat_type) {
case FAT_12:
error = PFFAT12_WriteFATEntryWithBuf(
volume, (u16)startCluster, 0, currentPage);
break;
case FAT_16:
error = PFFAT16_WriteFATEntryWithBuf(volume, startCluster, 0,
currentPage);
break;
case FAT_32:
error = PFFAT32_WriteFATEntryWithBuf(volume, startCluster, 0,
currentPage);
break;
default:
error = 15;
break;
}
}
if (error != 0) {
PFCACHE_FreeDataPage(volume, page);
return error;
}
if (size != 0 && fileSize != 0) {
if (fileSize <= clusterSize) {
fileSize = 0;
@@ -1589,7 +1590,7 @@ s32 PFFAT_FreeChain(PFFAT_FFD* file, u32 startCluster, u32 chainIndex,
s32 firstFlushError;
u32 fatSector;
u16 fatIndex;
const PF_CACHE_PAGE* flushPage;
PF_CACHE_PAGE* flushPage;
firstFlushError = 0;
flushPage = page;

View File

@@ -321,7 +321,41 @@ pf_u32 PFPATH_DoMatchFileNameWithPattern(pf_u16 c_name, PF_FILE_NAME_ITER* p_nam
return 1;
}
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name);
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name) {
pf_u16 c_name;
pf_u16 c_pat;
PF_FILE_NAME_ITER name;
PF_STR pattern;
pf_bool result;
result = PF_TRUE;
name.buf = file_name;
name.current = 0;
name.kind = is_long_name;
name.index = 0;
pattern = *p_pattern;
if (PFSTR_GetCodeMode(p_pattern) == 1) {
if (is_long_name == PF_FALSE && (pf_vol_set.setting & 0x02) == 0x02 && PFPATH_CheckExtShortNameSignature(&pattern) == 1) {
result = PFPATH_CheckExtShortNameSignature(&pattern);
if (result == 1) {
name.index += 2;
pattern.p_head += 2;
}
}
} else if ((pf_vol_set.setting & 0x02) == 0x02 && is_long_name == PF_FALSE &&
PFSTR_StrNCmp(p_pattern, (pf_s8*)".", 1, 0, 1) != 0 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"..", 1, 0, 2) != 0 &&
PFPATH_CheckExtShortName(p_pattern, 1, PF_FALSE) == 0) {
result = PF_FALSE;
}
if (result == PF_TRUE) {
c_name = PFPATH_GetNextCharOfFileName(&name);
c_pat = PFPATH_GetNextCharOfPattern(&pattern, is_long_name);
result = PFPATH_DoMatchFileNameWithPattern(c_name, &name, c_pat, &pattern, is_long_name);
}
return result;
}
pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* matched_end) {
pf_u32 read_char;
@@ -543,42 +577,6 @@ PF_VOLUME* PFPATH_GetVolumeFromPath(PF_STR* p_path) {
return p_vol;
}
pf_bool PFPATH_MatchFileNameWithPattern(const pf_s8* file_name, PF_STR* p_pattern, pf_bool is_long_name) {
pf_u16 c_name;
pf_u16 c_pat;
PF_FILE_NAME_ITER name;
PF_STR pattern;
pf_bool result;
result = PF_TRUE;
name.buf = file_name;
name.current = 0;
name.kind = is_long_name;
name.index = 0;
pattern = *p_pattern;
if (PFSTR_GetCodeMode(p_pattern) == 1) {
if (is_long_name == PF_FALSE && (pf_vol_set.setting & 0x02) == 0x02 && PFPATH_CheckExtShortNameSignature(&pattern) == 1) {
result = PFPATH_CheckExtShortNameSignature(&pattern);
if (result == 1) {
name.index += 2;
pattern.p_head += 2;
}
}
} else if ((pf_vol_set.setting & 0x02) == 0x02 && is_long_name == PF_FALSE &&
PFSTR_StrNCmp(p_pattern, (pf_s8*)".", 1, 0, 1) != 0 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"..", 1, 0, 2) != 0 &&
PFPATH_CheckExtShortName(p_pattern, 1, PF_FALSE) == 0) {
result = PF_FALSE;
}
if (result == PF_TRUE) {
c_name = PFPATH_GetNextCharOfFileName(&name);
c_pat = PFPATH_GetNextCharOfPattern(&pattern, is_long_name);
result = PFPATH_DoMatchFileNameWithPattern(c_name, &name, c_pat, &pattern, is_long_name);
}
return result;
}
pf_s32 PFPATH_putShortName(pf_u8* pDirEntry, const pf_s8* short_name, pf_u8 attr) {
pf_s32 i = 0;

View File

@@ -225,6 +225,8 @@ typedef struct PFVOL_SET {
PFVOL_SET pf_vol_set;
static s8 default_volume_label[12] = "NO NAME ";
static const u8 deleted_entry_mark[8] = {0xE5};
extern s32 PFDRV_mount(PFVOL_VOLUME* volume);
extern s32 PFDRV_unmount(PFVOL_VOLUME* volume, u32 mode);
extern s32 PFDRV_format(PFVOL_VOLUME* volume, const u8* format_options);
@@ -370,13 +372,8 @@ static inline s32 finalize_volume(PFVOL_VOLUME* volume) {
if (error != 0) { return error; }
return 0;
}
static inline s32 copy_codeset(PFVOL_CHARCODE* code_set) {
pf_vol_set.codeset.oem2unicode = code_set->oem2unicode;
pf_vol_set.codeset.unicode2oem = code_set->unicode2oem;
pf_vol_set.codeset.oem_char_width = code_set->oem_char_width;
pf_vol_set.codeset.is_oem_mb_char = code_set->is_oem_mb_char;
pf_vol_set.codeset.unicode_char_width = code_set->unicode_char_width;
pf_vol_set.codeset.is_unicode_mb_char = code_set->is_unicode_mb_char;
static inline s32 copy_codeset(const PFVOL_CHARCODE* code_set) {
pf_vol_set.codeset = *code_set;
return 0;
}
s32 PFVOL_DoMountVolume(PFVOL_VOLUME* volume) {
@@ -587,7 +584,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
u32 logical_position;
u32 entry_position;
u32 processed;
u8 deleted[1] = {0xE5};
u8 deleted = deleted_entry_mark[0];
s32 error;
error = PFENT_GetRootDir(volume, &root_entry);
@@ -602,7 +599,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
return error;
}
if (entry_position != 999999) {
error = PFSEC_WriteData(volume, deleted, entry.entry_sector, entry.entry_offset, 1, &processed, 0);
error = PFSEC_WriteData(volume, &deleted, entry.entry_sector, entry.entry_offset, 1, &processed, 0);
if (error != 0) {
return error;
}
@@ -1105,13 +1102,7 @@ s32 PFVOL_attach(PFVOL_DRIVER* driver, s32 notify_command, void* callback_data)
pf_vol_set.num_attached_drives++;
if (PFDRV_IsInserted(volume) != 0) {
driver->stat |= 0x10;
error = clear_mount(volume);
if (error != 0) {
pf_vol_set.last_error = error;
volume->last_error = error;
return 0;
}
driver->stat |= 2;
attach_mount(volume, driver);
}
return 0;
}
@@ -1467,7 +1458,7 @@ s32 PFVOL_getvolcfg(s8 drive, u32* config) {
return 0;
}
s32 PFVOL_setcode(PFVOL_CHARCODE* code_set) {
s32 PFVOL_setcode(const PFVOL_CHARCODE* code_set) {
if (pf_vol_set.num_mounted_volumes > 0) {
pf_vol_set.last_error = 36;
return 36;
@@ -1475,21 +1466,17 @@ s32 PFVOL_setcode(PFVOL_CHARCODE* code_set) {
return copy_codeset(code_set);
}
static inline u32 ContextStatus(const PFVOL_CONTEXT* context) {
return context->stat & 1;
}
s32 PFVOL_regctx(void) {
u32 context_index;
s32 free_context_index;
s32 context_id;
s32 free_context_index;
u32 context_index;
s32 error;
error = PFSYS_GetCurrentContextID(&context_id);
if (error != 0) { pf_vol_set.last_error = 26; return 26; }
free_context_index = 0;
for (context_index = 1; context_index < 4; context_index++) {
u32 stat;
stat = ContextStatus(&pf_vol_set.context[context_index - 1]);
stat = pf_vol_set.context[context_index - 1].stat & 1;
if (stat != 0 && pf_vol_set.context[context_index - 1].context_id == context_id) { break; }
if (stat == 0 && free_context_index == 0) { free_context_index = context_index; }
}

View File

@@ -562,13 +562,11 @@ static inline u32 kbdChannelFlags(u32 channel) {
}
static void kbd_led_handler(BOOL success, void* callbackArg) {
const KBDLEDCallbackData* callback;
u32 index;
u32 err;
index = (u32)callbackArg;
callback = &kbdLCBuf[index];
kbdCmdBuf[index].device = 0;
if (callback->callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
if (kbdLCBuf[index].callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
return;
}
switch (success) {

View File

@@ -276,15 +276,14 @@ static inline f32 object_interval_distance(f32 interval) {
const f32 sensorIntervalConversion = 0.383864f;
static void reset_kpad(KPADInside* kpad) {
f32 sensorDistance;
f32 upperY;
f32 distanceValue;
f32 zero;
f32 upperY;
f32 sensorDistance;
f32 lowerY;
f32 one;
f32 negativeOne;
KPADDPDObject* object;
f32 calibratedDistance;
negativeOne = -1.0f;
one = 1.0f;
zero = 0.0f;
@@ -300,9 +299,8 @@ static void reset_kpad(KPADInside* kpad) {
kpad->value508 = negativeOne / kp_err_dist_speed;
kpad->value50C = kp_ah_circle_radius * kp_ah_circle_radius;
kpad->value514 = kp_err_dist_min;
calibratedDistance = kp_dist_vv1;
distanceValue = calibratedDistance / sensorDistance;
kpad->value510 = calibratedDistance;
distanceValue = kp_dist_vv1 / sensorDistance;
kpad->value510 = kp_dist_vv1;
kpad->status.release = 0;
kpad->status.trig = 0;
kpad->status.hold = 0;
@@ -856,33 +854,26 @@ static s8 select_1obj_continue(KPADInside* kpad) {
}
*matchedCandidate = *source;
{
f32 distance;
f32 normY;
f32 vertical;
f32 directionY;
f32 axisX = kpad->horizonTangent.x;
f32 normX = kpad->horizonAxis.x;
f32 axisY = kpad->horizonTangent.y;
f32 normY = kpad->horizonAxis.y;
f32 distance = kpad->dpdObjectDistance;
f32 horizontal = axisX * normX;
f32 vertical = axisY * normX;
f32 offsetX;
f32 axisY;
f32 horizontal;
f32 axisX;
f32 directionX;
f32 normX;
f32 directionY;
f32 offsetY;
f32 tangentY;
f32 tangentX;
axisX = kpad->horizonTangent.x;
normX = kpad->horizonAxis.x;
axisY = kpad->horizonTangent.y;
normY = kpad->horizonAxis.y;
distance = kpad->dpdObjectDistance;
horizontal = axisX * normX;
vertical = axisY * normX;
tangentY = axisY * normY;
tangentX = axisX * normY;
directionX = horizontal + tangentY;
directionY = vertical - tangentX;
offsetX = distance * directionX;
offsetX = directionX * distance;
kpad->dpdObjectDirection.x = directionX;
offsetY = distance * directionY;
offsetY = directionY * distance;
kpad->dpdObjectDirection.y = directionY;
if (matchedCandidate == kpad->dpdState.candidates) {
kpad->dpdState.candidates[1].x = matchedCandidate->x + offsetX;

View File

@@ -484,7 +484,6 @@ static inline unsigned long __nupBase64EncodedSize(unsigned long length) {
}
static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
static char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
u8* end = input + length;
u32 value = 0;
u32 count = 0;
@@ -497,19 +496,26 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
if (count < 3) {
continue;
}
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
output[2] = alphabet[value >> 6 & 0x3f];
output[3] = alphabet[value & 0x3f];
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
output[1] = encodedSecond;
u8 encodedFourth = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value & 0x3f];
output[2] = encodedThird;
output[3] = encodedFourth;
count = 0;
output += 4;
}
if (count == 2) {
value <<= 8;
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
output[2] = alphabet[value >> 6 & 0x3f];
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
output[1] = encodedSecond;
output[2] = encodedThird;
output[3] = fillByte;
return;
}
@@ -517,8 +523,10 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
return;
}
value <<= 16;
output[0] = alphabet[value >> 18 & 0x3f];
output[1] = alphabet[value >> 12 & 0x3f];
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
output[0] = encodedFirst;
output[1] = encodedSecond;
output[2] = fillByte;
output[3] = fillByte;
}

View File

@@ -1167,9 +1167,9 @@ u32 VIGetRetraceCount(void)
static u32 getCurrentHalfLine(void)
{
u32 verticalCount;
u32 previousVerticalCount;
u32 horizontalCount;
u32 previousVerticalCount;
u32 verticalCount;
verticalCount = __VIRegs[22] & 0x7FF;
for (;;) {
@@ -1180,7 +1180,7 @@ static u32 getCurrentHalfLine(void)
break;
}
}
return ((verticalCount - 1) * 2) + ((horizontalCount - 1) / CurrTiming->hlw);
return ((horizontalCount - 1) / CurrTiming->hlw) + ((verticalCount - 1) * 2);
}
static u32 getCurrentFieldEvenOdd(void)

View File

@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
u32 buffer32[0xFB00];
}; // 0x00
u32 size; // 0x3EC00
u32 offset; // 0x3EC04
u32 unk_0x3EC00;
u32 unk_0x3EC04;
BOOL allocated; // 0x3EC08
u8 unk_0x3EC0C[0x34];
} CDBCryptBuf;

View File

@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
goto open_result_ready;
open_location_ok:
if (CDBFSSDIsMounted()) {
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
} else {
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
}
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return err;
}
cryptBuf->offset = sizeof(CDBAttrBuf);
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
}
return CDB_ERROR_OK;
}
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
goto result_ready;
location_ok:
if (CDBFSSDIsMounted()) {
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
} else {
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
}
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
return result;
}
cryptBuf->offset = sizeof(CDBAttrBuf);
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
}
return CDB_ERROR_OK;
}
@@ -669,10 +669,9 @@ CDBErr CDBCryptBuffer(void* buffer, u32 size, void* iv, u32* processedSize, BOOL
CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32 size, u32* encryptedSize) {
CDBRecordFile* recordFile;
CDBErr err;
u32 dataSize;
u32 fileSize;
u32 dataSize;
u32 cryptSize;
u32 authenticatedSize;
int fileOffset;
u8 iv[0x10];
u8 wiiIdKey[0x40] ATTRIBUTE_ALIGN(64);
@@ -761,11 +760,10 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
if ((s32)record->file == 0) {
err = CDB_ERROR_27;
} else {
int position = CDBRecordFileTellData(record);
if (position < 0) {
fileOffset = CDBRecordFileTellData(record);
if (fileOffset < 0) {
err = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
fileOffset = position;
err = CDB_ERROR_OK;
}
}
@@ -812,9 +810,8 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
CDBGetWiiIdKey((char*)wiiIdKey);
CDBGetDeviceKey((char*)&wiiIdKey[12]);
CDBAttrClearSignature((CDBAttr*)buffer);
authenticatedSize = cryptSize + CDB_RECORD_BUFFER_SIZE;
NETHMACInit(&hmac, NETGetSHA1Interface(), wiiIdKey, 0x40);
NETHMACUpdate(&hmac, buffer, authenticatedSize);
NETHMACUpdate(&hmac, buffer, cryptSize + CDB_RECORD_BUFFER_SIZE);
NETHMACGetDigest(&hmac, digest);
memcpy(((CDBAttrBuf*)buffer)->signature.sha1Hmac, digest, sizeof(digest));
if (encryptedSize != 0) {

View File

@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) {
u32 unk = cryptBuf->size - cryptBuf->offset;
if (cryptBuf->size < unk) {
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
if (cryptBuf->unk_0x3EC00 < unk) {
unk = 0;
}
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
}
if (unk != 0) {
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
cryptBuf->offset += unk;
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
cryptBuf->unk_0x3EC04 += unk;
}
if (readSize != NULL) {
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
if (cryptBuf != NULL) {
switch (seek) {
case CDB_SEEK_BEGIN: {
cryptBuf->offset = sizeof(CDBAttrBuf);
cryptBuf->offset += offset;
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
cryptBuf->unk_0x3EC04 += offset;
break;
}
case CDB_SEEK_END: {
cryptBuf->offset = (cryptBuf->size - 1) - offset;
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
break;
}
case CDB_SEEK_CUR: {
cryptBuf->offset += offset;
cryptBuf->unk_0x3EC04 += offset;
break;
}
}
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
CDBCryptBuf* cryptBuf = record->cryptBuf;
if (cryptBuf != NULL) {
return cryptBuf->offset - sizeof(CDBAttrBuf);
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
}
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
}

View File

@@ -19,23 +19,15 @@ typedef struct HMACContext {
u8 key[64];
} HMACContext;
static inline void BeginDigest(HMACContext* context, u8 mask) {
u8 blockKey[64];
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
u8 innerKey[64];
u32 i;
u32 keyLength;
void* work = context->digestContext;
keyLength = context->keyLength;
for (i = 0; i < keyLength; ++i) blockKey[i] = context->key[i] ^ mask;
memset(blockKey + keyLength, mask, context->interface.blockSize - keyLength);
context->interface.init(work);
context->interface.update(work, blockKey, context->interface.blockSize);
}
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
void* work = context->digestContext;
const char* function = "NETHMACInit";
context->interface = *interface;
if (context->interface.contextSize > 96 || context->interface.blockSize > 64) {
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, __FUNCTION__);
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, function);
OSReport("specified interface needs too large workmemory.");
OSReport("\n");
return;
@@ -49,7 +41,11 @@ void NETHMACInit(HMACContext* context, const DigestInterface* interface, const v
context->interface.getDigest(work, context->key);
context->keyLength = context->interface.digestSize;
}
BeginDigest(context, 0x36);
keyLength = context->keyLength;
for (i=0; i<keyLength; ++i) innerKey[i] = context->key[i] ^ 0x36;
memset(innerKey + keyLength, 0x36, context->interface.blockSize - keyLength);
context->interface.init(context->digestContext);
context->interface.update(context->digestContext, innerKey, context->interface.blockSize);
}
void NETHMACUpdate(HMACContext* context, const void* data, u32 length) {
@@ -58,9 +54,16 @@ void NETHMACUpdate(HMACContext* context, const void* data, u32 length) {
void NETHMACGetDigest(HMACContext* context, void* digest) {
u8 innerDigest[64];
u8 outerKey[64];
u32 i;
u32 keyLength;
void* work = context->digestContext;
context->interface.getDigest(work, innerDigest);
BeginDigest(context, 0x5c);
keyLength = context->keyLength;
for (i=0; i<keyLength; ++i) outerKey[i] = context->key[i] ^ 0x5c;
memset(outerKey + keyLength, 0x5c, context->interface.blockSize - keyLength);
context->interface.init(context->digestContext);
context->interface.update(context->digestContext, outerKey, context->interface.blockSize);
context->interface.update(work, innerDigest, context->interface.digestSize);
context->interface.getDigest(work, digest);
}

View File

@@ -23,7 +23,8 @@ static int ReadHeaderChar(const NHTTPResponseInfo* response, NHTTPi_HDRBUFLIST**
}
static int LowerCase(int character) {
return ((character >= 'A') & (character <= 'Z')) ? character + 32 : character;
if((character>='A') & (character<='Z')) character+=32;
return character;
}
s32 NHTTPi_findNextLineHdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, s32* colon, s32* newlineLength) {
@@ -75,17 +76,15 @@ s32 NHTTPi_skipSpaceHdrRecvBuf(const NHTTPResponseInfo* response, s32 position,
s32 NHTTPi_compareTokenN_HdrRecvBuf(const NHTTPResponseInfo* response, s32 position, s32 limit, const char* token, s8 delimiter) {
NHTTPi_HDRBUFLIST* block;
s32 offset;
int character;
if (position < limit) {
FindHeaderBlock(response, position, &block, &offset);
character = ReadHeaderChar(response, &block, &offset);
while (LowerCase((s8)character) == LowerCase(*token)) {
if (*token == 0 || *token == ' ' || *token == delimiter || position == limit - 1) return 0;
character = ReadHeaderChar(response, &block, &offset);
++position;
++token;
}
s8 character;
if(position>=limit) return -1;
FindHeaderBlock(response,position,&block,&offset);
character=ReadHeaderChar(response,&block,&offset);
while(LowerCase(character)==LowerCase(*token)) {
if(*token==0 || *token==' ' || *token==delimiter || position==limit-1) return 0;
character=ReadHeaderChar(response,&block,&offset);
++position;
++token;
}
return -1;
}

View File

@@ -95,7 +95,7 @@ s32 NHTTPi_SocRecv_sub(NHTTPConnectionInfo* connection, s32 socket, void* data,
} else return result;
}
if(connection->recvBufDataLen!=0) {
length = (u32)length > connection->recvBufDataLen ? connection->recvBufDataLen : length;
if((u32)length>connection->recvBufDataLen) length=connection->recvBufDataLen;
NHTTPi_memcpy(data,buffer+connection->recvBufOffset,length);
connection->recvBufDataLen-=length;
if(connection->recvBufDataLen==0) {
@@ -168,7 +168,7 @@ s32 NHTTPi_SocSend_sub(s32 socket, const char* data, u32 length, s32 flags) {
return sent;
}
s32 NHTTPi_SocSend(const NHTTPRequestInfo* request, s32 socket, const void* data, s32 length, s32 flags) {
s32 NHTTPi_SocSend(NHTTPRequestInfo* request, s32 socket, const char* data, s32 length, s32 flags) {
s32 result;
SSLId ssl=request->sslId;
if(ssl>0) result=SSLWrite(ssl,data,length);

View File

@@ -82,7 +82,7 @@ s32 NHTTPi_ReceivedCallback(void* mutex, NHTTPConnectionInfo* connection);
void NHTTPi_NotifyCompletion(NHTTPConnectionInfo* connection);
void NHTTPi_SetVirtualContentLength(NHTTPConnectionInfo* connection, u32 length);
BOOL NHTTPi_isRecvBufFull(NHTTPResponseInfo* response, s32 offset);
s32 NHTTPi_SocSend(const NHTTPRequestInfo* request, s32 socket, const void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocSend(NHTTPRequestInfo* request, s32 socket, const void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocRecv(void* mutex, NHTTPRequestInfo* request, s32 socket, void* buffer, s32 length, s32 flags);
s32 NHTTPi_SocClose(void* mutex, NHTTPRequestInfo* request, s32 socket);
s32 NHTTPi_SocOpen(NHTTPRequestInfo* request);
@@ -986,16 +986,9 @@ static BOOL NHTTPi_ThreadParseHeaderProc(NHTTPThreadContext* context)
if (length > 0x100) context->keepAlive = FALSE;
else if (length > 0)
{
struct TokenMatch {
BOOL matched;
};
struct TokenMatch match = {FALSE};
if (NHTTPi_compareTokenN_HdrRecvBuf(response, offset, offset + length, "Keep-Alive", 0) == 0)
{
match.matched = TRUE;
context->keepAlive = match.matched;
}
else context->keepAlive = match.matched;
context->keepAlive = TRUE;
else context->keepAlive = FALSE;
}
else context->keepAlive = FALSE;
}

View File

@@ -120,11 +120,10 @@ NWC24Err NWC24iMinutesToOSCalendarTime(OSCalendarTime* calendar, s32 minutes) {
NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* date) {
BOOL isLeapYear;
s32 days;
const u16 year = date->year;
isLeapYear = 0;
calendar->year = year;
calendar->year = date->year;
calendar->mon = date->month - 1;
calendar->mday = date->day;
calendar->hour = date->hour;
@@ -133,7 +132,7 @@ NWC24Err NWC24iDateToOSCalendarTime(OSCalendarTime* calendar, const NWC24Date* d
calendar->msec = 0;
calendar->usec = 0;
calendar->yday = date->day + DAYS_OF_YEAR[date->month - 1] - 1;
if (((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)) {
if (((date->year % 4 == 0 && date->year % 100 != 0) || date->year % 400 == 0)) {
isLeapYear = 1;
}
if (isLeapYear && date->month > 2) {
@@ -177,8 +176,7 @@ s32 ConvertDateToDays(u16 year, u8 month, u8 day) {
}
validDate:
daysOfYear = day - 1;
daysOfYear += DAYS_OF_YEAR[month - 1];
daysOfYear = day - 1 + DAYS_OF_YEAR[month - 1];
if (month >= 3) {
isLeapYear = 0;
if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) {
@@ -208,41 +206,31 @@ void ConvertDaysToDate(u16* year, u8* month, u8* day, s32 days) {
for (;;) {
u16 currentYear = *year;
s32 previousDays = days;
BOOL leapYear = TRUE;
BOOL commonLeapYear = FALSE;
if (currentYear % 4 == 0 && currentYear % 100 != 0) {
commonLeapYear = TRUE;
}
if (!commonLeapYear && currentYear % 400 != 0) {
leapYear = FALSE;
}
BOOL leapYear = (currentYear % 4 == 0 && currentYear % 100 != 0) || currentYear % 400 == 0;
days -= 365 + (leapYear != FALSE);
if (days < 0) {
days = previousDays;
break;
}
*year += 1;
continue;
*year = *year + 1;
}
for (;;) {
s32 previousDays;
u8 currentMonth;
const u8* parsedMonth = month;
previousDays = days;
currentMonth = *parsedMonth;
if (currentMonth == 2 && IsLeapYear(*year)) {
days -= 29;
s32 previousDays = days;
if (*month == 2) {
BOOL leapYear = IsLeapYear(*year);
if (leapYear) {
days -= 29;
} else {
days -= DAYS_OF_MONTH[*month - 1];
}
} else {
days -= DAYS_OF_MONTH[currentMonth - 1];
days -= DAYS_OF_MONTH[*month - 1];
}
if (days >= 0) {
*month += 1;
} else {
days = previousDays;
break;
if (days < 0) {
*day += previousDays;
return;
}
*month = *month + 1;
}
*day += days;
}

View File

@@ -64,7 +64,7 @@ static NWC24Err ClearMBCEntry(MBCHeader* header, NWC24File* file, u32 offset);
static NWC24Err MountVFMBox(NWC24MBoxType type);
static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entry);
static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* msg) NO_INLINE;
BOOL NWC24iIsMsgObjReadable(MBCEntry* entry) NO_INLINE;
BOOL NWC24iIsMsgObjReadable(const MBCEntry* entry) NO_INLINE;
NWC24Err NWC24CreateVF(const char* path, u32 size);
static inline NWC24Err MakeCtrlPath(char* path, NWC24MBoxType type) {
@@ -221,7 +221,7 @@ NWC24Err NWC24GetMsgObj(NWC24MsgObj* msg, NWC24MBoxType type, u32 id) {
return result;
}
BOOL NWC24iIsMsgObjReadable(MBCEntry* entry) {
BOOL NWC24iIsMsgObjReadable(const MBCEntry* entry) {
if (!(entry->type & 0x200000))
return FALSE;
if (entry->type & 0xFE000000)
@@ -555,14 +555,14 @@ NWC24Err NWC24iMBoxFlushHeader(NWC24MBoxType type) {
return result != NWC24_OK ? result : closeResult;
}
static inline void GetOldestMsgId(const MBCHeader* header, volatile u32* id) {
static inline void GetOldestMsgId(const MBCHeader* header, u32* id) {
*id = header->oldestId;
}
NWC24Err NWC24iMBoxCheck(NWC24MBoxType type, u32 size) {
u32 required;
struct {
volatile u32 oldestId;
u32 oldestId;
MBCHeader* header;
} mailbox;
NWC24Err err;

View File

@@ -231,11 +231,11 @@ static NWC24Err QEncode(char* encoded, u32 encodedCapacity, u32* encodedSize, u8
}
static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, char* encoded, u32 encodedSize, u32* encodedSizeOut, int flags) {
u32 encodedOffset;
u32 decodedOffset = 0;
u8 value = 0;
u32 encodedOffset;
char* input;
char* output;
u8 value = 0;
NWC24Err result = NWC24_OK;
if (decoded == NULL)
@@ -255,7 +255,7 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
input = encoded;
output = decoded;
for (encodedOffset = 0; encodedOffset < encodedSize; encodedOffset++) {
if (decodedOffset >= decodedCapacity) {
if (decodedCapacity <= decodedOffset) {
result = NWC24_ERR_OVERFLOW;
break;
}
@@ -265,15 +265,15 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
decodedOffset++;
} else if (*input == '=' && encodedOffset + 2 < encodedSize) {
BOOL validHex = TRUE;
input++;
encodedOffset++;
if (*input == ' ' || *input == '\t') {
char* next = input + 1;
u32 inputAfterEqual = encodedOffset + 1;
char* current = ++input;
if (*current == ' ' || *current == '\t') {
char* next = current + 1;
u32 scan = 1;
while (encodedOffset + scan + 1 < encodedSize) {
while (inputAfterEqual + scan + 1 < encodedSize) {
if (*next == '\r' && next[1] == '\n') {
encodedOffset += scan;
input = next;
inputAfterEqual += scan;
current = next;
break;
}
if (*next != ' ' && *next != '\t') {
@@ -283,27 +283,29 @@ static NWC24Err QDecode(char* decoded, u32 decodedCapacity, u32* decodedSize, ch
scan++;
}
}
if (*input == '\r' && input[1] == '\n') {
input += 2;
encodedOffset++;
if (*current == '\r' && current[1] == '\n') {
current += 2;
encodedOffset = inputAfterEqual + 1;
input = current;
} else {
int high = Util_xtoi(*input);
int high = Util_xtoi(*current);
int low;
if (high >= 0) {
value = (high & 0x0F) << 4;
}
if (high < 0) { validHex = FALSE; }
low = Util_xtoi(input[1]);
low = Util_xtoi(current[1]);
if (low >= 0) {
value |= low & 0x0F;
}
if (low < 0) { validHex = FALSE; }
input += 2;
current += 2;
if (validHex) {
*output++ = (char)value;
decodedOffset++;
}
encodedOffset++;
encodedOffset = inputAfterEqual + 1;
input = current;
}
} else {
*output++ = *input++;
@@ -499,42 +501,22 @@ static BOOL CopyWithoutLinearWhiteSpaces(char* output, int* outputSize, char* in
}
static inline char* FindMarker(char* input, u32 size, const char* marker) {
u32 markerLength = Mail_strlen(marker);
u32 offset;
u32 markerLength;
markerLength = Mail_strlen(marker);
for (offset = 0; offset <= size; offset++) {
char* current = input + offset;
if (Mail_strncmp(current, marker, markerLength) == 0)
return input + offset;
return current;
}
return NULL;
}
static inline char* FindMarkerAfterPrefix(char* input, u32 size, u32 prefix, const char* marker) {
char* current;
u32 markerLength = Mail_strlen(marker);
char* current = input + prefix;
u32 offset;
u32 markerLength;
markerLength = Mail_strlen(marker);
current = input + prefix;
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(current, marker, markerLength) == 0) {
return input + prefix + offset;
}
current++;
}
return NULL;
}
static inline char* FindEncodingMarker(char* encoded, u32 size) {
u32 offset;
u32 markerLength;
const char* marker;
char* current;
marker = "?";
markerLength = Mail_strlen(marker);
current = encoded;
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(current, marker, markerLength) == 0) {
return encoded + offset;
return input + offset + prefix;
}
current++;
}
@@ -542,28 +524,14 @@ static inline char* FindEncodingMarker(char* encoded, u32 size) {
}
static inline NWC24Err ExtractWordEncoding(char* encoding, u32* encodingSize, char* encoded, u32 encodedSize) {
char* delimiter = FindEncodingMarker(encoded, encodedSize);
char* delimiter = FindMarkerAfterPrefix(encoded, encodedSize, 0, "?");
if (delimiter == NULL) { return NWC24_ERR_INVALID_VALUE; }
*encoding = delimiter[1];
*encodingSize = 2;
return NWC24_OK;
}
static inline BOOL IsLinearWhitespaceOnly(char* text, u32 size) {
u32 offset;
BOOL whitespaceOnly;
whitespaceOnly = TRUE;
for (offset = 0; offset < size && text[offset] != '\0'; offset++) {
char value = text[offset];
if (value != ' ' && value != '\t' && value != '\r' && value != '\n') {
whitespaceOnly = FALSE;
}
}
return whitespaceOnly;
}
static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded, u32 decodedCapacity, u32* decodedSize, char* encoded,
u32 encodedSize, u32* encodedSizeOut) {
char encoding;
char* encodedWord;
u32 consumedSize;
u32 decodedLength;
@@ -580,6 +548,7 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
if (encodedSizeOut != NULL) { *encodedSizeOut = 0; }
encodedWord = FindMarker(encoded, encodedSize, "=?");
if (encodedWord == encoded) {
char encoding;
result = ExtractCharset(charsetData, charsetCapacity, &consumedSize, encodedWord, encodedSize);
if (result != NWC24_OK) { return result; }
encodedLength = consumedSize;
@@ -605,7 +574,15 @@ static NWC24Err DecodeWord(char* charsetData, u32 charsetCapacity, char* decoded
}
decodedLength = localSize;
if (encodedWord != NULL) {
if (IsLinearWhitespaceOnly(decoded, localSize)) {
BOOL whitespaceOnly = TRUE;
u32 offset;
for (offset = 0; offset < localSize && decoded[offset] != '\0'; offset++) {
char value = decoded[offset];
if (value != ' ' && value != '\t' && value != '\r' && value != '\n') {
whitespaceOnly = FALSE;
}
}
if (whitespaceOnly) {
*decoded = '\0';
decodedLength = 1;
}
@@ -718,9 +695,8 @@ static NWC24Err ExtractCharset(char* charset, u32 charsetCapacity, u32* charsetS
return NWC24_OK;
}
static inline char* FindMarkerOffsetPrefix(char* input, u32 size, u32 prefix, const char* marker) {
u32 markerLength = Mail_strlen(marker);
u32 offset;
u32 markerLength;
markerLength = Mail_strlen(marker);
for (offset = 0; offset <= size; offset++) {
if (Mail_strncmp(input + offset + prefix, marker, markerLength) == 0) {
return input + prefix + offset;

View File

@@ -202,40 +202,33 @@ static inline NWC24Err WriteMBNoReplyField(NWC24MsgObjPrivate* msg) {
return err;
}
typedef struct {
u32 flags;
char* buffer;
} MBFieldWork;
static inline NWC24Err WriteMBRegDateField(NWC24MsgObjPrivate* msg) {
MBFieldWork field;
static inline NWC24Err WriteMBRegDateField(NWC24MsgObjPrivate* msg, u32 flags) {
NWC24Err err;
s32 length;
field.flags = msg->msgBoardFlags.raw & 0xFFFF;
if (!field.flags)
char* buffer;
if (!flags)
return NWC24_OK;
field.buffer = NWC24WorkP->stringWork;
Mail_memset(field.buffer, 0, 1024);
Mail_sprintf(field.buffer, "X-Wii-MB-RegDate: %04X\r\n", field.flags);
length = STD_strnlen(field.buffer, 1024);
err = NWC24FWrite(field.buffer, length, m_pFile);
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_sprintf(buffer, "X-Wii-MB-RegDate: %04X\r\n", flags);
length = STD_strnlen(buffer, 1024);
err = NWC24FWrite(buffer, length, m_pFile);
if (err == NWC24_OK)
msg->length += length;
return err;
}
static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg) {
MBFieldWork field;
static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg, u32 flags) {
NWC24Err err;
s32 length;
field.flags = msg->msgBoardFlags.raw & 0xFF0000;
if (!field.flags)
char* buffer;
if (!flags)
return NWC24_OK;
field.buffer = NWC24WorkP->stringWork;
Mail_memset(field.buffer, 0, 1024);
Mail_sprintf(field.buffer, "X-Wii-MB-Delay: %02X\r\n", field.flags >> 16);
length = STD_strnlen(field.buffer, 1024);
err = NWC24FWrite(field.buffer, length, m_pFile);
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_sprintf(buffer, "X-Wii-MB-Delay: %02X\r\n", flags >> 16);
length = STD_strnlen(buffer, 1024);
err = NWC24FWrite(buffer, length, m_pFile);
if (err == NWC24_OK)
msg->length += length;
return err;
@@ -313,8 +306,8 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
CHECK_WRITE(WriteIconNewField(msg));
if (msg->msgBoardFlags.raw != 0) {
CHECK_WRITE(WriteMBNoReplyField(msg));
CHECK_WRITE(WriteMBRegDateField(msg));
CHECK_WRITE(WriteMBDelayField(msg));
{ u16 dateFlags = msg->msgBoardFlags.raw; CHECK_WRITE(WriteMBRegDateField(msg, dateFlags)); }
CHECK_WRITE(WriteMBDelayField(msg, msg->msgBoardFlags.raw & 0xFF0000));
}
}
CHECK_WRITE(WriteExtraFields(msg));
@@ -430,17 +423,14 @@ static NWC24Err CheckMsgObject(const NWC24MsgObjPrivate* msg) {
return NWC24_OK;
}
static inline u32 Base64StorageSize(const u32* byteCount) {
return (*byteCount * 4 + 2) / 3 + *byteCount / 57 * 2 + 4;
}
static NWC24Err CheckMsgBoxSpace(const NWC24MsgObjPrivate* msg, NWC24MBoxType type) {
u32 total = 0;
u32 textSize = 0;
s32 index;
NWC24Err err;
for (index = 0; index < msg->numAttached; ++index) {
total += Base64StorageSize(&msg->attachedSize[index]);
u32 size = msg->attachedSize[index];
total += (size * 4 + 2) / 3 + size / 57 * 2 + 4;
}
switch (msg->encoding) {
case NWC24_ENC_7BIT:
@@ -769,14 +759,19 @@ static NWC24Err WriteMIMEAttachHeader(NWC24MsgObjPrivate* msg, u32 index) {
char* buffer;
const char* mime;
const char* suffix;
int mimeLength;
s32 typeLength, encodingLength, dispositionLength, mimeLength;
s32 first, second, third, total;
NWC24Err err;
Mail_memset(NWC24WorkP->stringWork, 0, 1024);
buffer = NWC24WorkP->stringWork;
mime = NWC24GetMIMETypeStr(msg->attachedType[index]);
suffix = NWC24iGetMIMETypeSuffix(msg->attachedType[index]);
mimeLength = (Mail_strlen(ContentTypeA) + Mail_strlen(ContentTxEncA)) + Mail_strlen(ContentDispA) + Mail_strlen(mime) + 4;
encodingLength = Mail_strlen(ContentTxEncA);
typeLength = Mail_strlen(ContentTypeA);
dispositionLength = Mail_strlen(ContentDispA);
typeLength += encodingLength;
mimeLength = Mail_strlen(mime);
mimeLength = (dispositionLength + typeLength) + mimeLength + 4;
if (mimeLength >= 1024)
return NWC24_ERR_NOMEM;
first = Mail_sprintf(buffer, (char*)ContentTypeA, mime, (char)('a' + index), msg->msgId, suffix);

View File

@@ -19,7 +19,7 @@ static inline NWC24Err SelectMBox(const NWC24MsgObjPrivate* msg, NWC24MBoxType*
}
NWC24Err NWC24ReadMsgField(const NWC24MsgObj* msg, char* fieldName, u8* output, u32 capacity) {
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24File file;
NWC24FileStream stream;
char* field;
@@ -268,7 +268,7 @@ NWC24Err NWC24ReadMsgMBOptOutFlag(const NWC24MsgObj* msg, BOOL* optOut, u32* app
}
NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacity) {
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24MBoxType type;
NWC24File file;
NWC24FileStream stream;
@@ -312,7 +312,7 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
}
NWC24Err NWC24ReadMsgSubject(const NWC24MsgObj* msg, char* subject, u32 capacity) {
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24MBoxType type;
NWC24File file;
u32 length;
@@ -386,14 +386,14 @@ NWC24Err NWC24ReadMsgTextEx(const NWC24MsgObj* msg, char* text, u32 capacity, ch
}
static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capacity, char* charset, u32 charsetCapacity, NWC24Encoding* encoding) {
u32 length;
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24MBoxType type;
NWC24File file;
NWC24Err result, closeResult;
NWC24Err overflow = NWC24_OK;
char* buffer;
u32 length;
u32 decodedSize;
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
char* buffer;
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
return NWC24_ERR_LIB_NOT_OPENED;
if (!(privateMsg->type & 0x200))
@@ -408,15 +408,13 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
return result;
}
length = privateMsg->textSize;
switch (length) {
case 0: length = privateMsg->text.size; break;
default: break;
}
if (length == 0)
length = privateMsg->text.size;
if (length == 0)
return NWC24_ERR_NULL;
if (length > capacity - 1) {
length = capacity - 1;
overflow = NWC24_ERR_OVERFLOW;
length = capacity - 1;
}
result = NWC24iMBoxOpenStoredMsg(type, privateMsg->msgId, &file);
switch (result) {
@@ -452,16 +450,13 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
result = NWC24FRead(text, length, &file);
text[length] = 0;
break;
case 2: {
NWC24Err decodeResult;
case 2:
decodedSize = 0;
decodeResult = ReadBase64Data(&file, &privateMsg->text, (u8*)text, length, &decodedSize);
if (decodeResult == NWC24_OK && decodedSize != privateMsg->textSize)
decodeResult = NWC24_ERR_FORMAT;
result = decodeResult;
result = ReadBase64Data(&file, &privateMsg->text, (u8*)text, length, &decodedSize);
if (result == NWC24_OK && decodedSize != privateMsg->textSize)
result = NWC24_ERR_FORMAT;
text[length] = 0;
break;
}
case 3:
result = ReadQPText(privateMsg, &file, text, length);
break;
@@ -473,15 +468,15 @@ static NWC24Err ReadMsgTextInternal(const NWC24MsgObj* msg, char* text, u32 capa
}
close:
closeResult = NWC24iMBoxCloseMsg(&file);
if (result != NWC24_OK)
closeResult = result;
if (closeResult != NWC24_OK)
overflow = closeResult;
return overflow;
if (result == NWC24_OK)
result = closeResult;
if (result == NWC24_OK)
result = overflow;
return result;
}
NWC24Err NWC24ReadMsgAttached(const NWC24MsgObj* msg, u32 index, u8* output, u32 capacity) {
NWC24MsgObjPrivate* privateMsg = (NWC24MsgObjPrivate*)msg;
const NWC24MsgObjPrivate* privateMsg = (const NWC24MsgObjPrivate*)msg;
NWC24File file;
NWC24MBoxType type;
u32 decodedSize;
@@ -510,8 +505,11 @@ NWC24Err NWC24ReadMsgAttached(const NWC24MsgObj* msg, u32 index, u8* output, u32
}
decodedSize = 0;
result = ReadBase64Data(&file, &privateMsg->attached[index], output, capacity, &decodedSize);
if (result == NWC24_OK) {
if (decodedSize != ((const NWC24MsgObjPrivate*)msg)->attachedSize[index]) result = NWC24_ERR_FORMAT;
switch (result) {
case NWC24_OK:
if (decodedSize != privateMsg->attachedSize[index]) { result = NWC24_ERR_FORMAT; }
break;
default: break;
}
closeResult = NWC24iMBoxCloseMsg(&file);
if (result == NWC24_OK)

View File

@@ -743,16 +743,15 @@ NWC24Err NWC24iSetMsgSubjectQP(NWC24MsgObj* msg, const u16* subject, u32 subject
u32 workSize, NWC24Charset charset, char* charsetName) {
u32 workHalf;
u32 sourceOffset;
u32 charsetLength;
u32 secondSize;
u8* second;
u32 subjectLength;
u32 lineLength;
u32 secondSize;
u32 outputLength;
u32 total;
u32 combinedLength;
u32 i;
u32 outputLength;
u32 firstCharsetLength;
u32 charsetLength;
NWC24Err result;
secondSize = workSize - (workSize >> 1);
@@ -771,8 +770,8 @@ NWC24Err NWC24iSetMsgSubjectQP(NWC24MsgObj* msg, const u16* subject, u32 subject
work[i] = ' ';
}
}
firstCharsetLength = strlen(charsetName);
NWC24iDetectBreakPoint(&lineLength, charset, work, subjectLength, (0x38 - firstCharsetLength) / 3);
charsetLength = strlen(charsetName);
NWC24iDetectBreakPoint(&lineLength, charset, work, subjectLength, (0x38 - charsetLength) / 3);
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'Q', work, lineLength);
switch (result) {
default:
@@ -817,10 +816,9 @@ done:
NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 subjectSize, NWC24EncodingRegion region, u16 alternative, u8* work,
u32 workSize, NWC24Charset charset, char* charsetName) {
const u8* encodedInput = work;
u8* second;
u32 secondSize;
u32 workHalf;
u32 secondSize;
u8* second;
u32 subjectLength;
u32 lineLength;
u32 sourceOffset;
@@ -829,23 +827,19 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
u32 charsetLength;
NWC24Err result;
second = work + (workSize >> 1);
secondSize = workSize - (workSize >> 1);
workHalf = workSize >> 1;
secondSize = workSize - workHalf;
second = work + workHalf;
charsetLength = strlen(charsetName);
lineLength = ((0x36 - charsetLength) * 3) >> 2;
if (lineLength > (workSize >> 1)) {
if (lineLength > workHalf) {
result = NWC24_ERR_OVERFLOW;
} else {
workHalf = lineLength + 1;
subjectLength = subjectSize;
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject, &subjectLength, charsetName, 0x40, region, alternative);
if (result != NWC24_OK) {
switch (result) {
case NWC24_ERR_OVERFLOW: break;
default: goto done;
}
}
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
switch (result) { case NWC24_OK: case NWC24_ERR_OVERFLOW: break; default: goto done; }
result = NWC24EncodeWord(second, secondSize, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
switch (result) { case NWC24_OK: break; default: goto done; }
{
sourceOffset = subjectLength;
@@ -855,7 +849,7 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
charsetLength = strlen(charsetName);
lineLength = (((0x3E - charsetLength) * 3) >> 2) + 1;
total = outputLength - 1;
for (; sourceOffset < subjectSize;) {
for (; sourceOffset < subjectSize; sourceOffset += subjectLength) {
subjectLength = subjectSize - sourceOffset;
workHalf = lineLength;
if (secondSize - total < 3) {
@@ -867,15 +861,9 @@ NWC24Err NWC24iSetMsgSubjectBase64(NWC24MsgObj* msg, const u16* subject, u32 sub
second[total++] = ' ';
result = NWC24iConvertFromInternalEncoding(work, &workHalf, subject + sourceOffset, &subjectLength, charsetName, 0x40, region,
alternative);
if (result != NWC24_OK) {
switch (result) {
case NWC24_ERR_OVERFLOW: break;
default: goto done;
}
}
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', (u8*)encodedInput, workHalf - 1);
switch (result) { case NWC24_OK: case NWC24_ERR_OVERFLOW: break; default: goto done; }
result = NWC24EncodeWord(second + total, secondSize - total, &outputLength, charsetName, 0x40, 'B', work, workHalf - 1);
switch (result) { case NWC24_OK: break; default: goto done; }
sourceOffset += subjectLength;
total = total + outputLength - 1;
}
result = NWC24SetMsgSubject(msg, (char*)second, total);

View File

@@ -138,9 +138,9 @@ int SOGetSockName(int socket, void* address) {
int size;
int result;
s32 rm;
NameRequest* request;
SOSockAddr* reply;
SOSockAddr* addr;
SOSockAddr* reply;
NameRequest* request;
addr=address;
if((result=SOiPrepare(NULL,&rm))==0) {
if(!addr || addr->len>8 || addr->len<8) result=-28;

View File

@@ -47,130 +47,95 @@ s32 SOGetHostID(void) {
return address;
}
static inline int GetHostReply(const char* name, s32* rm, SOHostEnt** host) {
SOHostEnt* SOGetHostByName(const char* name) {
HostReply* reply;
int length;
char* request;
int result;
int size;
if (!name) return -28;
length = strlen(name);
size = (length + 32) & ~31;
request = SOiAlloc(12, size);
reply = SOiGetSysWork()->host;
if (!request) return -49;
strcpy(request, name);
result = IOS_Ioctl(*rm, 17, request, length + 1, reply, 0x460);
if (result >= 0) {
int displacement = (int)reply->nameStorage - (int)reply->host.name;
u8** address = reply->addresses;
while (*address) { *address += displacement; ++address; }
reply->host.aliases = (char**)((u8*)reply->host.aliases + displacement);
*host = &reply->host;
reply->host.name += displacement;
reply->host.addrList = (u8**)((u8*)reply->host.addrList + displacement);
}
SOiFree(12, request, size);
return result;
}
SOHostEnt* SOGetHostByName(const char* name) {
SOHostEnt* host = NULL;
int length;
SOHostEnt* host;
s32 rm;
int result;
if ((result = SOiPrepare(NULL, &rm)) == 0) {
result = GetHostReply(name, &rm, &host);
SOiConclude(NULL, result);
char* request;
host = NULL;
if((result=SOiPrepare(NULL,&rm))==0) {
if(!name) result=-28;
else {
length=strlen(name);
size=(length+32)&~31;
request=SOiAlloc(12,size);
reply=SOiGetSysWork()->host;
if(!request) result=-49;
else {
strcpy(request,name);
result=IOS_Ioctl(rm,17,request,length+1,reply,0x460);
if(result>=0) {
int displacement=(int)reply->nameStorage-(int)reply->host.name;
u8** address=reply->addresses;
while(*address) { *address+=displacement; ++address; }
reply->host.aliases=(char**)((u8*)reply->host.aliases+displacement);
host=&reply->host;
reply->host.name+=displacement;
reply->host.addrList=(u8**)((u8*)reply->host.addrList+displacement);
}
SOiFree(12,request,size);
}
}
SOiConclude(NULL,result);
}
return host;
}
static inline int NameSize(const char* name) {
if (name == NULL) {
return 0;
} else {
return strlen(name) + 1;
}
}
static inline int NameLength(const char* name) {
if (name == NULL) {
return 0;
} else {
return strlen(name);
}
}
static inline int ServiceSize(const char* node, const char* service) {
if (service == NULL) {
return 0;
} else {
return strlen(node) + 1;
}
}
static inline int GetAddressReply(const char* nodeName, const char* servName, const SOAddrInfo* hints,
SOAddrInfo** resultInfo, s32* rm) {
SOAddrInfo* requestHints;
AddrInfoRequest* request;
char* service;
int nodeLength;
AddrInfoReply* reply;
int size;
char* node;
int serviceLength;
int result;
serviceLength = ServiceSize(nodeName, servName);
nodeLength = NameSize(nodeName);
size=(((nodeLength+31)&~31)+((serviceLength+31)&~31)+95)&~31;
request=SOiAlloc(12,size);
if(!request) result=-49;
else {
reply=SOiAlloc(10,0x840);
if(!reply) { SOiFree(12,request,size); result=-49; }
else {
node=(char*)request->storage;
service=node+((NameSize(nodeName)+31)&~31);
requestHints=(SOAddrInfo*)(service+((ServiceSize(nodeName, servName)+31)&~31));
if(nodeName) strcpy(node,nodeName);
request->vectors[0].base=nodeName ? (u8*)node : NULL;
request->vectors[0].length=NameLength(nodeName);
if(servName) strcpy(service,servName);
request->vectors[1].base=servName ? (u8*)service : NULL;
request->vectors[1].length=NameLength(servName);
if(hints) memcpy(requestHints,hints,32);
else memset(requestHints,0,32);
if(requestHints->family==0) requestHints->family=2;
if(requestHints->family==23) {
*resultInfo=NULL; result=-68; SOiFree(10,reply,0x840);
} else {
request->vectors[2].base=(u8*)requestHints; request->vectors[2].length=32;
request->vectors[3].base=(u8*)reply; request->vectors[3].length=0x834;
result=IOS_Ioctlv(*rm,24,3,1,request->vectors);
if(result>=0) {
SOAddrInfo* entry=reply->entries;
u8* address=reply->addresses;
*resultInfo=entry;
while(entry) {
entry->addr=address;
if(entry->next) entry->next=entry+1;
entry=entry->next;
address+=28;
}
} else { *resultInfo=NULL; SOiFree(10,reply,0x840); }
}
SOiFree(12,request,size);
}
}
return result;
}
static int NameSize(const char* name) { return name ? strlen(name)+1 : 0; }
int SOGetAddrInfo(const char* nodeName, const char* servName, const SOAddrInfo* hints, SOAddrInfo** resultInfo) {
s32 rm;
int result;
if ((result = SOiPrepare(NULL, &rm)) == 0) {
result = GetAddressReply(nodeName, servName, hints, resultInfo, &rm);
result = SOiConclude(NULL, result);
int result,size;
AddrInfoRequest* request;
AddrInfoReply* reply;
char* node;
char* service;
SOAddrInfo* requestHints;
if((result=SOiPrepare(NULL,&rm))==0) {
size=(((NameSize(nodeName)+31)&~31)+((servName ? strlen(nodeName)+32 : 31)&~31)+95)&~31;
request=SOiAlloc(12,size);
if(!request) result=-49;
else {
reply=SOiAlloc(10,0x840);
if(!reply) { SOiFree(12,request,size); result=-49; }
else {
node=(char*)request->storage;
service=node+((NameSize(nodeName)+31)&~31);
requestHints=(SOAddrInfo*)(service+((servName ? strlen(nodeName)+32 : 31)&~31));
if(nodeName) strcpy(node,nodeName);
request->vectors[0].base=nodeName ? (u8*)node : NULL;
request->vectors[0].length=nodeName ? strlen(nodeName) : 0;
if(servName) strcpy(service,servName);
request->vectors[1].base=servName ? (u8*)service : NULL;
request->vectors[1].length=servName ? strlen(servName) : 0;
if(hints) memcpy(requestHints,hints,32);
else memset(requestHints,0,32);
if(requestHints->family==0) requestHints->family=2;
if(requestHints->family==23) {
*resultInfo=NULL; result=-68; SOiFree(10,reply,0x840);
} else {
request->vectors[2].base=(u8*)requestHints; request->vectors[2].length=32;
request->vectors[3].base=(u8*)reply; request->vectors[3].length=0x834;
result=IOS_Ioctlv(rm,24,3,1,request->vectors);
if(result>=0) {
SOAddrInfo* entry=reply->entries;
u8* address=reply->addresses;
*resultInfo=entry;
while(entry) {
entry->addr=address;
if(entry->next) entry->next=entry+1;
entry=entry->next;
address+=28;
}
} else { *resultInfo=NULL; SOiFree(10,reply,0x840); }
}
SOiFree(12,request,size);
}
}
result=SOiConclude(NULL,result);
}
return result;
}

View File

@@ -17,19 +17,14 @@ typedef struct SocketOption {
u8 value[20];
} SocketOption;
typedef union InterfaceCommand {
struct { int level; int option; };
u8 bytes[32];
} InterfaceCommand;
typedef union InterfaceLength {
int length;
u8 bytes[32];
} InterfaceLength;
typedef struct InterfaceCommand { int level; int option; } InterfaceCommand;
typedef struct InterfaceOption {
IOSIoVector vectors[4];
InterfaceCommand command;
union {
InterfaceCommand command;
u8 commandBlock[32];
};
union {
int length;
u8 lengthBlock[32];
@@ -39,7 +34,10 @@ typedef struct InterfaceOption {
typedef struct InterfaceSetting {
IOSIoVector vectors[4];
InterfaceCommand command;
union {
InterfaceCommand command;
u8 commandBlock[32];
};
u8 value[1];
} InterfaceSetting;
@@ -98,10 +96,10 @@ static int OptionLength(int* length) {
int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int* length) {
s32 rm;
int temporary;
int size;
int result;
InterfaceOption* request;
const InterfaceCommand* command;
int result;
int size;
InterfaceCommand* command;
int* returnedLength;
u8* reply;
if ((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
@@ -112,9 +110,9 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
if(!request) result=-49;
else {
command=&request->command;
request->command.level=level; request->command.option=option;
returnedLength=&((InterfaceLength*)(command + 1))->length;
reply=(u8*)((InterfaceLength*)returnedLength + 1);
command->level=level; command->option=option;
returnedLength=&request->length;
reply=request->value;
*returnedLength=OptionLength(length);
request->vectors[0].base=(u8*)command;
request->vectors[0].length=8;
@@ -140,9 +138,9 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
int SOSetInterfaceOpt(void* interface, int level, int option, const void* value, int length) {
s32 rm;
int temporary;
int size;
int result;
InterfaceSetting* request;
int result;
int size;
InterfaceCommand* command;
u8* reply;
if ((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
@@ -154,7 +152,7 @@ int SOSetInterfaceOpt(void* interface, int level, int option, const void* value,
else {
command=&request->command;
command->level=level; command->option=option;
reply=(u8*)(command + 1);
reply=request->value;
if(value) memcpy(reply,value,length);
else memset(reply,0,length);
request->vectors[0].base=(u8*)command; request->vectors[0].length=8;

View File

@@ -1,4 +1,3 @@
#define BS2_MACH_VOLATILE_DVD_STATE
#define BS2_MACH_FIVE_ARG_READ
#include "BS2/BS2.h"
#include "BS2/BS2BringUp.h"
@@ -65,7 +64,7 @@ volatile int CacheFailed = 0;
volatile int RegionValid = 0;
volatile int NandPending = 0;
vu32 CancelNand = 0;
vu32 LowReadResult = 0;
u32 LowReadResult = 0;
u32 CacheCommandComplete = 0;
u32 AudioBufferUnconfigured = 0;
u64 ResetTime = 0;
@@ -578,7 +577,7 @@ void BS2StartGame() {
u32 (*entry)(void);
StartingGame = TRUE;
while (CoverBlock.state != DVD_STATE_IDLE) {
while (DVDGetCommandBlockStatus(&CoverBlock) != DVD_STATE_IDLE) {
}
BS2Report("BS2StartGame(1)\n");
@@ -678,6 +677,8 @@ void BS2StartGame() {
LowReadResult = 0;
DVDLowReadDiskID(&DiskID, (DVDLowCallback)callback);
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
status = LowReadResult;
@@ -692,6 +693,8 @@ void BS2StartGame() {
LowReadResult = 0;
DVDLowRequestError((DVDLowCallback)callback);
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {
@@ -726,6 +729,8 @@ disk_done:
(DVDLowCallback)callback);
}
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
status = LowReadResult;
@@ -743,6 +748,8 @@ disk_done:
LowReadResult = 0;
DVDLowRequestError((DVDLowCallback)callback);
while (LowReadResult == 0) {
BOOL enabled = OSDisableInterrupts();
OSRestoreInterrupts(enabled);
}
driveError = DVDLowGetImmBufferReg() & 0xFF000000;
if (driveError == 0x01000000 || (driveError = DVDLowGetImmBufferReg() & 0xFF000000) == 0x03000000) {

View File

@@ -9,10 +9,14 @@
#include <string.h>
typedef struct UpdateThreadData {
OSThread thread;
u8 stack[4096];
} UpdateThreadData;
static u32 Flags0[BS2_UPDATE_ENTRY_COUNT] = {0};
static u32 Flags1[BS2_UPDATE_ENTRY_COUNT] = {0};
static OSThread Thread = {0};
static u8 ThreadStack[4096] = {0};
static UpdateThreadData Thread = {0};
static BS2UpdateHeader UpdateHeader0 ALIGN32 = {0};
static BS2UpdateHeader UpdateHeader1 ALIGN32 = {0};
@@ -35,7 +39,7 @@ static u32 UpdateImportResult = 0;
u32 StartUpdate = 0;
u32 CancelUpdate = 0;
static u32 UpdateProgress = 0;
static volatile s32 rc = 0;
static s32 rc = 0;
static u64 VersionIOS = 0;
static u32 VersionMEM2 = 0;
static u32 VersionES = 0;
@@ -72,9 +76,9 @@ void BS2UpdateInit(void* allocator) {
memset(EntriesToImport, 0, 0x40000);
memset(Flags1, 0, sizeof(Flags1));
BS2Report("Create update thread\n");
OSCreateThread(&Thread, UpdateThread, NULL, ThreadStack + sizeof(ThreadStack),
sizeof(ThreadStack), 31, 1);
OSResumeThread(&Thread);
OSCreateThread(&Thread.thread, UpdateThread, NULL, Thread.stack + sizeof(Thread.stack),
sizeof(Thread.stack), 31, 1);
OSResumeThread(&Thread.thread);
}
static void* UpdateThread(void* argument) {

View File

@@ -205,7 +205,7 @@ void AxAdpcmSimplePlayer::init() {
}
int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
mpBNSBuffer = (Header*)data;
Header* head = mpBNSBuffer = (Header*)data;
sSysPauseFlag = false;
@@ -224,6 +224,7 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
ChannelInfo* chanInfoBufB[2];
ChannelInfo* chanInfoBufA[2];
AdpcmCoeffs** pCoeffsBufB = NULL;
int i;
u32* channelStartOffsets;
INFOBlock* infoBlock;
@@ -239,13 +240,13 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
int chanCount;
{
if (((Header*)data)->byteOrder != 0xFEFF) {
if (head->byteOrder != 0xFEFF) {
chanCount = 0;
goto clean_up;
}
infoBlock = ADD_OFFSET(INFOBlock, data, ((Header*)data)->infoHead.offset);
dataBlock = ADD_OFFSET(DATABlock, data, ((Header*)data)->dataHead.offset);
infoBlock = ADD_OFFSET(INFOBlock, data, head->infoHead.offset);
dataBlock = ADD_OFFSET(DATABlock, data, head->dataHead.offset);
if (infoBlock->head.sig != 'INFO') {
chanCount = 0;
goto clean_up;
@@ -267,6 +268,8 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
pChanInfoBufB = chanInfoBufB;
pChanDataBuf = chanDataBuf;
pCoeffsBufA = coeffsBufA;
pCoeffsBufB = coeffsBufB;
pAxvpbBuf = axVoiceBuf;
for (i = 0; chanCount = infoBlock->channelCount, i < chanCount; i++) {
int chanStartOffs = channelStartOffsets[i];
ChannelInfo* chanInfo = ADD_OFFSET(ChannelInfo, infoBlockDataBase, chanStartOffs);
@@ -275,9 +278,8 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
pChanInfoBufB[i] = chanInfo;
pChanDataBuf[i] = ADD_OFFSET(void, dataBlockDataBase, chanInfo->dataOff);
pCoeffsBufA[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
coeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
pCoeffsBufB[i] = ADD_OFFSET(AdpcmCoeffs, infoBlockDataBase, chanInfo->coeffOff);
pAxvpbBuf = axVoiceBuf;
pAxvpbBuf[i] = AXAcquireVoice(0x1f, VoiceCallback, 0);
if (pAxvpbBuf[i] == NULL) {
chanCount = 0;
@@ -310,33 +312,37 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
axAddr.currentAddressHi = (u32)currAddr >> 0x10;
axAddr.currentAddressLo = (u32)currAddr & 0xFFFF;
axAdpcm.a[0][0] = coeffsBufB[i]->a[0][0];
axAdpcm.a[0][1] = coeffsBufB[i]->a[0][1];
axAdpcm.a[1][0] = coeffsBufB[i]->a[1][0];
axAdpcm.a[1][1] = coeffsBufB[i]->a[1][1];
axAdpcm.a[2][0] = coeffsBufB[i]->a[2][0];
axAdpcm.a[2][1] = coeffsBufB[i]->a[2][1];
axAdpcm.a[3][0] = coeffsBufB[i]->a[3][0];
axAdpcm.a[3][1] = coeffsBufB[i]->a[3][1];
axAdpcm.a[4][0] = coeffsBufB[i]->a[4][0];
axAdpcm.a[4][1] = coeffsBufB[i]->a[4][1];
axAdpcm.a[5][0] = coeffsBufB[i]->a[5][0];
axAdpcm.a[5][1] = coeffsBufB[i]->a[5][1];
axAdpcm.a[6][0] = coeffsBufB[i]->a[6][0];
axAdpcm.a[6][1] = coeffsBufB[i]->a[6][1];
axAdpcm.a[7][0] = coeffsBufB[i]->a[7][0];
axAdpcm.a[7][1] = coeffsBufB[i]->a[7][1];
axAdpcm.gain = coeffsBufB[i]->cfg.gain;
axAdpcm.pred_scale = coeffsBufB[i]->cfg.predScale;
axAdpcm.yn1 = coeffsBufB[i]->cfg.yn1;
axAdpcm.yn2 = coeffsBufB[i]->cfg.yn2;
axAdpcm.a[0][0] = pCoeffsBufB[i]->a[0][0];
axAdpcm.a[0][1] = pCoeffsBufB[i]->a[0][1];
axAdpcm.a[1][0] = pCoeffsBufB[i]->a[1][0];
axAdpcm.a[1][1] = pCoeffsBufB[i]->a[1][1];
axAdpcm.a[2][0] = pCoeffsBufB[i]->a[2][0];
axAdpcm.a[2][1] = pCoeffsBufB[i]->a[2][1];
axAdpcm.a[3][0] = pCoeffsBufB[i]->a[3][0];
axAdpcm.a[3][1] = pCoeffsBufB[i]->a[3][1];
axAdpcm.a[4][0] = pCoeffsBufB[i]->a[4][0];
axAdpcm.a[4][1] = pCoeffsBufB[i]->a[4][1];
axAdpcm.a[5][0] = pCoeffsBufB[i]->a[5][0];
axAdpcm.a[5][1] = pCoeffsBufB[i]->a[5][1];
axAdpcm.a[6][0] = pCoeffsBufB[i]->a[6][0];
axAdpcm.a[6][1] = pCoeffsBufB[i]->a[6][1];
axAdpcm.a[7][0] = pCoeffsBufB[i]->a[7][0];
axAdpcm.a[7][1] = pCoeffsBufB[i]->a[7][1];
axAdpcm.gain = pCoeffsBufB[i]->cfg.gain;
axAdpcm.pred_scale = pCoeffsBufB[i]->cfg.predScale;
axAdpcm.yn1 = pCoeffsBufB[i]->cfg.yn1;
axAdpcm.yn2 = pCoeffsBufB[i]->cfg.yn2;
u32 ratio = infoBlock->sampleRate / 32000.0f * 65536.0f;
axSrc.ratioHi = ratio >> 16;
axSrc.ratioLo = ratio & 0xFFFF;
axSrc.last_samples[3] = axSrc.last_samples[2] = axSrc.last_samples[1] = axSrc.last_samples[0] = axSrc.currentAddressFrac = 0;
axSrc.currentAddressFrac = 0;
axSrc.last_samples[0] = 0;
axSrc.last_samples[1] = 0;
axSrc.last_samples[2] = 0;
axSrc.last_samples[3] = 0;
AXVPB* vpbA = pAxvpbBuf[i];
AXVPB* vpbA = axVoiceBuf[i];
AXSetVoiceType(vpbA, 0);
AXSetVoiceAddr(vpbA, &axAddr);
AXSetVoiceAdpcm(vpbA, &axAdpcm);
@@ -353,7 +359,7 @@ int AxAdpcmSimplePlayer::start(void* data, u32 length, AxAdpcmHandle* handle) {
Voices[vpbA->index].getMix()->vL = 0;
}
}
AXVPB* vpbB = pAxvpbBuf[i];
AXVPB* vpbB = axVoiceBuf[i];
AXSetVoiceMix(vpbB, Voices[vpbA->index].getMix());
static AXPBVE voiceVe = {32768, 0};
AXSetVoiceVe(vpbB, &voiceVe);

View File

@@ -619,7 +619,7 @@ vmFloat VmIntToFloat(vmU64 integer) {
return result;
}
static s32 CHANSVmParseInt(const CHANSVmObjHdr* obj, s32 base, u64* out) {
static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
u8 type = obj->type;
u32 stringLength;
u32 charCount;

View File

@@ -64,7 +64,6 @@ public:
class AppearMemoState : public State {
public:
AppearMemoState() : mTime(0.0f) {}
virtual ~AppearMemoState();
Manager::StateType getStateType();
void create();
void init();
@@ -1230,8 +1229,6 @@ Manager::StateType EditMemoState::getStateType() {
inline State::~State() {}
AppearMemoState::~AppearMemoState() {}
Manager::StateType AppearMemoState::getStateType() {
return Manager::ST_Appearing;
}
@@ -1245,48 +1242,3 @@ Manager::StateType DispMemoState::getStateType() {
}
}
}
inline void textinput::util::Animation::startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data) {
mfStartPoint = start;
mfEndPoint = end;
mfAnimationTime = duration;
mfCurrentFrame = 0.0f;
mbInAnimation = true;
mpAnimObserver = observer;
mpData = data;
mbSE = false;
if (observer) observer->onAnmEvent(AnimObserver::AE_0, data);
}
inline void textinput::util::Animation::calc() {
if (mbInAnimation) {
if (mfCurrentFrame < mfAnimationTime) {
mfCurrentFrame = 1.0f + mfCurrentFrame;
} else {
if (mbInAnimation && mpAnimObserver) {
mpAnimObserver->onAnmEvent(AnimObserver::AE_1, mpData);
}
mbInAnimation = false;
}
}
}
inline f32 textinput::util::Animation::getValue() {
return hermiteInterporation(mfCurrentFrame, 0.0f, mfStartPoint, 0.0f, mfAnimationTime, mfEndPoint, 0.0f);
}
inline bool textinput::util::Animation::isActive() {
return mbInAnimation;
}
inline void textinput::util::Animation::setSEFlag(bool flag) {
mbSE = flag;
}
inline bool textinput::util::Animation::isSEFlag() {
return mbSE;
}
inline void textinput::util::Animation::stop() {
mbInAnimation = false;
}

View File

@@ -22,9 +22,7 @@ namespace textinput {
#pragma section sconst_type ".sdata"
extern "C" const char* scCommonTextAnimName = scT_prdc_Text_00;
extern "C" const char* scCommonScrollAnimName = scP_prdc_scrl_Left;
#pragma explicit_zero_data on
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 0};
#pragma explicit_zero_data reset
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 1};
extern "C" const char scP_OnBtn[8] = "P_OnBtn";
extern "C" const char scB_OnBtn[8] = "B_OnBtn";
#pragma pop

View File

@@ -223,7 +223,7 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
const char* forceName;
u32 animationCount;
u32 paneIndex = 0;
for (; paneIndex < 25; ++paneIndex) {
do {
AnmPane* pane = NULL;
const PaneAnimation& paneInfo = csPaneToAnimationInSign[paneIndex & 0xFFFF];
switch (paneInfo.type) {
@@ -249,18 +249,18 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
animationCount = paneInfo.animationCount;
u16 animationIndex = 0;
while (animationIndex < animationCount) {
const AnimationFile* const& animation = paneInfo.animations[animationIndex];
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation->name);
void* resource = mpMultiArcResourceAccessor->GetResource(0, paneInfo.animations[animationIndex]->name);
AnimTransformPane* transform = static_cast<AnimTransformPane*>(
getLayout()->CreateAnimTransform(resource, mpMultiArcResourceAccessor));
if (forceName != NULL) {
pane->forceAddAnimation(allocator, animation->id, transform, forceName, false, true);
pane->forceAddAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, forceName, false, true);
} else {
pane->addAnimation(allocator, animation->id, transform, false, true);
pane->addAnimation(allocator, paneInfo.animations[animationIndex]->id, transform, false, true);
}
++animationIndex;
}
}
++paneIndex;
} while (paneIndex < 25);
init();
}

View File

@@ -111,13 +111,12 @@ void WithZi::init() {
void WithZi::clearCandidates() {
if (mbDictionaryOpen != 0) {
u16* const candidates = CandidatesBuffer;
mInputLength = 0;
mCandidateCount = 0;
memset(ElementBuffer, 0, 0x1fe);
memset(candidates, 0, 0x200);
memset(candidates + 0x100, 0, 0x1fe);
memset(candidates + 0x200, 0, 0x200);
memset(CandidatesBuffer, 0, 0x200);
memset(CandidatesBuffer + 0x100, 0, 0x1fe);
memset(CandidatesBuffer + 0x200, 0, 0x200);
memset(CandidatedWord, 0, 0x1400);
memset(&mSearch, 0, sizeof(mSearch) + sizeof(mSearchState));
mSearch.language = getPredictLanguage();
@@ -126,7 +125,7 @@ void WithZi::clearCandidates() {
mSearch.context = 1;
mSearch.getOptions = 0x81;
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
mSearch.candidates = reinterpret_cast<wchar_t*>(&candidates[0x200]);
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
mSearch.maxCandidates = 0x28;
mSearch.elementCount = 0;
mSearch.firstCandidate = 0;
@@ -511,14 +510,12 @@ scanDone:
}
u32 WithZi::setElementBuffer() {
u16* elements;
u16* candidates;
u16 inputCharacter;
u32 count = 0;
memset(ElementBuffer, 0, 0x1fe);
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
elements = ElementBuffer;
candidates = CandidatesBuffer;
u16* elements = ElementBuffer;
u16* candidates = CandidatesBuffer;
u16 inputCharacter;
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
u16 index = count;
elements[index] = inputCharacter;

View File

@@ -1557,15 +1557,6 @@ namespace ipl {
}
}
static inline math::VEC2 scaledPageOffset(const math::VEC2& source, f32 factor) {
const f32 vertical = source.y * factor;
const f32 horizontal = source.x * factor;
math::VEC2 scaled;
scaled.y = vertical;
scaled.x = horizontal;
return scaled;
}
void Address::onPreviousPage() {
switch (mState) {
case STATE_NORMAL:
@@ -1595,7 +1586,10 @@ namespace ipl {
mPage = PAGE_MAX - 1;
mNextPageNum = 0;
mbCover = false;
add_translate(mpLayout->FindPaneByName("N_note_base"), scaledPageOffset(sPageOffset, PAGE_MAX));
math::VEC2 offset;
offset.y = sPageOffset.y * PAGE_MAX;
offset.x = sPageOffset.x * PAGE_MAX;
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
mpLayout->getAnim(4)->setAnmType(0);
mpLayout->getAnim(4)->play();
set_page_text("T_nmbr_b", mPage + 1);
@@ -1613,12 +1607,8 @@ namespace ipl {
void Address::set_err_msg(wchar_t* errMsg, u32 errMsgLen, NWC24Err err) {
memset(errMsg, 0, errMsgLen * sizeof(wchar_t));
union MessageValue {
const wchar_t* text;
u32 id;
} message;
message.text = System::getMessage(MESG_ERROR_CODE);
wcsncat(errMsg, message.text, errMsgLen - wcslen(errMsg));
wcsncat(errMsg, System::getMessage(MESG_ERROR_CODE), errMsgLen - wcslen(errMsg));
u32 msgId = MESG_ERROR_CODE;
wchar_t errCode[32];
memset(errCode, 0, sizeof(errCode));
@@ -1627,22 +1617,17 @@ namespace ipl {
switch (err) {
case NWC24_ERR_NETWORK: {
message.id = MESG_ERROR_NWC24_NETWORK;
msgId = MESG_ERROR_NWC24_NETWORK;
break;
}
case NWC24_ERR_SERVER:
case NWC24_ERR_FULL: {
message.id = MESG_ERROR_NWC24_SERVER;
break;
}
default: {
message.id = reinterpret_cast<u32>(message.text);
msgId = MESG_ERROR_NWC24_SERVER;
break;
}
}
message.text = System::getMessage(message.id);
wcsncat(errMsg, message.text, errMsgLen - wcslen(errMsg));
wcsncat(errMsg, System::getMessage(msgId), errMsgLen - wcslen(errMsg));
}
void Address::entry_friend() {

View File

@@ -1704,9 +1704,6 @@ void ipl::scene::AddressEdit::stt_wait_btn_fadein() {
}
void ipl::scene::AddressEdit::stt_wait_btn_fadeout() {
nw4r::lyt::Pane* label;
const wchar_t* message;
ipl::utility::FrameController* animator;
bool friendFinished;
if (mpFriendCache->getInfo(mSelectedFriend).attr.status == 2) {
friendFinished = !mpCodeLayout->getAnim(0x15)->isPlaying();
@@ -1718,11 +1715,11 @@ void ipl::scene::AddressEdit::stt_wait_btn_fadeout() {
friendFinished &= !mpCodeLayout->getAnim(0x17)->isPlaying();
if (friendFinished) {
label = mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_card_msg_00", true);
message = ipl::System::getMessage(0x30);
nw4r::lyt::Pane* label = mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_card_msg_00", true);
const wchar_t* message = ipl::System::getMessage(0x30);
set_textbox(label, message);
ipl::System::getDialog()->callS2Btn2(0x142, 0x141, true);
animator = mpCodeLayout->getAnim(0x1c);
ipl::layout::Animator* animator = mpCodeLayout->getAnim(0x1c);
animator->initFrame();
animator->restart();
mState = 4;
@@ -2125,8 +2122,6 @@ state0:
goto state0Common;
case 3:
goto state0Button3;
case 4:
goto done;
default:
goto done;
}
@@ -2158,14 +2153,11 @@ state0Button3: {
nw4r::lyt::Pane* pane = layout->getNW4RLyt()->GetRootPane()->FindPaneByName(paneName, true);
ipl::math::VEC3 position(0.0f, 0.0f, 0.0f);
PSMTXMultVec(pane->GetGlobalMtx(), reinterpret_cast<Vec*>(&position), reinterpret_cast<Vec*>(&position));
f32 xOffset;
f32 scale;
f32 height;
xOffset = 15.0f;
height = 50.0f;
scale = 0.5f;
f32 xOffset = 15.0f;
f32 height = 50.0f;
f32 scale = 0.5f;
position.x = position.x + xOffset;
position.y = position.y + height * scale;
position.y = position.y + scale * height;
(mpBalloon)
->setPos(position, false, 1);
(mpBalloon)->fadein();
@@ -2202,14 +2194,11 @@ state22Button3:
nw4r::lyt::Pane* pane = layout->getNW4RLyt()->GetRootPane()->FindPaneByName(paneName, true);
ipl::math::VEC3 position(0.0f, 0.0f, 0.0f);
PSMTXMultVec(pane->GetGlobalMtx(), reinterpret_cast<Vec*>(&position), reinterpret_cast<Vec*>(&position));
f32 xOffset;
f32 scale;
f32 height;
xOffset = 15.0f;
height = 50.0f;
scale = 0.5f;
f32 xOffset = 15.0f;
f32 height = 50.0f;
f32 scale = 0.5f;
position.x = position.x + xOffset;
position.y = position.y + height * scale;
position.y = position.y + scale * height;
(mpBalloon)
->setPos(position, false, 1);
(mpBalloon)->fadein();
@@ -2258,8 +2247,6 @@ void ipl::scene::AddressEdit::start_left_event(const char* paneName) {
}
break;
}
case 4:
break;
default:
break;
}

View File

@@ -429,38 +429,32 @@ namespace ipl {
}
BOOL Board::appendRecord(CDBRecord* record) {
struct RecordReadState {
BOOL recordInterrupts;
u32 dataSize;
BOOL waitInterrupts;
BOOL slotInterrupts;
int recordSecond;
int recordMin;
int recordHour;
u32 recordGC;
CDBId cdbId;
char recordType[8];
utility::Date recordDate;
CDBRecordKey recordKey;
} state;
state.recordGC = 0;
CDBRecordKey recordKey;
utility::Date recordDate;
int recordDay;
int recordMin;
int recordHour;
u32 recordGC = 0;
cdb::Manager* cdbManager = System::getCdbManager();
BOOL result = TRUE;
state.recordType[0] = 0;
state.recordType[1] = 0;
state.recordType[2] = 0;
state.recordType[3] = 0;
state.recordType[4] = 0;
state.recordType[5] = 0;
state.recordType[6] = 0;
state.recordType[7] = 0;
struct InterruptState {
BOOL first;
BOOL second;
BOOL third;
BOOL result;
} interrupts;
interrupts.result = TRUE;
char recordType[8] = "";
// Get record metadata
CDBRecordGetCalendarTimeForce(record, &state.recordDate.year, &state.recordDate.month, &state.recordDate.day,
&state.recordHour, &state.recordMin, &state.recordSecond);
CDBRecordGetKeyForce(record, &state.recordKey);
CDBRecordGetTypeForce(record, state.recordType);
CDBRecordGetGameCodeForce(record, (char*)&state.recordGC);
CDBRecordGetCalendarTimeForce(record, &recordDate.year, &recordDate.month, &recordDate.day, &recordHour, &recordMin, &recordDay);
CDBRecordGetKeyForce(record, &recordKey);
CDBRecordGetTypeForce(record, recordType);
CDBRecordGetGameCodeForce(record, (char*)&recordGC);
if (mbReading == true && mSearchRecord_Prev.created) {
mbReading = false;
@@ -468,34 +462,34 @@ namespace ipl {
}
// Verify record
if (!cdbManager->isValidType(state.recordType)) {
if (!cdbManager->isValidType(recordType)) {
return TRUE;
}
if (is_already_read(state.recordKey.keyString)) {
if (is_already_read(recordKey.keyString)) {
return TRUE;
}
if (is_exist_keytbl(state.recordKey.keyString)) {
if (is_exist_keytbl(recordKey.keyString)) {
return TRUE;
}
state.recordDate.month++;
if (!(state.recordDate == mCurrentDate)) {
recordDate.month++;
if (!(recordDate == mCurrentDate)) {
goto error;
}
// Find any free space to put the object on screen
state.slotInterrupts = OSDisableInterrupts();
interrupts.first = OSDisableInterrupts();
BOOL exist = is_exist_diff_date();
BoardObject* obj = mObjList.getNextFree();
OSRestoreInterrupts(state.slotInterrupts);
OSRestoreInterrupts(interrupts.first);
if (obj == NULL && exist) {
while (obj == NULL) {
OSSleepMilliseconds((OSTime)1);
state.waitInterrupts = OSDisableInterrupts();
interrupts.second = OSDisableInterrupts();
obj = mObjList.getNextFree();
OSRestoreInterrupts(state.waitInterrupts);
OSRestoreInterrupts(interrupts.second);
}
}
@@ -512,59 +506,61 @@ namespace ipl {
// Get CDB metadata
if (!cdbManager->getDataSize(record, &state.dataSize)) {
u32 dataSize;
if (!cdbManager->getDataSize(record, &dataSize)) {
return TRUE;
}
if (state.dataSize > 0x32000) {
if (dataSize > 0x32000) {
return TRUE;
}
if (!System::getCdbManager()->getCDBId(record, &state.cdbId)) {
CDBId cdbId;
if (!System::getCdbManager()->getCDBId(record, &cdbId)) {
return TRUE;
}
// Read CDB metadata
u8* rbrData = new (obj->mpHeap, DEFAULT_ALIGN) u8[state.dataSize];
u8* rbrData = new (obj->mpHeap, DEFAULT_ALIGN) u8[dataSize];
if (rbrData == NULL) {
return FALSE;
}
if (!cdbManager->read(record, rbrData, state.dataSize)) {
if (!cdbManager->read(record, rbrData, dataSize)) {
delete[] rbrData;
goto close;
}
result = TRUE;
interrupts.result = TRUE;
if (((RBRHeader*)rbrData)->magic == RBR_MAGIC && cdbManager->isValidHeader((RBRHeader*)rbrData)) {
state.recordInterrupts = OSDisableInterrupts();
interrupts.third = OSDisableInterrupts();
if (state.recordDate == mCurrentDate) {
if (recordDate == mCurrentDate) {
if (mbReading == true && mSearchRecord_Prev.created) {
mbReading = false;
delete[] rbrData;
OSRestoreInterrupts(state.recordInterrupts);
OSRestoreInterrupts(interrupts.third);
return FALSE;
}
// Create on screen object
obj->create(mpLayoutFile, rbrData, state.recordGC, state.cdbId, state.recordKey, state.recordDate);
obj->create(mpLayoutFile, rbrData, recordGC, cdbId, recordKey, recordDate);
mObjList.append(obj);
CDBRecordGetCalendarTimeForce(record, &mSearchRecord_Next.year, &mSearchRecord_Next.month, &mSearchRecord_Next.day,
&mSearchRecord_Next.hour, &mSearchRecord_Next.min, &mSearchRecord_Next.sec);
memcpy(&mSearchRecord_Next.key, &state.recordKey, sizeof(CDBRecordKey));
memcpy(&mSearchRecord_Next.key, &recordKey, sizeof(CDBRecordKey));
mSearchRecord_Next.created = true;
if (mSearchRecord_Prev.created == false) {
memcpy(&mSearchRecord_Prev, &mSearchRecord_Next, sizeof(SearchRecord));
}
} else {
result = FALSE;
interrupts.result = FALSE;
delete[] rbrData;
}
OSRestoreInterrupts(state.recordInterrupts);
OSRestoreInterrupts(interrupts.third);
} else {
delete[] rbrData;
}
@@ -588,13 +584,13 @@ namespace ipl {
show_ricon();
}
result = FALSE;
interrupts.result = FALSE;
goto out;
error:
result = FALSE;
interrupts.result = FALSE;
out:
return result;
return interrupts.result;
}
void Board::stt_wait_cdb_init() {

View File

@@ -1,4 +1,3 @@
#define IPL_FOCUS_OBJECT_CPP
#include "scene/board/iplFocusObject.h"
#include "scene/parentalDialog/iplParentalDialog.h"
@@ -12,28 +11,6 @@
#include <revolution/cx.h>
#include <revolution/enc.h>
extern char scPaneName_B_Stop[];
namespace ipl {
namespace math {
static inline VEC3 addWeightedVectors(const VEC3& start, const VEC3& end) {
VEC3 sum;
nw4r::math::VEC3Add(&sum, &start, &end);
return sum;
}
static inline void normalizeVector(nw4r::math::VEC3* result, const VEC3& sum, f32 frames) {
nw4r::math::VEC3Scale(result, &sum, 1.0f / frames);
}
template <>
VEC3 LinearIntp<VEC3>::get() const {
nw4r::math::VEC3 result;
VEC3 sum = addWeightedVectors(mStart * (mMaxFrame - mFrame), mEnd * getCurrentFrame());
normalizeVector(&result, sum, getMaxFrame());
return result;
}
}
}
namespace ipl {
namespace scene {
// clang-format off
@@ -360,13 +337,6 @@ namespace ipl {
}
}
}
namespace math {
inline VEC3 VEC3::operator*(f32 val) const {
return VEC3(x * val, y * val, z * val);
}
}
namespace scene {
void focus_object::stt_normal() {
Button* button = get_button();
@@ -2121,7 +2091,7 @@ namespace ipl {
if (event == ::gui::EventHandler::ON_TRIG) {
if (con->downTrg(controller::BTN_INTERACT)) {
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
if (strcmp(paneName, "B_Stop") == 0) {
if (mpInstance->mState == focus_object::STATE_NORMAL) {
focus_object::get_button()->animation(Button::IDANIM_OPTOUT_SELECT);
@@ -2142,24 +2112,3 @@ namespace ipl {
}
} // namespace scene
} // namespace ipl
char scPaneName_B_Stop[] = "B_Stop";
BOOL ipl::scene::scroller::calc(bool canScroll) {
BOOL result = FALSE;
if (canScroll) {
if (mBScroller.calc()) {
result = TRUE;
}
}
mScroller.calc();
f32 movable = mScroller.movable_pos(mBScroller.getSpeed());
mScroller.addScroll(movable);
mBScroller.addSoundFreq(movable);
return result;
}

View File

@@ -638,7 +638,7 @@ namespace ipl {
void ChannelObj::setLangPane(const layout::Object* layout) {
int lang = System::getLanguage();
const char* langGroup = scLangGroups[lang];
char langCodeBuf[10][4] = {""};
char langCodeBuf[40] = "";
bool foundLangGroup = false;
@@ -648,7 +648,7 @@ namespace ipl {
} else {
bool isNonRsoGroup = true;
for (int i = 0; i < channel::MAX_ANIMS; i++) {
char name[8];
char name[6];
sprintf(name, "Rso%d", i);
if (strncmp(it->GetName(), name, 5) == 0) {
isNonRsoGroup = false;
@@ -663,8 +663,8 @@ namespace ipl {
for (int i = 0; i < 10; i++) {
if (strncmp(it->GetName(), scLangGroups[i], 3) == 0) {
memcpy(langCodeBuf[i], it->GetName(), 3);
langCodeBuf[i][3] = 0;
memcpy(&langCodeBuf[i], it->GetName(), 3);
langCodeBuf[i + 3] = 0;
break;
}
}
@@ -680,15 +680,16 @@ namespace ipl {
} else {
s32 region = System::getRegion();
for (int i = 0; i < channel::MAX_ANIMS; i++) {
if (scModuleData.langGroupLookup[region][i] == NULL) {
break;
}
if (strcmp(scModuleData.langGroupLookup[region][i], langCodeBuf[scLangLookup[region][i]]) == 0) {
nw4r::lyt::Group* group = layout->FindGroupByName(scModuleData.langGroupLookup[region][i]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
char* groupName = (char*)scModuleData.langGroupLookup[region][i];
if (groupName != NULL) {
if (strcmp(groupName, &langCodeBuf[scLangLookup[region][i]]) == 0) {
nw4r::lyt::Group* group = layout->FindGroupByName(groupName);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
it++) {
it->mTarget->SetVisible(true);
}
}
break;
}
}
}

View File

@@ -1901,59 +1901,64 @@ namespace ipl {
nw4r::ut::Rect projRect;
System::getProjectionRect(&projRect);
GXRenderModeObj* rMode = System::getRenderModeObj();
f32 scissorX;
f32 scissorY;
f32 scissorWidth;
f32 scissorHeight;
u16 fbWidth;
u16 efbHeight;
f32 var_f29;
f32 var_f30;
f32 var_f31;
f32 var_f1;
u16 var_r0;
u16 var_r3;
if (mState == STATE_NORMAL_FADE_ZOOM || mState == STATE_NORMAL_DONE_FADE_ZOOM || mState == STATE_NORMAL_RESTART) {
nw4r::math::MTX44 mtx;
f32 right = unk_0xD8.x + projRect.right / unk_0xE4.x;
f32 left = unk_0xD8.x + projRect.left / unk_0xE4.x;
f32 bottom = unk_0xD8.y - projRect.bottom / unk_0xE4.y;
f32 top = unk_0xD8.y - projRect.top / unk_0xE4.y;
f32 rightScale = projRect.right / unk_0xE4.x;
f32 leftScale = projRect.left / unk_0xE4.x;
f32 topScale = projRect.top / unk_0xE4.y;
f32 bottomScale = projRect.bottom / unk_0xE4.y;
f32 bottom = unk_0xD8.y - bottomScale;
f32 right = unk_0xD8.x + rightScale;
f32 left = unk_0xD8.x + leftScale;
f32 top = unk_0xD8.y - topScale;
MTXOrtho(mtx, top, bottom, left, right, -100.0f, 100.0f);
nw4r::math::VEC4 vec4_in(vec.x, vec.y, 0.0f, 1.0f);
nw4r::math::VEC4 vec4;
nw4r::math::VEC4Transform(&vec4, &mtx, &vec4_in);
fbWidth = rMode->fbWidth;
efbHeight = rMode->efbHeight;
f32 projectionWidth = projRect.GetWidth();
scissorX = ((1.0f + vec4.x) * fbWidth / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth));
scissorY = (efbHeight - ((1.0f + vec4.y) * efbHeight / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
scissorWidth = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (fbWidth / projectionWidth);
scissorHeight = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
var_r0 = rMode->fbWidth;
var_r3 = rMode->efbHeight;
var_f29 = projRect.GetWidth();
var_f30 = (var_r3 - ((1.0f + vec4.y) * var_r3 / 2)) - (mChanThumbOff_Y * unk_0xE4.y);
f32 temp_f7_2 = var_r0 / var_f29;
var_f31 = ((1.0f + vec4.x) * var_r0 / 2) - ((mChanThumbOff_X * unk_0xE4.x) * (temp_f7_2));
var_f29 = 2.0f * (mChanThumbOff_X * unk_0xE4.x) * (var_r0 / var_f29);
var_f1 = 2.0f * (mChanThumbOff_Y * unk_0xE4.y);
} else {
fbWidth = rMode->fbWidth;
efbHeight = rMode->efbHeight;
scissorX = ((f32)fbWidth / 2) + ((vec.x - mChanThumbOff_X) * (fbWidth / projRect.GetWidth()));
scissorY = (((f32)efbHeight / 2) - vec.y) - mChanThumbOff_Y;
scissorWidth = 2.0f * mChanThumbOff_X * (fbWidth / projRect.GetWidth());
scissorHeight = 2.0f * mChanThumbOff_Y;
var_r0 = rMode->fbWidth;
var_r3 = rMode->efbHeight;
var_f31 = ((f32)var_r0 / 2) + ((vec.x - mChanThumbOff_X) * (var_r0 / projRect.GetWidth()));
var_f30 = (((f32)var_r3 / 2) - vec.y) - mChanThumbOff_Y;
var_f29 = 2.0f * mChanThumbOff_X * (var_r0 / projRect.GetWidth());
var_f1 = 2.0f * mChanThumbOff_Y;
}
scissorX -= 1.0f;
scissorY -= 1.0f;
scissorWidth += 2.0f;
scissorHeight += 2.0f;
if (scissorX >= fbWidth || (scissorX + scissorWidth) <= 0.0f || scissorY >= efbHeight || (scissorY + scissorHeight) <= 0.0f) {
var_f31 -= 1.0f;
var_f30 -= 1.0f;
var_f29 += 2.0f;
var_f1 += 2.0f;
if (var_f31 >= var_r0 || (var_f31 + var_f29) <= 0.0f || var_f30 >= var_r3 || (var_f30 + var_f1) <= 0.0f) {
GXSetScissor(0, 0, 0, 0);
} else {
if (scissorX < 0.0f) {
scissorWidth += scissorX;
scissorX = 0.0f;
if (var_f31 < 0.0f) {
var_f29 += var_f31;
var_f31 = 0.0f;
}
if (scissorY < 0.0f) {
scissorHeight += scissorY;
scissorY = 0.0f;
if (var_f30 < 0.0f) {
var_f1 += var_f30;
var_f30 = 0.0f;
}
if ((scissorX + scissorWidth) > 1705.0f) {
scissorWidth -= (scissorX + scissorWidth) - 1705.0f;
if ((var_f31 + var_f29) > 1705.0f) {
var_f29 -= (var_f31 + var_f29) - 1705.0f;
}
if ((scissorY + scissorHeight) > 1705.0f) {
scissorHeight -= (scissorY + scissorHeight) - 1705.0f;
if ((var_f30 + var_f1) > 1705.0f) {
var_f1 -= (var_f30 + var_f1) - 1705.0f;
}
GXSetScissor(scissorX, scissorY, scissorWidth, scissorHeight);
GXSetScissor(var_f31, var_f30, var_f29, var_f1);
}
}

View File

@@ -20,7 +20,7 @@
#include <private/os.h>
#include <private/wpad.h>
#pragma dont_instantiate ipl::math::HermiteIntp<float>
#undef IPL_CHANNEL_TITLE_NOVTABLE

View File

@@ -31,7 +31,7 @@ namespace ipl {
};
// clang-format on
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(0) {
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
for (int i = 0; i < 2; i++) {
@@ -114,10 +114,10 @@ namespace ipl {
}
void SDButton::calc() {
if (mAnimWait == 1) {
if (unk_0x54 == 1) {
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
reset_gui();
mAnimWait = 0;
unk_0x54 = 0;
}
}
@@ -328,7 +328,7 @@ namespace ipl {
return isSceneCreated();
}
void SDButton::setEventHandler(::gui::EventHandler* event) {
void SDButton::setEventHandler(::gui::EventHandler* event, ::gui::EventHandler* optOutEvent) {
mpGui->setEventHandler(event);
}
@@ -347,7 +347,7 @@ namespace ipl {
switch (animNo) {
case IDANIM_HELP_BTN_CLICK: {
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
mAnimWait = 1;
unk_0x54 = 1;
break;
}
case IDANIM_ARROW_RIGHT_CLICK: {

View File

@@ -69,13 +69,6 @@ namespace ipl {
SDMemory::~SDMemory() {}
void SDMemory::create(EGG::Heap* heap, nand::LayoutFile* layoutFile, SDChannelSelect* channelSelect) {
s32 cachedTitleCount;
const savedata::Manager* saveData;
nw4r::lyt::TextBox* textBox;
layout::Animator* scrollAnimator;
ControlPaneEventHandler* controlEvent;
TitlePaneEventHandler* titleEvent;
DialogPaneEventHandler* dialogEvent;
mpSDChannelSelect = channelSelect;
mpMainLayout = new layout::Object(heap, layoutFile, "arc", "mn_DialogWindow_ChChange_a.brlyt");
@@ -96,7 +89,7 @@ namespace ipl {
mpMainLayout->getAnim(5)->initAnmFrame();
mpMainLayout->getAnim(8)->initAnmFrame();
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("T_Dialog_00"));
textBox->SetString(System::getMessage(0xB0));
textBox = static_cast<nw4r::lyt::TextBox*>(mpMainLayout->FindPaneByName("TextBox_05"));
textBox->SetString(System::getMessage(0xBB));
@@ -150,8 +143,8 @@ namespace ipl {
textBox = static_cast<nw4r::lyt::TextBox*>(mpTitleLayout->FindPaneByName("TextBox_07"));
textBox->SetString(System::getMessage(0xBA));
saveData = System::getSaveData();
cachedTitleCount = 0;
const savedata::Manager* saveData = System::getSaveData();
s32 cachedTitleCount = 0;
for (s32 i = 0; i < 48; ++i) {
if (saveData->getTitleCacheEntry(i) == 0) {
break;
@@ -160,12 +153,10 @@ namespace ipl {
}
if (cachedTitleCount >= 5) {
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(false);
nw4r::lyt::Pane* expandedButton = mpTitleLayout->FindPaneByName("N_Btn_4");
expandedButton->SetVisible(true);
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(true);
mDisplayMode = 4;
} else {
nw4r::lyt::Pane* compactButton = mpTitleLayout->FindPaneByName("N_Btn_3");
compactButton->SetVisible(true);
mpTitleLayout->FindPaneByName("N_Btn_3")->SetVisible(true);
mpTitleLayout->FindPaneByName("N_Btn_4")->SetVisible(false);
mDisplayMode = 3;
}
@@ -204,7 +195,7 @@ namespace ipl {
mpDialogLayout->getAnim(11)->initAnmFrame();
mpDialogLayout->getAnim(8)->initAnmFrame();
mpDialogLayout->getAnim(18)->initAnmFrame();
scrollAnimator = mpDialogLayout->getAnim(18);
layout::Animator* scrollAnimator = mpDialogLayout->getAnim(18);
scrollAnimator->initFrame();
scrollAnimator->restart();
@@ -219,7 +210,7 @@ namespace ipl {
mpDialogLayout->finishBinding();
mpProgressLayout->getAnim(0)->initAnmFrame();
controlEvent = new ControlPaneEventHandler(this);
ControlPaneEventHandler* controlEvent = new ControlPaneEventHandler(this);
mpPaneManagers[0] = new gui::PaneManager(controlEvent, mpMainLayout->getDrawInfo(), NULL, NULL);
mpPaneManagers[0]->setupScene(mpMainLayout);
mpPaneManagers[0]->setAllComponentTriggerTarget(false);
@@ -227,7 +218,7 @@ namespace ipl {
mpPaneManagers[0]->setTriggerTarget(mpMainLayout->FindPaneByName(sControlPaneNames[i]), true);
}
titleEvent = new TitlePaneEventHandler(this);
TitlePaneEventHandler* titleEvent = new TitlePaneEventHandler(this);
mpPaneManagers[1] = new gui::PaneManager(titleEvent, mpTitleLayout->getDrawInfo(), NULL, NULL);
mpPaneManagers[1]->setupScene(mpTitleLayout);
mpPaneManagers[1]->setAllComponentTriggerTarget(false);
@@ -242,7 +233,7 @@ namespace ipl {
}
}
dialogEvent = new DialogPaneEventHandler(this);
DialogPaneEventHandler* dialogEvent = new DialogPaneEventHandler(this);
mpPaneManagers[2] = new gui::PaneManager(dialogEvent, mpDialogLayout->getDrawInfo(), NULL, NULL);
mpPaneManagers[2]->setupScene(mpDialogLayout);
mpPaneManagers[2]->setAllComponentTriggerTarget(false);

View File

@@ -66,7 +66,7 @@ namespace ipl {
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) NO_INLINE;
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) NO_INLINE;
@@ -255,15 +255,15 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout) {
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) {
int lang = System::getLanguage();
const char* langGroup = scLangGroups[lang];
char availableLanguages[10][4] = {};
bool languageFound = false;
for (nw4r::lyt::GroupList::Iterator it = layout->getNW4RLyt()->GetGroupContainer()->GetGroupList().GetBeginIter();
it != layout->getNW4RLyt()->GetGroupContainer()->GetGroupList().GetEndIter(); it++) {
for (nw4r::lyt::GroupList::Iterator it = layout->GetGroupList().GetBeginIter();
it != layout->GetGroupList().GetEndIter(); it++) {
if (strcmp(it->GetName(), langGroup) == 0) {
languageFound = true;
} else {
@@ -295,7 +295,7 @@ namespace ipl {
}
if (languageFound) {
nw4r::lyt::Group* group = layout->getNW4RLyt()->GetGroupContainer()->FindGroupByName(langGroup);
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
@@ -305,7 +305,7 @@ namespace ipl {
for (int i = 0; i < channel::MAX_ANIMS; i++) {
if (scRegionGroups[region][i] != NULL) {
if (strcmp(scRegionGroups[region][i], availableLanguages[scLangLookup[region][i]]) == 0) {
nw4r::lyt::Group* group = layout->getNW4RLyt()->GetGroupContainer()->FindGroupByName(scRegionGroups[region][i]);
nw4r::lyt::Group* group = layout->FindGroupByName(scRegionGroups[region][i]);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter();
it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);

View File

@@ -335,7 +335,7 @@ namespace ipl {
return true;
}
bool SDChannelSelect::enqueueChannelNotice(u64 titleId, u32 value) {
bool SDChannelSelect::enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value) {
if (mCurrentSDState != 6) {
return false;
}
@@ -344,7 +344,7 @@ namespace ipl {
command.type = 10;
command.arguments.values[0] = value;
command.arguments.values[1] = (u32)&mFirstTitleCount;
command.titleId = titleId;
command.titleId = ((u64)page << 32) | index;
mCommandQueue.push(command);
return true;
}
@@ -363,7 +363,7 @@ namespace ipl {
return true;
}
bool SDChannelSelect::enqueueStateNotice(u64 titleId, u32 state) {
bool SDChannelSelect::enqueueStateNotice(u32 controller, u32 page, u32 index, u32 state) {
if (mCurrentSDState != 6) {
return false;
}
@@ -372,7 +372,7 @@ namespace ipl {
command.type = 7;
command.arguments.values[0] = state;
command.arguments.values[1] = 0;
command.titleId = titleId;
command.titleId = ((u64)page << 32) | index;
mCommandQueue.push(command);
return true;
}
@@ -729,11 +729,8 @@ namespace ipl {
return;
}
switch (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
default:
if (OSGetTime() - mOperationStartTime < OS_TIMER_CLOCK) {
return;
case false:
break;
}
setDialogMessage(1, 0);
int result = mpSDWorker->get_async_result();
@@ -784,15 +781,11 @@ namespace ipl {
enqueueLoadNotice();
}
} else {
u32 titleId;
u32 titleIndex;
int channelIndex;
int channelCount;
channelCount = 0;
channelIndex = 0;
titleIndex = 0;
int channelCount = 0;
int channelIndex = 0;
u32 titleIndex = 0;
for (; titleIndex < mSDTitleCount; ++titleIndex) {
titleId = mpSDTitleInfo[titleIndex].titleId;
u32 titleId = mpSDTitleInfo[titleIndex].titleId;
if (titleId != 0x48415A41) {
++channelCount;
mpChannelTitleIds[channelIndex++] = titleId;
@@ -3465,11 +3458,7 @@ namespace ipl {
break;
}
switch (event) {
default: return;
case 0: break;
}
{
if (event == 0) {
if (mpScene->mState == 1) {
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_OUT) {
if (con != NULL) {
@@ -3515,6 +3504,8 @@ namespace ipl {
}
}
}
} else {
return;
}
}

View File

@@ -282,7 +282,7 @@ FaderSceneCommand SDChannelTitle::calcFadein() {
if (!mpFade->isPlaying()) {
iplSDChannelTitle_playBannerIntro(this);
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
button->setEventHandler(mpButtonEventHandler);
button->setEventHandler(mpButtonEventHandler, NULL);
button->animation(13);
button->animation(14);
mState = 1;
@@ -344,7 +344,7 @@ void SDChannelTitle::initCalcFadeout() {
button->animation(15);
button->animation(16);
}
button->setEventHandler(NULL);
button->setEventHandler(NULL, NULL);
}
FaderSceneCommand SDChannelTitle::calcFadeout() {
@@ -736,7 +736,8 @@ extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene) {
if (channel->mStateFlags == 3) {
scene->mState = 26;
scene->mErrorMessage = 0xaf;
} else if (scene->mpChannelSelect->enqueueChannelNotice(scene->mTitleId, reinterpret_cast<u32>(&scene->mTitleRange))) {
} else if (scene->mpChannelSelect->enqueueChannelNotice(0, static_cast<u32>(scene->mTitleId >> 32),
static_cast<u32>(scene->mTitleId), reinterpret_cast<u32>(&scene->mTitleRange))) {
scene->mState = 20;
} else {
scene->mState = 26;
@@ -825,7 +826,8 @@ extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene) {
ESTitleId temporaryTitle = SCGetTmpTitleID();
if (temporaryTitle && scene->mTitleId != temporaryTitle) {
if (System::isReceiveScheduleStopped()) {
if (scene->mpChannelSelect->enqueueStateNotice(temporaryTitle, 1)) {
if (scene->mpChannelSelect->enqueueStateNotice(0, static_cast<u32>(temporaryTitle >> 32),
static_cast<u32>(temporaryTitle), 1)) {
scene->mState = 16;
} else {
scene->mState = 26;
@@ -1463,9 +1465,8 @@ extern "C" BOOL iplSDChannelTitle_passesParentalCheck(SDChannelTitle* scene, EST
return TRUE;
}
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
SDTitlePaneEventHandler* handler = this;
const controller::Interface* controller = static_cast<const controller::Interface*>(data);
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
const char* paneName = handler->getPane(component)->GetName();
switch (event) {
case ::gui::EventHandler::ON_TRIG: {
@@ -1523,8 +1524,8 @@ void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
}
}
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
SDTitleButtonEventHandler* handler = this;
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
const char* name = handler->getPane(component)->GetName();
switch (event) {
case 0:
@@ -1554,14 +1555,12 @@ 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);
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
iplSDChannelTitle_onTitleButtonEvent(this, 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));
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
iplSDChannelTitle_onTitlePaneEvent(this, component, event, static_cast<const controller::Interface*>(data));
}
}

View File

@@ -34,7 +34,7 @@ struct AOSSAccessPoint {
u8 bssid[6];
u16 capabilities;
u32 rateCount;
u8 rates[16];
u8 rates[12];
u32 beaconPeriod;
u32 mode;
};
@@ -84,7 +84,7 @@ void* AOSSi_Alloc(u32 size) {
}
void AOSSi_Free(void* block) {
if (releaseMemory) {
if (releaseMemory != NULL) {
releaseMemory(0, block, 0);
}
}
@@ -129,15 +129,15 @@ int AOSSi_EndLocal(void) {
int AOSSi_WLANGetBSSList(struct AOSSAccessPointList** output) {
int result = -1;
int startupRetries = 0;
WDScanParam scan ATTRIBUTE_ALIGN(32);
WD_Info info ATTRIBUTE_ALIGN(32);
int scanRetries = 0;
int cleanupRetries = 0;
int unlockRetries = 0;
int driver;
u8* buffer;
int cleanupRetries = 0;
int scanRetries = 0;
WD_Info info ATTRIBUTE_ALIGN(32);
WDScanParam scan;
u8 macAddress[6];
if (!allocateMemory || !releaseMemory) {
if (allocateMemory == NULL || releaseMemory == NULL) {
return -1;
}
driver = NCDLockWirelessDriver();
@@ -157,7 +157,7 @@ startup:
memcpy(macAddress, info.MAC, 6);
}
buffer = AOSSi_Alloc(0x3200);
if (buffer) {
if (buffer != NULL) {
memset(buffer, 0, 0x3200);
scan.channelBit = info.enableChannel;
scan.maxChannelTime = 40;
@@ -178,37 +178,37 @@ startup:
count = *(u16*)buffer;
if (count != 0) {
list = AOSSi_Alloc(sizeof(*list) + (count - 1) * sizeof(struct AOSSAccessPoint));
if (!list) {
if (list == NULL) {
result = -1;
break;
}
list->count = count;
descriptor = (WDBssDesc*)&buffer[2];
for (index = 0; index < count; ++index) {
struct AOSSAccessPoint* accessPoint = &list->accessPoints[index];
int rate;
int rateCount;
list->accessPoints[index].ssidLength = descriptor->ssidLength;
memcpy(list->accessPoints[index].ssid, descriptor->ssid, 32);
list->accessPoints[index].channel = descriptor->channel;
memcpy(list->accessPoints[index].bssid, descriptor->bssid, 6);
rateCount = 0;
int rateCount = 0;
accessPoint->ssidLength = descriptor->ssidLength;
memcpy(accessPoint->ssid, descriptor->ssid, 32);
accessPoint->channel = descriptor->channel;
memcpy(accessPoint->bssid, descriptor->bssid, 6);
for (rate = 0; rate < 12; ++rate) {
if (descriptor->rateSet.support & supportedRates[rate].mask) {
list->accessPoints[index].rates[rateCount] = supportedRates[rate].value;
accessPoint->rates[rateCount] = supportedRates[rate].value;
if (descriptor->rateSet.basic & supportedRates[rate].mask) {
list->accessPoints[index].rates[rateCount] |= 128;
accessPoint->rates[rateCount] |= 128;
}
++rateCount;
}
}
list->accessPoints[index].rateCount = rateCount;
list->accessPoints[index].beaconPeriod = descriptor->beaconPeriod;
accessPoint->rateCount = rateCount;
accessPoint->beaconPeriod = descriptor->beaconPeriod;
if ((descriptor->capabilities & 3) == 1) {
list->accessPoints[index].mode = 1;
accessPoint->mode = 1;
} else if ((descriptor->capabilities & 3) == 2) {
list->accessPoints[index].mode = 2;
accessPoint->mode = 2;
} else {
list->accessPoints[index].mode = 0;
accessPoint->mode = 0;
}
descriptor = (WDBssDesc*)((u16*)descriptor + descriptor->length);
}
@@ -222,7 +222,7 @@ startup:
}
if (++scanRetries > 10) {
list = AOSSi_Alloc(sizeof(*list));
if (!list) {
if (list == NULL) {
result = -1;
break;
}
@@ -236,29 +236,31 @@ startup:
AOSSi_Free(buffer);
}
cleanup:
while (WD_Cleanup() != 0) {
if (WD_Cleanup() != 0) {
if (cleanupRetries > 10) {
result = -1;
goto unlock;
}
++cleanupRetries;
AOSSi_SleepMs(10);
goto cleanup;
}
unlock:
while (NCDUnlockWirelessDriver(driver) != 0) {
if (NCDUnlockWirelessDriver(driver) != 0) {
if (unlockRetries > 10) {
result = -1;
break;
return -1;
}
++unlockRetries;
AOSSi_SleepMs(10);
goto unlock;
}
return result;
}
int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionStatus* status) {
int retries = 0;
int result;
int result = 0;
WD_Info info ATTRIBUTE_ALIGN(32);
NCDIfConfig* interfaceConfig = &AOSSi_NcdIfConfig;
NCDIpConfig* ipConfig;
@@ -286,7 +288,6 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
}
interfaceConfig->netif.wireless.config.manual.ssidLength = (u8)connection->ssidLength;
memcpy(interfaceConfig->netif.wireless.config.manual.ssid, connection->ssid, connection->ssidLength);
result = 0;
ipConfig = &AOSSi_NcdIpConfig;
memset(ipConfig, 0, sizeof(*ipConfig));
ipConfig->adjust.maxTransferUnit = 1300;
@@ -320,14 +321,13 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
}
}
if (result == 0) {
u32 ssidLength;
status->connected = 1;
if (WD_GetInfo(&info) == 0) {
status->channel = info.channel;
}
ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
status->ssidLength = ssidLength;
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid, ssidLength);
status->ssidLength = interfaceConfig->netif.wireless.config.manual.ssidLength;
memcpy(status->ssid, interfaceConfig->netif.wireless.config.manual.ssid,
interfaceConfig->netif.wireless.config.manual.ssidLength);
} else {
status->connected = 0;
}

View File

@@ -763,7 +763,7 @@ unlock_driver:
int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
u32* changedIndex) {
u32 previousIndex;
u32 currentIndex;
u32 currentIndex = 0;
int found = 0;
int result = 0;
u32 ssidLength;
@@ -774,7 +774,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
AtermApRecord* previousRecord = previousRecords->entries;
currentIndex = 0;
for (; currentIndex < currentRecords->count; currentIndex++) {
AtermSsidBuffer ssidName;
ssidName.clear.word0 = 0;
@@ -817,6 +816,8 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
int currentHasAoss;
int previousHasAoss;
previousHasAoss = 0;
currentHasAoss = 0;
aossSsidName.clear.word0 = 0;
aossSsidName.clear.word1 = 0;
aossSsidName.clear.word2 = 0;
@@ -826,8 +827,6 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
aossSsidName.clear.word6 = 0;
aossSsidName.clear.word7 = 0;
aossSsidName.clear.finalWord = 0;
currentHasAoss = 0;
previousHasAoss = 0;
currentRecord = currentRecords->entries;
previousRecord = previousRecords->entries;
@@ -1647,10 +1646,7 @@ s32 ATERMRunConfigProtocol(void) {
SONtoHs(option->length);
optionValue = option->value;
}
if (optionValue == NULL || optionType != 0x101) {
break;
}
{
if (optionValue != NULL && optionType == 0x101) {
AtermProgress progress;
u32 authenticationTime = (u32)(OSGetTime() /
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6));
@@ -1874,13 +1870,13 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
union { u64 value; u8 bytes[8]; } counter;
u32 initialValue[2];
u8* outputBlock;
s32 blockIndex;
s32 blockOffset;
u8* destinationBytes;
const u8* sourceBytes;
s32 pass;
s32 blockCount;
u32 rounds;
s32 blockOffset;
s32 blockCount;
s32 pass;
s32 blockIndex;
int result = 1;
initialValue[1] = 0xA6A6A6A6;
@@ -1899,11 +1895,11 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
memcpy(destinationBytes + 8, sourceBytes, length);
memcpy(block.bytes, initialValue, sizeof(initialValue));
for (pass = 0; pass < 6; pass++) {
for (blockIndex = 1, blockOffset = 8; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
for (blockOffset = 8, blockIndex = 1; blockIndex <= blockCount; blockIndex++, blockOffset += 8) {
u64 passBase = (u64)(s64)blockCount * (u64)(s64)pass;
u8* stateBytes = block.bytes;
outputBlock = (u8*)(destination + blockOffset / 2);
outputBlock = destinationBytes + blockOffset;
memcpy(stateBytes + 8, outputBlock, 8);
ATERMAesEncryptBlock(expandedKey, rounds, stateBytes, stateBytes);
counter.value = (u64)(s64)blockIndex + passBase;

View File

@@ -30,10 +30,12 @@ namespace ipl {
namespace scene {
extern "C" MEMAllocator sRakuAllocator;
MEMAllocator sRakuAllocator;
extern "C" RakuProgress sRakuStatus;
RakuProgress sRakuStatus;
extern "C" RakuConfiguration sRakuConfiguration;
RakuConfiguration sRakuConfiguration;
struct RakuStatus {
RakuProgress progress;
RakuConfiguration configuration;
};
extern "C" RakuStatus sRakuStatus;
RakuStatus sRakuStatus;
extern "C" OSMessageQueue sRakuMsgQueue;
OSMessageQueue sRakuMsgQueue;
static u32 startTimeHigh = 0;
@@ -59,7 +61,8 @@ public:
virtual ~RakuRakuThread();
virtual void* Run();
virtual void unk_0x2C() = 0;
static void syncRakuProgress(RakuProgress* progress);
void syncRakuProgress();
static void progressCallback(RakuProgress* progress);
void destroy();
int start();
int getState();
@@ -76,15 +79,19 @@ private:
MEMHeapHandle mHeap;
};
void RakuRakuThread::syncRakuProgress(RakuProgress* progress) {
void RakuRakuThread::syncRakuProgress() {
BOOL interrupts = OSDisableInterrupts();
sRakuStatus = *progress;
sRakuStatus.progress = *(RakuProgress*)this;
OSTime time = OSGetTime();
startTimeHigh = time >> 32;
startTimeLow = time;
OSRestoreInterrupts(interrupts);
}
void RakuRakuThread::progressCallback(RakuProgress* progress) {
((RakuRakuThread*)progress)->syncRakuProgress();
}
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
u32 version = ATERMi_ApConfigGetVersion();
if (((version >> 12) & 15) * 10 + ((version >> 8) & 15) != 1) {
@@ -141,14 +148,14 @@ int RakuRakuThread::start() {
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
active = true;
mFinished = 0;
memset(&sRakuConfiguration, 0, sizeof(RakuConfiguration));
memset(&sRakuStatus, 0, sizeof(RakuProgress));
memset(&sRakuStatus.configuration, 0, sizeof(RakuConfiguration));
memset(&sRakuStatus.progress, 0, sizeof(RakuProgress));
SOLibraryConfig socketConfig;
socketConfig.alloc = RakuSocketAlloc;
socketConfig.free = RakuSocketFree;
SOInit(&socketConfig);
ATERMi_ApConfigStart(mPriority, 200,
syncRakuProgress,
progressCallback,
RakuAtermAlloc, RakuAtermFree, 4096);
if (!mRunning) {
mRunning = 1;
@@ -200,7 +207,7 @@ int RakuRakuThread::getState() {
return 0;
}
BOOL interrupts = OSDisableInterrupts();
switch (sRakuStatus.state) {
switch (sRakuStatus.progress.state) {
case 1: displayState = 1; break;
case 2: displayState = 2; break;
case 3: displayState = 2; break;
@@ -222,30 +229,6 @@ int RakuRakuThread::cancel() {
return OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
}
inline void copyRakuPrivacy(NCDApConfig* config, const RakuConfiguration* settings) {
if (settings->security == 1) {
config->privacy.mode = 1;
config->privacy.wep40.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep40.key[index], settings->wepKeys[index], 5);
}
} else if (settings->security == 2) {
config->privacy.mode = 2;
config->privacy.wep104.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep104.key[index], settings->wepKeys[index], 13);
}
} else if (settings->security == 4) {
config->privacy.mode = 4;
memcpy(config->privacy.tkip.key, settings->passphrase, 64);
config->privacy.tkip.keyLen = strlen(settings->passphrase);
} else if (settings->security == 5) {
config->privacy.mode = 6;
memcpy(config->privacy.aes.key, settings->passphrase, 64);
config->privacy.aes.keyLen = strlen(settings->passphrase);
}
}
int RakuRakuThread::finish(NCDApConfig* config, int* result) {
if (!active) {
if (result != NULL) {
@@ -253,29 +236,49 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
}
return 1;
}
s32 state = sRakuStatus.state;
if ((u32)(state - 6) <= 1) {
if (!mFinished) {
if (state == 6) {
ATERMi_ApConfigGetResult(&sRakuConfiguration);
printInfo();
}
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
return 0;
}
SOFinish();
active = false;
destroy();
} else {
s32 state = sRakuStatus.progress.state;
if ((u32)(state - 6) > 1) {
return 0;
}
if (!mFinished) {
if (state == 6) {
ATERMi_ApConfigGetResult(&sRakuStatus.configuration);
printInfo();
}
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
return 0;
}
SOFinish();
active = false;
destroy();
if (config != NULL) {
memcpy(config->ssid, sRakuConfiguration.ssid, 32);
config->ssidLength = strlen(sRakuConfiguration.ssid);
copyRakuPrivacy(config, &sRakuConfiguration);
RakuConfiguration* settings = &sRakuStatus.configuration;
memcpy(config->ssid, settings->ssid, 32);
config->ssidLength = strlen(settings->ssid);
if (settings->security == 1) {
config->privacy.mode = 1;
config->privacy.wep40.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep40.key[index], settings->wepKeys[index], 5);
}
} else if (settings->security == 2) {
config->privacy.mode = 2;
config->privacy.wep104.keyId = settings->keyId;
for (int index = 0; index < 4; ++index) {
memcpy(config->privacy.wep104.key[index], settings->wepKeys[index], 13);
}
} else if (settings->security == 4) {
config->privacy.mode = 4;
memcpy(config->privacy.tkip.key, settings->passphrase, 64);
config->privacy.tkip.keyLen = strlen(settings->passphrase);
} else if (settings->security == 5) {
config->privacy.mode = 6;
memcpy(config->privacy.aes.key, settings->passphrase, 64);
config->privacy.aes.keyLen = strlen(settings->passphrase);
}
}
if (result != NULL) {
*result = sRakuStatus.result;
*result = sRakuStatus.progress.result;
}
return 1;
}

View File

@@ -3,7 +3,7 @@
#include "utility/iplCharacterCode.h"
extern "C" {
BOOL USBAPStartRegistration(u64, u32, u32, void*, void (*)(int), u16*, u8*);
BOOL USBAPStartRegistration(void*, void*, u32, u32, void*, void (*)(int), u16*, u8*);
BOOL USBAPCancelRegistration();
BOOL USBAPIsThreadTerminated();
}
@@ -40,7 +40,7 @@ void USBAPRegisterCallback(int result) {
void USBAPThread::Init(unsigned short* buffer, unsigned char* accessPoints) {
int priority = OSGetThreadPriority(OSGetCurrentThread()) + 1;
if (USBAPStartRegistration(0, priority,
if (USBAPStartRegistration(NULL, NULL, priority,
0, this, USBAPRegisterCallback, buffer, accessPoints) == 1) {
OSReport("Registration started\n");
}

View File

@@ -15,10 +15,10 @@ namespace ipl {
// clang-format on
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
mCmdCapacity = 64;
mCmdCount = 0;
mCmdReadIdx = 0;
mCmdWriteIdx = 0;
unk_0x264 = 64;
unk_0x268 = 0;
unk_0x26C = 0;
unk_0x270 = 0;
mSettingArg = arg;
mpLayout = NULL;
mpLayoutFile = NULL;
@@ -81,8 +81,8 @@ namespace ipl {
FaderSceneCommand SettingButton::calcNormal() {
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mCmdCount != 0) {
CmdEntry unk = mCmdQueue[mCmdReadIdx];
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
Unk unk = unk_0x64[unk_0x26C];
switch (unk.command) {
case CMD_SHOW_BTN: {
showBtn();
@@ -98,11 +98,11 @@ namespace ipl {
}
}
if (mCmdCount != 0) {
if (++mCmdReadIdx >= mCmdCapacity) {
mCmdReadIdx = 0;
if (unk_0x268 != 0) {
if (++unk_0x26C >= unk_0x264) {
unk_0x26C = 0;
}
mCmdCount--;
unk_0x268--;
}
}
@@ -225,16 +225,16 @@ namespace ipl {
}
void SettingButton::reserve(int command, u32 msgId) {
if (mCmdCapacity != mCmdCount) {
int unk = mCmdWriteIdx;
mCmdQueue[unk].command = command;
mCmdQueue[unk].msgID = msgId;
mCmdWriteIdx++;
if (unk_0x264 != unk_0x268) {
int unk = unk_0x270;
unk_0x64[unk].command = command;
unk_0x64[unk].msgID = msgId;
unk_0x270++;
if (mCmdWriteIdx >= mCmdCapacity) {
mCmdWriteIdx = 0;
if (unk_0x270 >= unk_0x264) {
unk_0x270 = 0;
}
mCmdCount++;
unk_0x268++;
}
}

View File

@@ -914,8 +914,7 @@ void CArGBAOdh::cdj_c_setQuantizationTable(SArCDJ_OdhMaster* master, u32 quality
for (i = 0; i < 64; i++) {
temp = ((const u16*)gArAANScales)[i];
temp *= quantization[table * 64 + i];
temp = 0x4000000 / temp;
master->quantizationTables[table * 64 + i] = temp;
master->quantizationTables[table * 64 + i] = 0x4000000 / temp;
}
}
}
@@ -1194,9 +1193,8 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
}
}
code = request->dcTable[bitCount];
magnitude = (difference & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
code = (s32)code >> 24;
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (difference & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
request) == ODH_ERROR_80000004) {
return ODH_ERROR_80000004;
}
@@ -1225,9 +1223,8 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
}
}
code = request->acTable[bitCount];
magnitude = (runLength & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
code = (s32)code >> 24;
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (runLength & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
request) == ODH_ERROR_80000004) {
return ODH_ERROR_80000004;
}
@@ -1246,9 +1243,8 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
}
}
code = request->dcTable[bitCount];
magnitude = (value & ((1 << bitCount) - 1)) | ((code & 0xFFFFFF) << bitCount);
code = (s32)code >> 24;
if (EmitBit(magnitude, code + bitCount, request) == ODH_ERROR_80000004) {
if (EmitBit(((code & 0xFFFFFF) << bitCount) | (value & ((1 << bitCount) - 1)), ((s32)code >> 24) + bitCount,
request) == ODH_ERROR_80000004) {
return ODH_ERROR_80000004;
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -265,125 +265,3 @@ GATE PASS
```
Accepted improvement commits: 2348596d (real float-reference setter), fff3e072 (Color ownership), 8532b7bf (DestructorChain ownership).
## High continuation: name/extent pairing (new origin/main branch)
Starting data: tiInputForm 1036/3772, tiKeyboard 12/2708, MyTiManager 148/1132. Instruction-exact counts 216/221, 62/62, 91/91. Fetched origin before unit work; owned source equals origin/main and the full baseline quick gate passes. Prior three distinct attempts for each open tiInputForm function are retained above. User explicitly permits proven real-object extent corrections, leaving alignment bytes unowned without changing addresses, split ranges or section totals. Earlier claims that extra weak tables inherently prevented data matching were premature; rechecking symbol pairing with this new evidence.
tiKeyboard pool identical (8 strings); source unchanged on origin/main after fetch.
- 0x8165FA88 signwindow::Sample vtable extent 272 -> 268: source class compiler table is 268 bytes; all 61 outgoing virtual/thunk relocations agree at their relative offsets, and target's final four bytes are zero alignment without a relocation; the next table still begins at 0x8165FB98.
- 0x8165FC78 predictlang::Base vtable extent 40 -> 36: compiler table is the two header words plus seven real virtual slots (36 bytes); all seven target relocations agree, and trailing four bytes are zero alignment; the next table remains 0x8165FCA0.
- 0x81698D20 lbl_81698D20 -> defaultEventObserver__9textinput, same 4-byte extent: constructor loads this singleton when observer is NULL, and static init stores the allocated EventObserver pointer through the same target address; source loads/stores defaultEventObserver__9textinput.
The extent-only trial passed with no regression but .data stayed 99.117645% because all eight pooled literals still had anonymous extraction names instead of actual compiler literal symbols. Each verified literal is now named with its actual compiler-owned name; future compiler numbering may change, but objdiff matches compiler-generated literals by bytes/relocations, not the numeric counter.
- 0x8165F8F0 lbl_8165F8F0 -> @8031, same 13 bytes: compiler-pooled literal b'T_title_text'; target references setTitleText__Q29textinput7ManagerFPw .text+0x117A, setTitleText__Q29textinput7ManagerFPw .text+0x1192; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F900 lbl_8165F900 -> @8076, same 27 bytes: compiler-pooled literal b'fs_VK_ascii_keytop_a.brlyt'; target references createPCTypeKeyboard__Q29textinput7ManagerFv .text+0x147E, createPCTypeKeyboard__Q29textinput7ManagerFv .text+0x148E; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F920 lbl_8165F920 -> @8086, same 24 bytes: compiler-pooled literal b'fs_VK_cellPhone_a.brlyt'; target references createCellPhoneTypeKeyboard__Q29textinput7ManagerFv .text+0x15C6, createCellPhoneTypeKeyboard__Q29textinput7ManagerFv .text+0x15D2; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F938 lbl_8165F938 -> @8090, same 22 bytes: compiler-pooled literal b'fs_VK_textBox_a.brlyt'; target references createInputForm__Q29textinput7ManagerFv .text+0x1652, createInputForm__Q29textinput7ManagerFv .text+0x1662; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F950 lbl_8165F950 -> @8115, same 27 bytes: compiler-pooled literal b'fs_VK_predictInput_a.brlyt'; target references createCandidateBox__Q29textinput7ManagerFv .text+0x16F2, createCandidateBox__Q29textinput7ManagerFv .text+0x1702; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F96C lbl_8165F96C -> @8148, same 22 bytes: compiler-pooled literal b'fs_VK_toolbar_a.brlyt'; target references createToolBar__Q29textinput7ManagerFv .text+0x1886, createToolBar__Q29textinput7ManagerFv .text+0x1896; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F988 lbl_8165F988 -> @8156, same 24 bytes: compiler-pooled literal b'fs_prdicSelWidw_a.brlyt'; target references createPredictLanguageDialog__Q29textinput7ManagerFv .text+0x1932, createPredictLanguageDialog__Q29textinput7ManagerFv .text+0x1942; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
- 0x8165F9A0 lbl_8165F9A0 -> @8168, same 22 bytes: compiler-pooled literal b'fs_signWindow_a.brlyt'; target references createSignWindow__Q29textinput7ManagerFv .text+0x1A36, createSignWindow__Q29textinput7ManagerFv .text+0x1A42; source same-offset literal has these identical bytes. Compiler-generated names remain compiler-owned; no new source labels or string blob.
tiKeyboard all-unit quick gate PASS: matched_data 12 -> 2708/2708, every owned non-text section 100%, instruction-exact 62/62 unchanged; zero regressions, correct retail DOL hash. Actual pooled literal identities plus proven vtable extents resolve pairing; extra compiler-emitted weak tables do not prevent the named-symbol route from reaching 100%.
tiInputForm pool identical (20 strings), fetched origin and confirmed owned source unchanged. Symbol pairing corrections, all within its .data split 0x8165C820..0x8165D2D0; every address and section/split total remains unchanged:
- 0x8165C990 jumptable_8165C990 -> @13162, extent 160 -> 160: 40-entry real switch table, all 40 outgoing relocation targets and addends agree with the source compiler table; references ToIndependentClass__Q39textinput9inputform13DeadKeyStreamFw .text+0x4F2 -> data+0x170; ToIndependentClass__Q39textinput9inputform13DeadKeyStreamFw .text+0x4FA -> data+0x170.
- 0x8165CA30 jumptable_8165CA30 -> @13178, extent 40 -> 40: 10-entry real switch table, all 10 outgoing relocation targets and addends agree with the source compiler table; references setLanguage__Q39textinput9inputform4BaseFQ29textinput8Language .text+0xBFA -> data+0x210; setLanguage__Q39textinput9inputform4BaseFQ29textinput8Language .text+0xC02 -> data+0x210.
- 0x8165CA58 jumptable_8165CA58 -> @13457, extent 52 -> 52: 13-entry real switch table, all 13 outgoing relocation targets and addends agree with the source compiler table; references onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x28D2 -> data+0x238; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x28DA -> data+0x238.
- 0x8165CA8C jumptable_8165CA8C -> @13456, extent 192 -> 192: 48-entry real switch table, all 48 outgoing relocation targets and addends agree with the source compiler table; references onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xEB2 -> data+0x26C; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xEBA -> data+0x26C.
- 0x8165CB4C jumptable_8165CB4C -> @13510, extent 148 -> 148: 37-entry real switch table, all 37 outgoing relocation targets and addends agree with the source compiler table; references onHKBCtrlCode__Q39textinput9inputform4BaseFQ29textinput7HVKCodeUl .text+0x65B2 -> data+0x32C; onHKBCtrlCode__Q39textinput9inputform4BaseFQ29textinput7HVKCodeUl .text+0x65BA -> data+0x32C.
- 0x8165CC5C jumptable_8165CC5C -> @14933, extent 28 -> 28: 7-entry real switch table, all 7 outgoing relocation targets and addends agree with the source compiler table; references onAnmEvent__Q39textinput9inputform19NormalButtonAnmPaneFQ49textinput11nw4rmanager7AnmPane12AnmPaneEvent .text+0xC09A -> data+0x43C; onAnmEvent__Q39textinput9inputform19NormalButtonAnmPaneFQ49textinput11nw4rmanager7AnmPane12AnmPaneEvent .text+0xC0A2 -> data+0x43C.
- 0x8165C840 lbl_8165C840 -> csButtonAnimations__Q29textinput9inputform, extent 128 -> 128: two ButtonAnimations structs (64 bytes each), exact bytes and 18 outgoing relocations to pane names and animation-file objects; references __sinit_\tiInputForm_cpp .text+0xC50A -> data+0x20; __sinit_\tiInputForm_cpp .text+0xC512 -> data+0x20.
- 0x8165C970 lbl_8165C970 -> @6599, extent 32 -> 32: compiler-owned constant b'\x00\xa4\x00\xac\x00\xaf\x00\xb2\x00\xb3\x00\xb6\x00\xb8\x00\xb9\x00\xbc\x00\xbd\x00\xbe\x00\xd0\x00\xde\x00\xf0\x00\xfe\x00\x00', exact 32 bytes; references onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xFF2 -> data+0x150; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0xFFA -> data+0x150; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x1436 -> data+0x150; onCommand__Q39textinput9inputform4BaseFQ39textinput15CommandReceiver13INPUT_COMMANDPv .text+0x143E -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x965A -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x9662 -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x97C2 -> data+0x150; onSpaceKeyHWKB__Q39textinput9inputform4BaseFUl .text+0x97CA -> data+0x150.
- 0x8165CBE0 lbl_8165CBE0 -> @13512, extent 52 -> 13: compiler-owned constant b'T_2l_TextBox\x00', exact 13 bytes; references __ct__Q39textinput9inputform12LayoutByNW4RFPQ29textinput7ManagerPQ34nw4r3lyt24MultiArcResourceAccessorPCcPQ29textinput13EventObserverPCc .text+0x9A3E -> data+0x3C0; __ct__Q39textinput9inputform12LayoutByNW4RFPQ29textinput7ManagerPQ34nw4r3lyt24MultiArcResourceAccessorPCcPQ29textinput13EventObserverPCc .text+0x9A56 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9BA -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9BE -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9C2 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9CA -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xA9E2 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAA26 -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAA2A -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB1A -> data+0x3C0; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB1E -> data+0x3C0.
- 0x8165CBF0 recover @13580, 34 bytes previously absorbed into lbl_8165CBE0: separate compiler literal b'RevoIpl_RodinNTLGProM_32_I4.brfnt\x00'; references none in this unit.
- 0x8165CC14 lbl_8165CC14 -> @13639, extent 14 -> 14: compiler-owned constant b'P_txtScrll_UP\x00', exact 14 bytes; references init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA22A -> data+0x3F4; init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA236 -> data+0x3F4.
- 0x8165CC28 lbl_8165CC28 -> @13640, extent 36 -> 16: compiler-owned constant b'P_txtScrll_DOWN\x00', exact 16 bytes; references init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA25A -> data+0x408; init__Q39textinput9inputform12LayoutByNW4RFv .text+0xA266 -> data+0x408.
- 0x8165CC38 recover @13654, 17 bytes previously absorbed into lbl_8165CC28: separate compiler literal b'N_separateBarAll\x00'; references none in this unit.
- 0x8165CC4C lbl_8165CC4C -> @13724, extent 13 -> 13: compiler-owned constant b'T_title_text\x00', exact 13 bytes; references setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB6E -> data+0x42C; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB7A -> data+0x42C; setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language .text+0xAB96 -> data+0x42C.
- 0x8165D0D8 __vt__Q39textinput9inputform10EditBuffer -> __vt__Q39textinput9inputform10EditBuffer, extent 16 -> 12: real compiler vtable is 12 bytes, 1 method/thunk relocation slots; target trailing 4 bytes are zero and contain no relocation; references __dt__Q39textinput9inputform10EditBufferFv .text+0x2A -> data+0x8B8; __dt__Q39textinput9inputform10EditBufferFv .text+0x2E -> data+0x8B8.
- 0x8165D228 __vt__Q29textinput4Base -> __vt__Q29textinput4Base, extent 48 -> 20: real compiler vtable is 20 bytes, 3 method/thunk relocation slots; target trailing 28 bytes are zero and contain no relocation; references none in this unit.
- 0x8165D27C lbl_8165D258 -> @STRING@onOutOfLength__Q29textinput13EventObserverFv, extent 13 -> 13: function-generated string b'OutOfLength\n', actual literal extent 13, target final 0 bytes zero alignment; references none in this unit.
- 0x8165D28C @STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl -> @STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl, extent 68 -> 65: function-generated string b'Error#004\nAn error has occurred.\nThe system files are corrupted.', actual literal extent 65, target final 3 bytes zero alignment; references none in this unit.
Initial tiInputForm name-pairing trial reached data 3772/3772 but the gate rejected its DOL hash. Isolated the cause to making the duplicate OutOfLength literal globally visible under the inline function-generated name: iplSystem already owns a global literal under that exact name at 0x81634699. Restoring only the old literal name restored the retail hash, proving the other changes preserve it. The source inline literal is translation-unit compiler-owned data; extract this duplicate as scope:local with its actual source symbol name to preserve the existing global literal's binding. All 43U object symbol tables were checked: no other unit refers to the old lbl_8165D258 symbol. No address/extent/content changes; no real function or public API scope changed.
Neighbour-literal relocation/type proofs strengthened by target disassembly: LayoutByNW4R::create establishes r30 from the .data base relocation, then instruction .text+0x9D6C passes r30+0x3D0 to the resource accessor to load RevoIpl_RodinNTLGProM_32_I4.brfnt; this independently proves the 34-byte literal at 0x8165CBF0 rather than relying on byte similarity alone. LayoutByNW4R::calc at .text+0xA6BC passes the .data base+0x418 to its virtual setVisible for N_separateBarAll, proving the distinct 17-byte object at 0x8165CC38. Both remain ordinary compiler-pooled source literals.
tiInputForm corrected local-string trial passes the all-unit quick gate: every non-text section 100%, matched_data 1036 -> 3772/3772, instruction-exact 216/221 unchanged, no regressions, correct retail DOL hash. All extra weak tables remain genuine compiler output and require no suppression.
MyTiManager: fetched origin, owned source unchanged; pool identical (7 strings). Recover each compiler literal identity, preserving all extents:
- 0x81667E38 lbl_81667E38 -> @8346, same 25 bytes: compiler literal b'WiiBitmapFontType2.brfnt\x00'; relocation loads createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9BA, createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9CE, createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAE2, createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAF6, __sinit_\MyTiManager_cpp .text+0x4E22, __sinit_\MyTiManager_cpp .text+0x4E26.
- 0x81667E58 lbl_81667E58 -> @8347, same 16 bytes: compiler literal b'my_Memo_a.brlyt\x00'; relocation loads createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9BE, createMemoInputForm__Q49textinput6extend4memo7ManagerFv .text+0x9D2.
- 0x81667E68 lbl_81667E68 -> @8369, same 17 bytes: compiler literal b'my_LetterL.brlyt\x00'; relocation loads createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAE6, createLetterInputForm__Q49textinput6extend4memo7ManagerFv .text+0xAFA.
- 0x81667E7C lbl_81667E7C -> @8385, same 22 bytes: compiler literal b'fs_VK_textBox_a.brlyt\x00'; relocation loads createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC22, createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC36.
- 0x81667E94 lbl_81667E94 -> @8386, same 25 bytes: compiler literal b'WiiBitmapFontType1.brfnt\x00'; relocation loads createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC26, createInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC3A, createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC82, createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC96.
- 0x81667EB0 lbl_81667EB0 -> @8402, same 22 bytes: compiler literal b'fs_VK_textBox_b.brlyt\x00'; relocation loads createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC7E, createBigTextInputForm__Q49textinput6extend4memo7ManagerFv .text+0xC92.
- 0x81667EC8 lbl_81667EC8 -> @8410, same 17 bytes: compiler literal b'fs_VK_bg_a.brlyt\x00'; relocation loads createBG__Q49textinput6extend4memo7ManagerFv .text+0xCF2, createBG__Q49textinput6extend4memo7ManagerFv .text+0xCFA.
MyTiManager literal identities pass the all-unit quick gate with no regressions and preserved DOL hash. All seven genuine pooled literal objects now pair by compiler identity, while every retained vtable has the real exact method slots. Unit matched_data remains 148/1132 because the target-only lbl_816681E8 object is still unpaired. It is 40 zero bytes at 0x816681E8..0x81668210, after the 320-byte Manager vtable; source .data ends at offset 0x3B0. No incoming relocation in any original 43U object and no outgoing relocation prove a real type or name for those bytes. No source object was fabricated, no hidden flag added, no zero-size annotation or symbol deletion used to force the score. Remaining extent/ownership is explicitly uncertain. This commit improves real symbol pairing, not the unit's aggregate data measure.
Advisory literal_reference_diff.py over all three units, --all-functions: 35 arguments checked in 373 analyzed functions, no candidates/errors; LayoutByNW4R::create skipped because source/target function sizes differ. This is additional literal evidence, not proof for the unknown zero tail.
## Continuation final verification
Final full gate ran without --quick and rebuilt from a clean 43U build. tiInputForm data 1036 -> 3772/3772 and tiKeyboard 12 -> 2708/2708 now reach the entire data goal; MyTiManager remains 148/1132, with .data 97.92531% and only the unpaired 40-byte tail requiring ownership/type evidence. No code bodies were changed in this continuation. Instruction-exact counts remain 216/221, 62/62 and 91/91; code bytes remain 46980/50656, 8368/8368 and 20196/20196. Checked every changed symbols.txt annotation: all 70 removed/added lines belong to the three assigned split ranges. All section totals stay unchanged.
Open-function completeness audit: calcCursorPos, LayoutByNW4R::create and LayoutByNW4R::setLanguage each have the three distinct source-level attempts recorded earlier in this same log; all were restored and remain open only for code work. Every function in tiKeyboard and MyTiManager is already exact. The two additional objdiff-100% tiInputForm functions excluded from instruction-exact counts are unchanged, preserving the baseline definition.
Tool-source evidence for the pairing method: the installed objdiff-cli is v3.4.5. Its official [find_symbol implementation](https://github.com/encounter/objdiff/blob/v3.4.5/objdiff-core/src/diff/mod.rs#L690) pairs compiler-generated literal/table symbols by exact bytes and relocations, independent of their numeric counters. [diff_generic_section](https://github.com/encounter/objdiff/blob/v3.4.5/objdiff-core/src/diff/data.rs#L511) requires every target-owned symbol to pair at 100%; extra source weak symbols do not prevent this route. The seven now-paired MyTiManager literals and every genuine retained vtable are exact, but the unknown target-owned 40-byte object is still unpaired; it was left intact.
Accepted commits: a6c8a274 (tiKeyboard data 100%), 4ba13948 (tiInputForm data 100%), 78403153 (MyTiManager's seven compiler literal identities, without an aggregate gain).
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiInputForm] pool: IDENTICAL
[src/keyboard/tiInputForm] objdiff: code 46980/50656 data 3772/3772 functions 218/221 fuzzy 99.5781 linked code 0
[src/keyboard/tiInputForm] instruction-exact functions: 216/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.578094
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 91.622696
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 95.02809
[src/keyboard/tiInputForm] below 100: setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language 96.44726
[src/keyboard/tiInputForm] baseline: code 46980/50656 data 1036 functions 218 fuzzy 99.5781
[src/keyboard/tiKeyboard] pool: IDENTICAL
[src/keyboard/tiKeyboard] objdiff: code 8368/8368 data 2708/2708 functions 62/62 fuzzy 100.0000 linked code 8368
[src/keyboard/tiKeyboard] instruction-exact functions: 62/62
[src/keyboard/tiKeyboard] section .ctors size 4 match 100.0
[src/keyboard/tiKeyboard] section .data size 2696 match 100.0
[src/keyboard/tiKeyboard] section .sbss size 8 match 100.0
[src/keyboard/tiKeyboard] section .text size 8368 match 100.0
[src/keyboard/tiKeyboard] baseline: code 8368/8368 data 12 functions 62 fuzzy 100.0000
[src/keyboard/MyTiManager] pool: IDENTICAL
[src/keyboard/MyTiManager] objdiff: code 20196/20196 data 148/1132 functions 91/91 fuzzy 100.0000 linked code 0
[src/keyboard/MyTiManager] instruction-exact functions: 91/91
[src/keyboard/MyTiManager] section .bss size 72 match 100.0
[src/keyboard/MyTiManager] section .ctors size 4 match 100.0
[src/keyboard/MyTiManager] section .data size 984 match 97.92531
[src/keyboard/MyTiManager] section .sbss size 16 match 100.0
[src/keyboard/MyTiManager] section .sdata size 24 match 100.0
[src/keyboard/MyTiManager] section .sdata2 size 32 match 100.0
[src/keyboard/MyTiManager] section .text size 20196 match 100.0
[src/keyboard/MyTiManager] baseline: code 20196/20196 data 148 functions 91 fuzzy 100.0000
regressions vs baseline: 0
global matched_code_percent: 88.70241 -> 88.70241
global fuzzy_match_percent: 99.47499 -> 99.47499
global complete_code_percent: 63.21193 -> 63.54459
global matched_data_percent: 98.77142 -> 99.06781
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
note: no baseline for merge-base 6ebe56bc; compared against nearest snapshotted ancestor 69c235ff (1 commits back)
note: config touched: config/43U/symbols.txt (orchestrator reviews every config/symbols change)
GATE PASS
```

File diff suppressed because it is too large Load Diff

View File

@@ -1,69 +0,0 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RVL_SDK/src/fa/api/FAAttach] pool: IDENTICAL
[libs/RVL_SDK/src/fa/api/FAAttach] objdiff: code None/500 data 240/240 functions 0/1 fuzzy 99.3600 linked code 0
[libs/RVL_SDK/src/fa/api/FAAttach] instruction-exact functions: 0/1
[libs/RVL_SDK/src/fa/api/FAAttach] section .bss size 208 match 100.0
[libs/RVL_SDK/src/fa/api/FAAttach] section .data size 24 match 100.0
[libs/RVL_SDK/src/fa/api/FAAttach] section .sdata size 8 match 100.0
[libs/RVL_SDK/src/fa/api/FAAttach] section .text size 500 match 99.36
[libs/RVL_SDK/src/fa/api/FAAttach] below 100: FAAttach 99.36
[libs/RVL_SDK/src/fa/api/FAAttach] baseline: code None/500 data 240 functions 0 fuzzy 99.3600
[src/bannerSound/AxAdpcmPlayer] pool: IDENTICAL
[src/bannerSound/AxAdpcmPlayer] objdiff: code 3088/3088 data 6476/6476 functions 13/13 fuzzy 100.0000 linked code 3088
[src/bannerSound/AxAdpcmPlayer] instruction-exact functions: 12/13
[src/bannerSound/AxAdpcmPlayer] section .bss size 6400 match 100.0
[src/bannerSound/AxAdpcmPlayer] section .ctors size 4 match 100.0
[src/bannerSound/AxAdpcmPlayer] section .data size 32 match 100.0
[src/bannerSound/AxAdpcmPlayer] section .sbss size 16 match 100.0
[src/bannerSound/AxAdpcmPlayer] section .sdata size 8 match 100.0
[src/bannerSound/AxAdpcmPlayer] section .sdata2 size 16 match 100.0
[src/bannerSound/AxAdpcmPlayer] section .text size 3088 match 100.0
[src/bannerSound/AxAdpcmPlayer] baseline: code 3088/3088 data 6476 functions 13 fuzzy 100.0000
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] pool: IDENTICAL
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] objdiff: code 332/5200 data 96/180 functions 1/7 fuzzy 98.6539 linked code 0
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] instruction-exact functions: 1/7
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .data size 40 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section .text size 5200 match 98.65385
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extab size 56 match 100.0
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] section extabindex size 84 match 97.61904
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_8148302C 99.49152
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483264 98.902435
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_81483308 99.13793
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814833F0 99.04256
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8_814834AC 99.3586
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] below 100: Zi8GetKOcandidates 97.96712
[libs/RVLMiddleware/eZiText/src/clib/zkokeyp] baseline: code 332/5200 data 96 functions 1 fuzzy 98.6539
[src/scene/board/iplFocusObject] pool: IDENTICAL
[src/scene/board/iplFocusObject] objdiff: code 20332/20332 data 2576/2576 functions 89/89 fuzzy 100.0000 linked code 0
[src/scene/board/iplFocusObject] instruction-exact functions: 89/89
[src/scene/board/iplFocusObject] section .data size 2168 match 100.0
[src/scene/board/iplFocusObject] section .rodata size 176 match 100.0
[src/scene/board/iplFocusObject] section .sdata size 176 match 100.0
[src/scene/board/iplFocusObject] section .sdata2 size 56 match 100.0
[src/scene/board/iplFocusObject] section .text size 20332 match 100.0
[src/scene/board/iplFocusObject] baseline: code 19772/20332 data 2576 functions 88 fuzzy 99.6471
[src/system/iplKeyboard] pool: IDENTICAL
[src/system/iplKeyboard] objdiff: code 4752/6024 data 1184/1184 functions 31/32 fuzzy 98.7351 linked code 0
[src/system/iplKeyboard] instruction-exact functions: 31/32
[src/system/iplKeyboard] section .data size 1168 match 100.0
[src/system/iplKeyboard] section .sdata size 8 match 100.0
[src/system/iplKeyboard] section .sdata2 size 8 match 100.0
[src/system/iplKeyboard] section .text size 6024 match 98.73506
[src/system/iplKeyboard] below 100: create__Q33ipl8keyboard7ManagerFPQ33ipl4nand4FilePQ23EGG4Heap 94.00944
[src/system/iplKeyboard] baseline: code 4752/6024 data 1184 functions 31 fuzzy 98.7351
[libs/RVL_SDK/src/fa/pf_dir] pool: IDENTICAL
[libs/RVL_SDK/src/fa/pf_dir] objdiff: code 18976/18976 data 40/40 functions 38/38 fuzzy 100.0000 linked code 0
[libs/RVL_SDK/src/fa/pf_dir] instruction-exact functions: 38/38
[libs/RVL_SDK/src/fa/pf_dir] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .sdata2 size 8 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] section .text size 18976 match 100.0
[libs/RVL_SDK/src/fa/pf_dir] baseline: code 11704/18976 data 40 functions 35 fuzzy 99.5432
regressions vs baseline: 0
global matched_code_percent: 88.93407 -> 89.19556
global fuzzy_match_percent: 99.50078 -> 99.50607
global complete_code_percent: 65.19670 -> 65.19670
global matched_data_percent: 99.07044 -> 99.07044
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS

Some files were not shown because too many files have changed in this diff Show More