Compare commits

...

5 Commits

Author SHA1 Message Date
coah
4700e05974 match(iplMemoryCardManager): update_file_array
Load mLastCmd through a volatile so MWCC keeps the this+0x10000
base in r3 and the command value in r4 for the range check.
2026-10-01 17:33:21 -05:00
coah
9b69048f06 cleanup(WDScan): name RSN/WPA OUI byte constants (#531)
Rename privacy-mode OUI sdata/sdata2 bytes used by WDGetPrivacyMode.
Leave unused pad bytes as address labels so section layout stays fixed.
2026-10-01 17:32:44 -05:00
coah
602b10ed43 data(CDBFileSystemUtils): match .sdata path separator (#530)
Replace lbl_816979E8 + .sdata section pragma with a plain
char CDBFSPathSeparator = '/' so the .sdata symbol size matches
the original (1 byte). Rename the symbol in symbols.txt to match.

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:32:14 -05:00
github-actions[bot]
f0a91338f4 docs: update progress [skip ci] 2026-10-01 22:31:51 +00:00
coah
ff568a273c cleanup(rvl_dec): name Rvl_decode_ash C locals (#528)
Replace Ghidra locals in the non-asm ASH decoder path with
bitstream/huffman-oriented names.
2026-10-01 17:31:22 -05:00
6 changed files with 205 additions and 208 deletions

View File

@@ -53,7 +53,7 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.71% | 61.93% | 92.05% |
| 99.37% | 87.71% | 61.93% | 92.06% |
units 917/1027 complete, functions 12213/12563 matched.

View File

@@ -20769,12 +20769,12 @@ NET_AES_BLOCK_MODE_CBC = .sdata2:0x81695040; // type:object size:0x8
@524 = .sdata2:0x81695050; // type:object size:0x2 scope:local data:byte
@1077 = .sdata2:0x81695054; // type:object size:0x2 scope:local data:byte
@1128 = .sdata2:0x81695058; // type:object size:0x2 scope:local data:byte
lbl_81695060 = .sdata2:0x81695060; // type:object size:0x1 data:byte
lbl_81695061 = .sdata2:0x81695061; // type:object size:0x1 data:byte
lbl_81695062 = .sdata2:0x81695062; // type:object size:0x1 data:byte
lbl_81695064 = .sdata2:0x81695064; // type:object size:0x1 data:byte
lbl_81695065 = .sdata2:0x81695065; // type:object size:0x1 data:byte
lbl_81695066 = .sdata2:0x81695066; // type:object size:0x1 data:byte
scRsnOui0 = .sdata2:0x81695060; // type:object size:0x1 data:byte
scRsnOui1 = .sdata2:0x81695061; // type:object size:0x1 data:byte
scRsnOui2 = .sdata2:0x81695062; // type:object size:0x1 data:byte
scWpaOui0 = .sdata2:0x81695064; // type:object size:0x1 data:byte
scWpaOui1 = .sdata2:0x81695065; // type:object size:0x1 data:byte
scWpaOui2 = .sdata2:0x81695066; // type:object size:0x1 data:byte
scFilePermissions = .sdata2:0x81695068; // type:object size:0x2 scope:local
cWhite = .sdata2:0x81695070; // type:object size:0x4 scope:local data:byte
@2829 = .sdata2:0x81695074; // type:object size:0x4 scope:local align:4 data:float
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
@@ -22700,9 +22700,9 @@ __SSLVersion = .sdata:0x81697CE0; // type:object size:0x4 data:4byte
qErr$1631 = .sdata:0x81697D58; // type:object size:0x4 scope:local data:4byte
l_dev_nandflash_init_info = .sdata:0x81697D60; // type:object size:0x8 scope:local
l_dev_sd_direct_init_info = .sdata:0x81697D68; // type:object size:0x8 scope:local
lbl_81697D70 = .sdata:0x81697D70; // type:object size:0x1 data:byte
lbl_81697D71 = .sdata:0x81697D71; // type:object size:0x1 data:byte
lbl_81697D72 = .sdata:0x81697D72; // type:object size:0x1 data:byte
scWpaFindOui0 = .sdata:0x81697D70; // type:object size:0x1 data:byte
scWpaFindOui1 = .sdata:0x81697D71; // type:object size:0x1 data:byte
scWpaFindOui2 = .sdata:0x81697D72; // type:object size:0x1 data:byte
__RFLVersion = .sdata:0x81697D78; // type:object size:0x4 data:4byte
sRFLLastErrCode = .sdata:0x81697D7C; // type:object size:0x4 scope:local data:4byte
scResFileFullPathName = .sdata:0x81697D80; // type:object size:0x4 scope:local data:4byte

View File

@@ -6,13 +6,10 @@
#include <stdlib.h>
#include <string.h>
#pragma push
#pragma section sconst_type ".sdata"
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
#pragma pop
char CDBFSPathSeparator = '/';
void CDBFSConcatenatePath(char* path, const char* concatPath) {
strcat(path, lbl_816979E8);
strcat(path, &CDBFSPathSeparator);
strcat(path, concatPath);
}

View File

@@ -10,20 +10,20 @@
#pragma push
#pragma section sconst_type ".sdata2"
const u8 lbl_81695060 = 0;
const u8 lbl_81695061 = 0x0F;
const u8 lbl_81695062 = 0xAC;
const u8 scRsnOui0 = 0;
const u8 scRsnOui1 = 0x0F;
const u8 scRsnOui2 = 0xAC;
const u8 lbl_81695063 = 0;
const u8 lbl_81695064 = 0;
const u8 lbl_81695065 = 0x50;
const u8 lbl_81695066 = 0xF2;
const u8 scWpaOui0 = 0;
const u8 scWpaOui1 = 0x50;
const u8 scWpaOui2 = 0xF2;
const u8 lbl_81695067 = 0;
#pragma pop
#pragma push
#pragma section sconst_type ".sdata"
const u8 lbl_81697D70 = 0;
const u8 lbl_81697D71 = 0x50;
const u8 lbl_81697D72 = 0xF2;
const u8 scWpaFindOui0 = 0;
const u8 scWpaFindOui1 = 0x50;
const u8 scWpaFindOui2 = 0xF2;
const u8 lbl_81697D73 = 0;
const u8 lbl_81697D74 = 0;
const u8 lbl_81697D75 = 0;
@@ -31,15 +31,15 @@ const u8 lbl_81697D76 = 0;
const u8 lbl_81697D77 = 0;
#pragma pop
#define lbl_81695060 (*((volatile const u8*)&lbl_81695060))
#define lbl_81695061 (*((volatile const u8*)&lbl_81695061))
#define lbl_81695062 (*((volatile const u8*)&lbl_81695062))
#define lbl_81695064 (*((volatile const u8*)&lbl_81695064))
#define lbl_81695065 (*((volatile const u8*)&lbl_81695065))
#define lbl_81695066 (*((volatile const u8*)&lbl_81695066))
#define lbl_81697D70 (*((volatile const u8*)&lbl_81697D70))
#define lbl_81697D71 (*((volatile const u8*)&lbl_81697D71))
#define lbl_81697D72 (*((volatile const u8*)&lbl_81697D72))
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))
#define scRsnOui1 (*((volatile const u8*)&scRsnOui1))
#define scRsnOui2 (*((volatile const u8*)&scRsnOui2))
#define scWpaOui0 (*((volatile const u8*)&scWpaOui0))
#define scWpaOui1 (*((volatile const u8*)&scWpaOui1))
#define scWpaOui2 (*((volatile const u8*)&scWpaOui2))
#define scWpaFindOui0 (*((volatile const u8*)&scWpaFindOui0))
#define scWpaFindOui1 (*((volatile const u8*)&scWpaFindOui1))
#define scWpaFindOui2 (*((volatile const u8*)&scWpaFindOui2))
extern void _savegpr_21();
extern void _restgpr_21();
@@ -175,9 +175,9 @@ s32 WDGetPrivacyMode(WDBssDesc* bssDesc) {
if (WDFindInformationElement((WDInfoElement**)&ieData, &ieLength, bssDesc, 0x30)) {
u8 data[WD_VENDOR_LENGTH];
data[0] = lbl_81695060;
data[1] = lbl_81695061;
data[2] = lbl_81695062;
data[0] = scRsnOui0;
data[1] = scRsnOui1;
data[2] = scRsnOui2;
memcpy(readIE, ieData, sizeof(WDVendorInfoElement) + 2);
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) == 0) {
if ((s32)readIE[5] == 3) {
@@ -218,15 +218,15 @@ privacy_second: {
u8 data[WD_VENDOR_LENGTH];
u8 findData[WD_VENDOR_LENGTH];
findData[0] = lbl_81697D70;
findData[1] = lbl_81697D71;
findData[2] = lbl_81697D72;
findData[0] = scWpaFindOui0;
findData[1] = scWpaFindOui1;
findData[2] = scWpaFindOui2;
if (!WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
goto privacy_fallback;
}
data[0] = lbl_81695064;
data[1] = lbl_81695065;
data[2] = lbl_81695066;
data[0] = scWpaOui0;
data[1] = scWpaOui1;
data[2] = scWpaOui2;
{
memcpy(readIE, ieData, sizeof(WDVendorInfoElement));

View File

@@ -281,7 +281,7 @@ void MemoryCardManager::update_file_array(u8 slot) {
memorycard::CardState* states = memorycard::getCardSlotState();
states[slot].changed = 0;
sort_file_array(slot);
long command = mLastCmd;
long command = *(volatile long*)&mLastCmd;
if ((u32)(command - 1) <= 3) {
if (mLastResult == -0x15) {
mLastResult = memorycard::getCardLastCMDFCmdResult();

View File

@@ -490,225 +490,225 @@ L_Rvl_decode_ash_return:
}
#else
int Rvl_decode_ash(u8* out, u8* in) {
u8* puVar1;
u32* puVar2;
u32 uVar3;
u32 uVar4;
u32 uVar5;
u32 uVar6;
int iVar7;
u16 uVar8;
u16 uVar10;
u8* puVar9;
int iVar11;
u32 uVar12;
u32 uVar13;
u32 uVar14;
u32 uVar15;
int iVar16;
int iVar17;
u32 uVar18;
u32 uVar19;
u32 uVar20;
u16* puVar21;
u8* dst;
u32* inWordPtr;
u32 decodedSize;
u32 sym9;
u32 sym11;
u32 nodeVal;
int needBits;
u16 nodeCount;
u16 nextNode;
u8* litPtr;
int bitOff1;
u32 bitPos1;
u32 shifted;
u32 bitWord1;
u32 tmp15;
int stackDepth;
int bitOff2;
u32 bitPos2;
u32 bitWord2;
u32 tmp20;
u16* stackPtr;
uVar3 = *(u32*)(in + 4) & 0xffffff;
iVar11 = 0x10;
uVar12 = 0;
uVar18 = 0;
uVar19 = *(u32*)(*(int*)(in + 8) + in);
iVar17 = *(int*)(in + 8) + 4;
puVar21 = (u16*)&work[0x4ff8];
uVar8 = 0x200;
iVar16 = 0;
uVar14 = *(u32*)(in + 0xc);
uVar10 = 0x200;
decodedSize = *(u32*)(in + 4) & 0xffffff;
bitOff1 = 0x10;
bitPos1 = 0;
bitPos2 = 0;
bitWord2 = *(u32*)(*(int*)(in + 8) + in);
bitOff2 = *(int*)(in + 8) + 4;
stackPtr = (u16*)&work[0x4ff8];
nodeCount = 0x200;
stackDepth = 0;
bitWord1 = *(u32*)(in + 0xc);
nextNode = 0x200;
do {
while (1) {
if (uVar12 == 0x1f) {
uVar13 = *(u32*)(in + iVar11);
uVar12 = 0;
iVar11 = iVar11 + 4;
if (bitPos1 == 0x1f) {
shifted = *(u32*)(in + bitOff1);
bitPos1 = 0;
bitOff1 = bitOff1 + 4;
} else {
uVar12 = uVar12 + 1;
uVar13 = uVar14 << 1;
bitPos1 = bitPos1 + 1;
shifted = bitWord1 << 1;
}
if (-1 < (int)uVar14) {
if (-1 < (int)bitWord1) {
break;
}
*puVar21 = uVar10 | 0x8000;
puVar21[1] = uVar10 | 0x4000;
puVar21 = puVar21 + 2;
iVar16 = iVar16 + 2;
uVar8 = uVar8 + 1;
uVar14 = uVar13;
uVar10 = uVar10 + 1;
*stackPtr = nextNode | 0x8000;
stackPtr[1] = nextNode | 0x4000;
stackPtr = stackPtr + 2;
stackDepth = stackDepth + 2;
nodeCount = nodeCount + 1;
bitWord1 = shifted;
nextNode = nextNode + 1;
}
iVar7 = uVar12 + 9;
if (iVar7 < 0x21) {
uVar4 = uVar13 >> 0x17;
if (iVar7 == 0x20) {
uVar14 = *(u32*)(in + iVar11);
uVar12 = 0;
iVar11 = iVar11 + 4;
needBits = bitPos1 + 9;
if (needBits < 0x21) {
sym9 = shifted >> 0x17;
if (needBits == 0x20) {
bitWord1 = *(u32*)(in + bitOff1);
bitPos1 = 0;
bitOff1 = bitOff1 + 4;
} else {
uVar14 = uVar13 << 9;
uVar12 = uVar12 + 9;
bitWord1 = shifted << 9;
bitPos1 = bitPos1 + 9;
}
} else {
puVar2 = (u32*)(in + iVar11);
iVar11 = iVar11 + 4;
uVar4 = uVar13 >> 0x17 | *puVar2 >> (0x40U - iVar7 & 0x3f);
uVar12 = uVar12 - 0x17;
uVar14 = *puVar2 << (uVar12 & 0x3f);
inWordPtr = (u32*)(in + bitOff1);
bitOff1 = bitOff1 + 4;
sym9 = shifted >> 0x17 | *inWordPtr >> (0x40U - needBits & 0x3f);
bitPos1 = bitPos1 - 0x17;
bitWord1 = *inWordPtr << (bitPos1 & 0x3f);
}
while (1) {
puVar21 = puVar21 - 1;
uVar10 = *puVar21;
iVar16 = iVar16 - 1;
iVar7 = (uVar10 & 0x3fff) * 2;
if ((uVar10 & 0x8000) == 0) {
stackPtr = stackPtr - 1;
nextNode = *stackPtr;
stackDepth = stackDepth - 1;
needBits = (nextNode & 0x3fff) * 2;
if ((nextNode & 0x8000) == 0) {
break;
}
*(u16*)(&work[0x7fe] + iVar7) = (u16)uVar4;
uVar4 = uVar10 & 0x3fff;
if (iVar16 == 0) {
uVar8 = 0x800;
iVar16 = 0;
uVar10 = 0x800;
*(u16*)(&work[0x7fe] + needBits) = (u16)sym9;
sym9 = nextNode & 0x3fff;
if (stackDepth == 0) {
nodeCount = 0x800;
stackDepth = 0;
nextNode = 0x800;
do {
while (1) {
if (uVar18 == 0x1f) {
uVar13 = *(u32*)(in + iVar17);
uVar18 = 0;
iVar17 = iVar17 + 4;
if (bitPos2 == 0x1f) {
shifted = *(u32*)(in + bitOff2);
bitPos2 = 0;
bitOff2 = bitOff2 + 4;
} else {
uVar18 = uVar18 + 1;
uVar13 = uVar19 << 1;
bitPos2 = bitPos2 + 1;
shifted = bitWord2 << 1;
}
if (-1 < (int)uVar19) {
if (-1 < (int)bitWord2) {
break;
}
*puVar21 = uVar10 | 0x8000;
puVar21[1] = uVar10 | 0x4000;
puVar21 = puVar21 + 2;
iVar16 = iVar16 + 2;
uVar8 = uVar8 + 1;
uVar19 = uVar13;
uVar10 = uVar10 + 1;
*stackPtr = nextNode | 0x8000;
stackPtr[1] = nextNode | 0x4000;
stackPtr = stackPtr + 2;
stackDepth = stackDepth + 2;
nodeCount = nodeCount + 1;
bitWord2 = shifted;
nextNode = nextNode + 1;
}
iVar7 = uVar18 + 0xb;
if (iVar7 < 0x21) {
uVar5 = uVar13 >> 0x15;
if (iVar7 == 0x20) {
uVar19 = *(u32*)(in + iVar17);
uVar18 = 0;
iVar17 = iVar17 + 4;
needBits = bitPos2 + 0xb;
if (needBits < 0x21) {
sym11 = shifted >> 0x15;
if (needBits == 0x20) {
bitWord2 = *(u32*)(in + bitOff2);
bitPos2 = 0;
bitOff2 = bitOff2 + 4;
} else {
uVar19 = uVar13 << 0xb;
uVar18 = uVar18 + 0xb;
bitWord2 = shifted << 0xb;
bitPos2 = bitPos2 + 0xb;
}
} else {
puVar2 = (u32*)(in + iVar17);
iVar17 = iVar17 + 4;
uVar5 = uVar13 >> 0x15 | *puVar2 >> (0x40U - iVar7 & 0x3f);
uVar18 = uVar18 - 0x15;
uVar19 = *puVar2 << (uVar18 & 0x3f);
inWordPtr = (u32*)(in + bitOff2);
bitOff2 = bitOff2 + 4;
sym11 = shifted >> 0x15 | *inWordPtr >> (0x40U - needBits & 0x3f);
bitPos2 = bitPos2 - 0x15;
bitWord2 = *inWordPtr << (bitPos2 & 0x3f);
}
while (1) {
puVar21 = puVar21 - 1;
uVar10 = *puVar21;
iVar16 = iVar16 - 1;
iVar7 = (uVar10 & 0x3fff) * 2;
if ((uVar10 & 0x8000) == 0) {
stackPtr = stackPtr - 1;
nextNode = *stackPtr;
stackDepth = stackDepth - 1;
needBits = (nextNode & 0x3fff) * 2;
if ((nextNode & 0x8000) == 0) {
break;
}
*(u16*)(&work[0x2ffa] + iVar7) = (u16)uVar5;
uVar5 = uVar10 & 0x3fff;
uVar6 = uVar4;
uVar13 = uVar3;
if (iVar16 == 0) {
*(u16*)(&work[0x2ffa] + needBits) = (u16)sym11;
sym11 = nextNode & 0x3fff;
nodeVal = sym9;
shifted = decodedSize;
if (stackDepth == 0) {
do {
while (0x1ff < uVar6) {
if (uVar12 == 0x1f) {
uVar15 = *(u32*)(in + iVar11);
iVar11 = iVar11 + 4;
uVar12 = 0;
while (0x1ff < nodeVal) {
if (bitPos1 == 0x1f) {
tmp15 = *(u32*)(in + bitOff1);
bitOff1 = bitOff1 + 4;
bitPos1 = 0;
} else {
uVar12 = uVar12 + 1;
uVar15 = uVar14 << 1;
bitPos1 = bitPos1 + 1;
tmp15 = bitWord1 << 1;
}
if ((int)uVar14 < 0) {
uVar6 = *(u16*)(&work[0x7fe] + uVar6 * 2);
uVar14 = uVar15;
if ((int)bitWord1 < 0) {
nodeVal = *(u16*)(&work[0x7fe] + nodeVal * 2);
bitWord1 = tmp15;
} else {
uVar6 = *(u16*)((u8*)work + uVar6 * 2);
uVar14 = uVar15;
nodeVal = *(u16*)((u8*)work + nodeVal * 2);
bitWord1 = tmp15;
}
}
uVar15 = uVar5;
if (uVar6 < 0x100) {
*out = (char)uVar6;
tmp15 = sym11;
if (nodeVal < 0x100) {
*out = (char)nodeVal;
out = out + 1;
uVar13 = uVar13 - 1;
shifted = shifted - 1;
} else {
while (0x7ff < uVar15) {
if (uVar18 == 0x1f) {
uVar20 = *(u32*)(in + iVar17);
iVar17 = iVar17 + 4;
uVar18 = 0;
while (0x7ff < tmp15) {
if (bitPos2 == 0x1f) {
tmp20 = *(u32*)(in + bitOff2);
bitOff2 = bitOff2 + 4;
bitPos2 = 0;
} else {
uVar18 = uVar18 + 1;
uVar20 = uVar19 << 1;
bitPos2 = bitPos2 + 1;
tmp20 = bitWord2 << 1;
}
if ((int)uVar19 < 0) {
uVar15 = *(u16*)(&work[0x2ffa] + uVar15 * 2);
uVar19 = uVar20;
if ((int)bitWord2 < 0) {
tmp15 = *(u16*)(&work[0x2ffa] + tmp15 * 2);
bitWord2 = tmp20;
} else {
uVar15 = *(u16*)(&work[0xffc] + uVar15 * 2);
uVar19 = uVar20;
tmp15 = *(u16*)(&work[0xffc] + tmp15 * 2);
bitWord2 = tmp20;
}
}
uVar6 = uVar6 - 0xfd;
puVar9 = out - uVar15;
uVar13 = uVar13 - uVar6;
uVar15 = uVar6 >> 3;
if (uVar15 == 0) {
nodeVal = nodeVal - 0xfd;
litPtr = out - tmp15;
shifted = shifted - nodeVal;
tmp15 = nodeVal >> 3;
if (tmp15 == 0) {
goto LAB_813325b8;
}
do {
*out = puVar9[-1];
out[1] = *puVar9;
out[2] = puVar9[1];
out[3] = puVar9[2];
out[4] = puVar9[3];
out[5] = puVar9[4];
out[6] = puVar9[5];
out[7] = puVar9[6];
puVar9 = puVar9 + 8;
*out = litPtr[-1];
out[1] = *litPtr;
out[2] = litPtr[1];
out[3] = litPtr[2];
out[4] = litPtr[3];
out[5] = litPtr[4];
out[6] = litPtr[5];
out[7] = litPtr[6];
litPtr = litPtr + 8;
out = out + 8;
uVar15 = uVar15 - 1;
} while (uVar15 != 0);
for (uVar6 = uVar6 & 7; uVar6 != 0; uVar6 = uVar6 - 1) {
tmp15 = tmp15 - 1;
} while (tmp15 != 0);
for (nodeVal = nodeVal & 7; nodeVal != 0; nodeVal = nodeVal - 1) {
LAB_813325b8:
puVar1 = puVar9 - 1;
puVar9 = puVar9 + 1;
*out = *puVar1;
dst = litPtr - 1;
litPtr = litPtr + 1;
*out = *dst;
out = out + 1;
}
}
uVar6 = uVar4;
} while (uVar13 != 0);
return uVar3;
nodeVal = sym9;
} while (shifted != 0);
return decodedSize;
}
}
*(u16*)(&work[0xffc] + iVar7) = (u16)uVar5;
uVar10 = uVar8;
*(u16*)(&work[0xffc] + needBits) = (u16)sym11;
nextNode = nodeCount;
} while (1);
}
}
*(u16*)((u8*)work + iVar7) = (u16)uVar4;
uVar10 = uVar8;
*(u16*)((u8*)work + needBits) = (u16)sym9;
nextNode = nodeCount;
} while (1);
}
#endif