Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af0636d9dc | ||
|
|
3aa9daf94a | ||
|
|
dc48b109b0 | ||
|
|
b6f2304efc | ||
|
|
7fac2b91ec | ||
|
|
6456e33a4c | ||
|
|
3244c6d7ff | ||
|
|
b2089fbdba | ||
|
|
580b79f40d | ||
|
|
255f3e0530 | ||
|
|
d0e5483630 | ||
|
|
d725e02301 | ||
|
|
87eaad4a42 | ||
|
|
e32aad81fb |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.59% | 91.12% | 74.40% | 99.42% |
|
||||
| 99.59% | 91.16% | 74.57% | 99.56% |
|
||||
|
||||
units 963/1027 complete, functions 12376/12563 matched.
|
||||
units 964/1027 complete, functions 12378/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -21895,7 +21895,7 @@ globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope
|
||||
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
|
||||
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
|
||||
globalNames__Q23www10wiisetting = .sdata:0x81696314; // type:object size:0x8
|
||||
lbl_8169631C = .sdata:0x8169631C; // type:object size:0x1
|
||||
@17315 = .sdata:0x8169631C; // type:object size:0x1 scope:local
|
||||
lbl_8169631D = .sdata:0x8169631D; // type:object size:0x8 data:string
|
||||
lbl_81696325 = .sdata:0x81696325; // type:object size:0x4 data:string
|
||||
lbl_81696329 = .sdata:0x81696329; // type:object size:0x8 data:string
|
||||
|
||||
@@ -1299,7 +1299,7 @@ config.libs = [
|
||||
Object(Matching, "ut/ut_RomFont.cpp"),
|
||||
Object(Matching, "ut/ut_ResFontBase.cpp"),
|
||||
Object(Matching, "ut/ut_ResFont.cpp"),
|
||||
Object(NonMatching, "ut/ut_ArchiveFontBase.cpp"),
|
||||
Object(Matching, "ut/ut_ArchiveFontBase.cpp"),
|
||||
Object(Matching, "ut/ut_ArchiveFont.cpp"),
|
||||
Object(Matching, "ut/ut_CharWriter.cpp"),
|
||||
Object(Matching, "ut/ut_TextWriterBase.cpp"),
|
||||
|
||||
@@ -163,6 +163,9 @@ namespace ipl {
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
f32 get() const;
|
||||
#else
|
||||
f32 get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
@@ -181,6 +184,7 @@ namespace ipl {
|
||||
|
||||
return r;
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 mStart;
|
||||
|
||||
@@ -103,7 +103,7 @@ namespace ipl {
|
||||
y = r.y;
|
||||
z = 0.0f;
|
||||
}
|
||||
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(IPL_SD_CHANNEL_SELECT_CPP) || defined(IPL_GC_WINDOW_CPP)
|
||||
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(IPL_SD_CHANNEL_SELECT_CPP) || defined(IPL_GC_WINDOW_CPP) || defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
VEC3(f32 fx, f32 fy, f32 fz);
|
||||
#else
|
||||
VEC3(f32 fx, f32 fy, f32 fz) {
|
||||
|
||||
@@ -31,8 +31,12 @@ namespace ipl {
|
||||
|
||||
virtual void calc();
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual void initCalcNormal();
|
||||
#else
|
||||
virtual void initCalcNormal() {
|
||||
} // 0x4C
|
||||
#endif
|
||||
virtual void initCalcFadeout() {
|
||||
} // 0x50
|
||||
|
||||
@@ -49,8 +53,12 @@ namespace ipl {
|
||||
return FADER_SCN_NEXT;
|
||||
} // 0x60
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual void calcCommonAfter();
|
||||
#else
|
||||
virtual void calcCommonAfter() {
|
||||
} // 0x64
|
||||
#endif
|
||||
|
||||
int getSceneFadeState() {
|
||||
return mScnFadeState;
|
||||
|
||||
@@ -62,7 +62,11 @@ namespace ipl {
|
||||
virtual ~Base();
|
||||
|
||||
/** @brief If the scene is ready */
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual BOOL isReady() const;
|
||||
#else
|
||||
virtual BOOL isReady() const { return FALSE; }
|
||||
#endif
|
||||
|
||||
/** @brief If the user can power off/reset the system */
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
@@ -73,7 +77,11 @@ namespace ipl {
|
||||
/** @brief The scene running code when powering off/resetting the system */
|
||||
virtual void startResetting() {}
|
||||
/** @brief If the scene has finished its powering off/resetting task */
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual BOOL isResetProcessDone();
|
||||
#else
|
||||
virtual BOOL isResetProcessDone() { return TRUE; }
|
||||
#endif
|
||||
|
||||
/** @brief Prepare to create scene */
|
||||
virtual void prepare() {}
|
||||
@@ -86,10 +94,17 @@ namespace ipl {
|
||||
/** @brief Destroy the scene and clear from memory */
|
||||
virtual void destroy() {}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual Base* getParent();
|
||||
virtual Base* getChild();
|
||||
virtual Base* getNext();
|
||||
virtual Base* getPrev();
|
||||
#else
|
||||
virtual Base* getParent() { return (Base*)mpParent; }
|
||||
virtual Base* getChild() { return (Base*)mpChild; }
|
||||
virtual Base* getNext() { return (Base*)mpNext; }
|
||||
virtual Base* getPrev() { return (Base*)mpPrev; }
|
||||
#endif
|
||||
|
||||
/** @brief Check if scene has been created.*/
|
||||
bool isSceneCreated() const { return (mScnState & SCN_STATE_CREATED); }
|
||||
|
||||
@@ -65,8 +65,13 @@ namespace ipl {
|
||||
/** @brief Writes the file contents. */
|
||||
virtual void write(); // 0x10
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
virtual bool isFinished();
|
||||
virtual int checkData();
|
||||
#else
|
||||
virtual bool isFinished() { return mbDoneTask; } // 0x14
|
||||
virtual int checkData() { return mResult; } // 0x18
|
||||
#endif
|
||||
virtual bool isFatalError(); // 0x1C
|
||||
|
||||
u8* getBuffer() const { return mpBuffer; }
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace ipl {
|
||||
static BOOL IsLastTicketExpired(ESTitleId* titleId);
|
||||
static void DeleteExpiredFlagFile();
|
||||
|
||||
static void DeleteUnauthorizedData(EGG::Heap* heap);
|
||||
static s32 DeleteUnauthorizedData(EGG::Heap* heap);
|
||||
|
||||
static u32 CheckTmdCountryCode(ESTmdView* tmdView);
|
||||
static u32 CheckTmdParentalControl(ESTmdView* tmdView);
|
||||
|
||||
@@ -51,12 +51,17 @@ namespace ipl {
|
||||
mArg.mOrthoScale = scale;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_TITLE_CPP
|
||||
static void setOrthoTrans(const math::VEC3& translate);
|
||||
static void setOrthoScale(const math::VEC2& scale);
|
||||
#else
|
||||
static void setOrthoTrans(const math::VEC3& translate) { mArg.mOrthoTrans = translate; }
|
||||
|
||||
static void setOrthoScale(const math::VEC2& scale) NO_INLINE {
|
||||
mArg.mOrthoScale.x = scale.x;
|
||||
mArg.mOrthoScale.y = scale.y;
|
||||
}
|
||||
#endif
|
||||
|
||||
private:
|
||||
static Arg mArg;
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace nw4r {
|
||||
namespace ut {
|
||||
class Rect {
|
||||
public:
|
||||
#ifdef IPL_SOUND_RECT_OUT_OF_LINE
|
||||
#if defined(IPL_SOUND_RECT_OUT_OF_LINE) || defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
Rect();
|
||||
#else
|
||||
Rect() : left(), top(), right(), bottom() {}
|
||||
@@ -20,7 +20,7 @@ namespace nw4r {
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
#endif
|
||||
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP) && !defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP) || defined(IPL_SD_CHANNEL_TITLE_CPP)
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -252,14 +252,17 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
inline void updateSheetFlags(const void* glgrHdr, u32 groupIdx, u16* sheetOffsets, u32 flagsStep, const u32* sheetFlags) {
|
||||
const GlyphGroups* glgr = (GlyphGroups*)((u8*)glgrHdr + sizeof(BinaryBlockHeader));
|
||||
for (int sheetI = 0; sheetI < glgr->sheetCount; sheetI++) {
|
||||
u32 groupBitIdx = sheetI + groupIdx * flagsStep * 8;
|
||||
|
||||
const GlyphGroups* glgr = (const GlyphGroups*)((const u8*)glgrHdr + sizeof(BinaryBlockHeader));
|
||||
int sheetIndex;
|
||||
u32 groupBitOffset;
|
||||
u16* sheetOffset = sheetOffsets;
|
||||
groupBitOffset = groupIdx * flagsStep * 8;
|
||||
for (sheetIndex = 0; sheetIndex < glgr->sheetCount; sheetOffset++, sheetIndex++) {
|
||||
u32 groupBitIdx = sheetIndex + groupBitOffset;
|
||||
const u32* bitBlockPtr = sheetFlags + (groupBitIdx & ~0x1F) / 32;
|
||||
u32 bitBlock = *(u32*)bitBlockPtr;
|
||||
u32 bitBlock = *bitBlockPtr;
|
||||
if (((bitBlock << (groupBitIdx & 0x1F)) & 0x80000000) != 0) {
|
||||
sheetOffsets[sheetI] = 1;
|
||||
*sheetOffset = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -268,14 +271,16 @@ namespace nw4r {
|
||||
const u32* bitBlocksPtr, u32 sheetFlagsSize) {
|
||||
HeaderedGlyphGroups* pGlgr = (HeaderedGlyphGroups*)glgrHdr;
|
||||
|
||||
for (int i = 0; i < pGlgr->inner.sheetCount; i++) {
|
||||
sheetOffsets[i] = 0;
|
||||
int i;
|
||||
u16* sheetOffset;
|
||||
for (i = 0, sheetOffset = sheetOffsets; i < pGlgr->inner.sheetCount; sheetOffset++, i++) {
|
||||
*sheetOffset = 0;
|
||||
}
|
||||
|
||||
for (int i = 0; i < pGlgr->inner.nameCount; i++) {
|
||||
const char* includedGroups = ctx->pIncludedGroups;
|
||||
u16 offset = pGlgr->inner.nameOffsets[i];
|
||||
char* name = (char*)((u8*)hdr + offset);
|
||||
char* name = (char*)(offset + (u32)hdr);
|
||||
if (*includedGroups != 0) {
|
||||
if (!ArchiveFontBase::IncludeName(includedGroups, name)) {
|
||||
continue;
|
||||
@@ -288,21 +293,23 @@ namespace nw4r {
|
||||
|
||||
inline void convertSheetOffsetBooleansToOffsets(const void* glgrHdr, u16* sheetOffsets) {
|
||||
HeaderedGlyphGroups* pGlgr = (HeaderedGlyphGroups*)glgrHdr;
|
||||
int i;
|
||||
u16 glyphIdxOffset = 0;
|
||||
for (int i = 0; i < pGlgr->inner.sheetCount; i++) {
|
||||
if (sheetOffsets[i] == 1) {
|
||||
sheetOffsets[i] = glyphIdxOffset;
|
||||
u16* sheetOffset;
|
||||
for (i = 0, sheetOffset = sheetOffsets; i < pGlgr->inner.sheetCount; sheetOffset++, i++) {
|
||||
if (*sheetOffset == 1) {
|
||||
*sheetOffset = glyphIdxOffset;
|
||||
} else {
|
||||
sheetOffsets[i] = -1;
|
||||
*sheetOffset = -1;
|
||||
glyphIdxOffset += pGlgr->inner.sheetGlyphCount;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline void copyFlagOffsets(ArchiveFontBase::ConstructContext* ctx, u16* sheetOffsetsScratch, u32 workSize, u32 scratchSize) {
|
||||
inline void copyFlagOffsets(ArchiveFontBase::ConstructContext* ctx, u16* sheetOffsetsScratch, u32 workSize, const u16* sheetOffsetsScratchEnd) {
|
||||
u8* sheetOffsets = ctx->pWorkCurr;
|
||||
ctx->pWorkCurr = sheetOffsets + workSize;
|
||||
memmove(sheetOffsets, sheetOffsetsScratch, scratchSize);
|
||||
memmove(sheetOffsets, sheetOffsetsScratch, (sheetOffsetsScratchEnd - sheetOffsetsScratch) * sizeof(u16));
|
||||
ctx->pSheetOffsets = (u16*)sheetOffsets;
|
||||
}
|
||||
|
||||
@@ -311,31 +318,64 @@ namespace nw4r {
|
||||
// *sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)fontData + remWorkSpace) - sheetOffsetsSize, 2);
|
||||
// return sheetOffsetsSize;
|
||||
// }
|
||||
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
|
||||
u32 glgrInnerLen;
|
||||
HeaderedGlyphGroups* pGlgr;
|
||||
const ArchiveFontBinaryLayout* font;
|
||||
u8* glgrEnd;
|
||||
class FontGlyphGroupsAcs {
|
||||
public:
|
||||
explicit FontGlyphGroupsAcs(const ArchiveFontBinaryLayout* font)
|
||||
: mFont(font), mGroups(&font->glgr) {}
|
||||
const GlyphGroups& GetGroups() const { return mGroups->inner; }
|
||||
void SetSheetFlags(u32 flagsStep, const u32* sheetFlags) {
|
||||
mFlagsStep = flagsStep;
|
||||
mSheetFlags = sheetFlags;
|
||||
}
|
||||
|
||||
u16 GetNumSheet() const { return mGroups->inner.sheetCount; }
|
||||
int GetGlyphsPerSheet() const { return mGroups->inner.sheetGlyphCount; }
|
||||
u16 GetNumSet() const { return mGroups->inner.nameCount; }
|
||||
const char* GetSetName(int groupIndex) const {
|
||||
const u16 nameOffset = mGroups->inner.nameOffsets[groupIndex];
|
||||
return (const char*)(nameOffset + (u32)mFont);
|
||||
}
|
||||
bool IsUseSheet(int groupIndex, int sheetIndex) const {
|
||||
const u32 groupBitIndex = sheetIndex + groupIndex * mFlagsStep * 8;
|
||||
const u32* bitBlock = mSheetFlags + (groupBitIndex & ~0x1F) / 32;
|
||||
return ((*bitBlock << (groupBitIndex & 0x1F)) & 0x80000000) != 0;
|
||||
}
|
||||
|
||||
private:
|
||||
const ArchiveFontBinaryLayout* mFont;
|
||||
const HeaderedGlyphGroups* mGroups;
|
||||
u32 mFlagsStep;
|
||||
const u32* mSheetFlags;
|
||||
};
|
||||
|
||||
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader) {
|
||||
const u32* flagsSheets;
|
||||
u32 sheetOffsetsSize;
|
||||
u32 flagsSheetsOff;
|
||||
u32 glgrInnerLen;
|
||||
const ArchiveFontBinaryLayout* font;
|
||||
u16 sheetGlyphCount;
|
||||
u32 countSheet;
|
||||
HeaderedGlyphGroups* pGlgr;
|
||||
u8* glgrEnd;
|
||||
u32 expectedMaxSize;
|
||||
u32 dataBlockCount;
|
||||
u16* sheetOffsetsScratch;
|
||||
int groupIndex;
|
||||
|
||||
font = (ArchiveFontBinaryLayout*)ctx->pWorkCurr;
|
||||
|
||||
glgrInnerLen = ctx->mNextBlockHdr.size - sizeof(BinaryBlockHeader);
|
||||
|
||||
// Check for RFNA
|
||||
if (font->hdr.signature != SIGNATURE_FONT_ARCHIVE) {
|
||||
return CONSTRUCT_STATE_FATAL_ERR;
|
||||
}
|
||||
|
||||
// Check that there's enough data available, and the space to
|
||||
// put that data
|
||||
ENSURE_READER_HAS_SIZE(ctx, reader, glgrInnerLen);
|
||||
ENSURE_WORK_HAS_SIZE(ctx, glgrInnerLen);
|
||||
|
||||
expectedMaxSize = ctx->mNextBlockHdr.size + sizeof(BinaryFileHeader);
|
||||
|
||||
// Copy the glgr to work
|
||||
{
|
||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
||||
glgrEnd = (u8*)pGlgr + (u32)ctx->mNextBlockHdr.size;
|
||||
@@ -348,80 +388,45 @@ namespace nw4r {
|
||||
return CONSTRUCT_STATE_FATAL_ERR;
|
||||
}
|
||||
|
||||
// Before here is fine (other than regswaps)
|
||||
// u16 sheetGlyphCount = FORCE_REACCESS_2(font->glgr.inner.sheetGlyphCount, u16); // 0x1C
|
||||
// u16 dataBlockCount = FORCE_REACCESS_2(font->hdr.dataBlocks, u16); // 0x0E
|
||||
// FORCE_REACCESS_2(font->glgr.inner.sheetCount, u16);
|
||||
// return ConstructOpAnalyzeGLGRInner(ctx, font, pGlgr, glgrEnd);
|
||||
FontGlyphGroupsAcs gg(font);
|
||||
sheetGlyphCount = gg.GetGlyphsPerSheet();
|
||||
dataBlockCount = font->hdr.dataBlocks;
|
||||
countSheet = gg.GetNumSheet();
|
||||
const u32 stepSheetFlags = detail::CalcSizeFlagSet(countSheet);
|
||||
flagsSheetsOff = detail::CalcOffsetSheetFlags(gg.GetGroups().nameCount, countSheet, gg.GetGroups().smthCount_0x0a,
|
||||
gg.GetGroups().smthCount_0x0c);
|
||||
flagsSheets = (const u32*)((flagsSheetsOff & ~3) + (u32)font);
|
||||
gg.SetSheetFlags(stepSheetFlags, flagsSheets);
|
||||
|
||||
// u32 fontSizeToEndOfGlgr;
|
||||
|
||||
u16 countSheet;
|
||||
u16 sheetGlyphCount, dataBlockCount;
|
||||
|
||||
u32 stepSheetFlags;
|
||||
u32 flagsSheetsOff;
|
||||
const u32* flagsSheets;
|
||||
|
||||
u32 sheetOffsetsSize;
|
||||
u16* sheetOffsetsScratch;
|
||||
|
||||
u32 sheetOffsetsScratchSize;
|
||||
|
||||
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
||||
dataBlockCount = font->hdr.dataBlocks; // 0x0E
|
||||
// countName = font->glgr.inner.nameCount;
|
||||
countSheet = font->glgr.inner.sheetCount;
|
||||
// count0A = font->glgr.inner.smthCount_0x0a;
|
||||
// count0C = font->glgr.inner.smthCount_0x0c;
|
||||
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);
|
||||
sheetOffsetsSize = (RoundUp)(countSheet * sizeof(u16), 4);
|
||||
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
||||
|
||||
pGlgr = (HeaderedGlyphGroups*)&font->glgr;
|
||||
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
||||
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
||||
// return CONSTRUCT_STATE_FATAL_ERR;
|
||||
// }
|
||||
|
||||
// Clear sheet offsets scratch
|
||||
// for (s32 i = 0; i < pGlgr->inner.sheetCount; i++) {
|
||||
// sheetOffsetsScratch[i] = 0;
|
||||
// }
|
||||
{
|
||||
u16* sheetOffset;
|
||||
int sheetIndex;
|
||||
for (sheetIndex = 0, sheetOffset = sheetOffsetsScratch; sheetIndex < gg.GetNumSheet(); sheetOffset++, sheetIndex++) {
|
||||
*sheetOffset = 0;
|
||||
}
|
||||
for (groupIndex = 0; groupIndex < gg.GetNumSet(); groupIndex++) {
|
||||
const char* includedGroups = ctx->pIncludedGroups;
|
||||
const char* name = gg.GetSetName(groupIndex);
|
||||
if (*includedGroups && !ArchiveFontBase::IncludeName(includedGroups, name)) {
|
||||
continue;
|
||||
}
|
||||
for (int sheetIndex = 0; sheetIndex < gg.GetNumSheet(); sheetIndex++) {
|
||||
if (gg.IsUseSheet(groupIndex, sheetIndex)) {
|
||||
sheetOffsetsScratch[sheetIndex] = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// for (s32 i = 0; i < pGlgr->inner.nameCount; i++) {
|
||||
// // const char* includedGroups = ctx->pIncludedGroups;
|
||||
// u16 offset = pGlgr->inner.nameOffsets[i];
|
||||
// const char* name = (char*)((u8*)font + offset);
|
||||
// if (*ctx->pIncludedGroups != 0) {
|
||||
// if (!ArchiveFontBase::IncludeName(ctx->pIncludedGroups, name)) {
|
||||
// continue;
|
||||
// }
|
||||
// }
|
||||
|
||||
// updateSheetFlags(pGlgr, i, sheetOffsetsScratch, stepSheetFlags, flagsSheets);
|
||||
// }
|
||||
setSheetOffsetBooleans(ctx, pGlgr, font, sheetOffsetsScratch, flagsSheets, stepSheetFlags);
|
||||
|
||||
// u16 glyphIdxOffset = 0;
|
||||
// for (s32 i = 0; i < pGlgr->inner.sheetCount; i++) {
|
||||
// if (sheetOffsetsScratch[i] == 1) {
|
||||
// sheetOffsetsScratch[i] = glyphIdxOffset;
|
||||
// } else {
|
||||
// sheetOffsetsScratch[i] = -1;
|
||||
// glyphIdxOffset += pGlgr->inner.sheetGlyphCount;
|
||||
// }
|
||||
// }
|
||||
convertSheetOffsetBooleansToOffsets(pGlgr, sheetOffsetsScratch);
|
||||
|
||||
sheetOffsetsScratchSize = (u32)countSheet << 1;
|
||||
sheetOffsetsScratchSize += (sheetOffsetsScratchSize >> 31);
|
||||
sheetOffsetsScratchSize &= ~1;
|
||||
copyFlagOffsets(ctx, sheetOffsetsScratch, sheetOffsetsSize, sheetOffsetsScratchSize);
|
||||
copyFlagOffsets(ctx, sheetOffsetsScratch, sheetOffsetsSize, sheetOffsetsScratch + (u16)countSheet);
|
||||
|
||||
ctx->mSheetCount = countSheet;
|
||||
ctx->mGlyphsPerSheet = sheetGlyphCount;
|
||||
|
||||
@@ -1068,7 +1068,7 @@ filterVowelCandidate:
|
||||
(((ZiAlphaWork*)workData)->requiredLength != parameters->elementCount)) &&
|
||||
(((((ZiAlphaWork*)workData)->prefixLength == '\0' ||
|
||||
(((ZiAlphaWork*)workData)->prefixLength + 1 >= parameters->elementCount)) && (dictionaryExact != 0)))
|
||||
))) && ((((completionAllowed && (prefixCount == 0)) && (dictionaryKind != 0xb)) &&
|
||||
))) && ((((currentVowelRestriction && (prefixCount == 0)) && (dictionaryKind != 0xb)) &&
|
||||
((((int)dictionaryIndex < (int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount &&
|
||||
(((ZiAlphaOptions*)optionData)->lookupMode == '\0')) &&
|
||||
(((ZiAlphaWork*)workData)->dictionaries[language] == 0)))))) {
|
||||
@@ -1084,7 +1084,7 @@ filterVowelCandidate:
|
||||
goto retryDictionary;
|
||||
}
|
||||
}
|
||||
if ((((((dictionaryExact == 0) || (!completionAllowed)) || (prefixCount != 0)) ||
|
||||
if ((((((dictionaryExact == 0) || (!currentVowelRestriction)) || (prefixCount != 0)) ||
|
||||
((dictionaryKind == 0xb ||
|
||||
(dictionaryIndex >= ((ZiAlphaWork*)workData)->dictionaryCount)))) ||
|
||||
(elements == 0)) ||
|
||||
@@ -1367,7 +1367,7 @@ emitCandidate:
|
||||
}
|
||||
}
|
||||
retryDictionary:;
|
||||
} while (dictionaryKind != 0);
|
||||
} while (dictionaryIndex != 0);
|
||||
}
|
||||
finishDictionaryPass:;
|
||||
}
|
||||
@@ -1406,13 +1406,13 @@ finishDictionaryPass:;
|
||||
secondLanguagePass = ZI8_TRUE;
|
||||
languagePassCount = 0;
|
||||
language = parameters->subLanguage;
|
||||
completionAllowed = secondaryCompletionAllowed;
|
||||
currentVowelRestriction = secondaryVowelRestriction;
|
||||
dictionaryStatus[9] = 0;
|
||||
dictionaryStatus[5] = 0;
|
||||
dictionaryStatus[6] = 0;
|
||||
dictionaryStatus[7] = 0;
|
||||
dictionaryStatus[8] = 0;
|
||||
completionAllowed = secondaryCompletionAllowed;
|
||||
currentVowelRestriction = secondaryVowelRestriction;
|
||||
if (switchedLanguage) {
|
||||
secondLanguagePass = ZI8_FALSE;
|
||||
dictionaryStatus[1] = 0;
|
||||
@@ -1426,14 +1426,15 @@ finishDictionaryPass:;
|
||||
if (language == 0) {
|
||||
language = parameters->language;
|
||||
}
|
||||
completionAllowed = secondaryCompletionAllowed;
|
||||
currentVowelRestriction = secondaryVowelRestriction;
|
||||
if (language == parameters->language) {
|
||||
completionAllowed = primaryCompletionAllowed;
|
||||
currentVowelRestriction = primaryVowelRestriction;
|
||||
} else {
|
||||
completionAllowed = secondaryCompletionAllowed;
|
||||
currentVowelRestriction = secondaryVowelRestriction;
|
||||
}
|
||||
if ((((ZiAlphaOptions*)optionData)->lookupMode != '\0') || ((!currentVowelRestriction && (!completionAllowed)))) goto finishCandidates;
|
||||
if ((completionAllowed) &&
|
||||
if ((((ZiAlphaOptions*)optionData)->lookupMode != '\0') || ((!completionAllowed && (!currentVowelRestriction)))) goto finishCandidates;
|
||||
if ((currentVowelRestriction) &&
|
||||
((((((ZiAlphaWork*)workData)->suffixMode == '\0' && (2 < (int)elementCount)) &&
|
||||
(elements[elementCount - 2] == 0xeff1)) &&
|
||||
((int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
@@ -1444,66 +1445,65 @@ finishDictionaryPass:;
|
||||
prefixPrepared = ZI8_TRUE;
|
||||
goto preparePrefix;
|
||||
}
|
||||
if (!((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
((((ZiAlphaWork*)workData)->suffixLocked == '\0' && (2 < (int)elementCount)))) &&
|
||||
(((elements[elementCount - 2] == 0xeff1 &&
|
||||
((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0'))))))) {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
if (currentVowelRestriction && ((ZiAlphaWork*)workData)->suffixMode != 0 &&
|
||||
((ZiAlphaWork*)workData)->suffixLocked == 0 && elementCount > 2 &&
|
||||
((elements[elementCount - 2] == 0xEFF1 &&
|
||||
((ZiAlphaWork*)workData)->suffixCount == elementCount - 2) ||
|
||||
(((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
Zi8IsAlphaPunct(elements[elementCount - 1]) != 0))) {
|
||||
if (((ZiAlphaWork*)workData)->prefixEnabled >= 1 && elements[elementCount - 1] == 0xEFF1) {
|
||||
goto checkPrefixPunctuation;
|
||||
}
|
||||
if (!primaryMatched && !secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 1;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount - 1;
|
||||
if (prefixCount != 0) {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
}
|
||||
goto preparePrefix;
|
||||
}
|
||||
}
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
} else {
|
||||
if ((((ZiAlphaWork*)workData)->prefixEnabled == '\0') || (elements[elementCount - 1] != 0xeff1)) {
|
||||
if ((!primaryMatched) && (!secondaryMatched)) {
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 1;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount - 1;
|
||||
if (prefixCount != 0) {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
}
|
||||
goto preparePrefix;
|
||||
}
|
||||
goto tryAlternatePrefix;
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (currentVowelRestriction) {
|
||||
checkPrefixPunctuation:
|
||||
if ((1 < ((ZiAlphaWork*)workData)->prefixEnabled) &&
|
||||
(parameters->elements[parameters->elementCount - 1] != 0xEFF1))
|
||||
|
||||
@@ -255,7 +255,7 @@ s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADL
|
||||
s32 headerInfo;
|
||||
WADTitleMetadata* metadataBuffer = &metadata;
|
||||
WADHeader* headerBuffer = (WADHeader*)headerBytes;
|
||||
s32 result;
|
||||
s32 result = 0;
|
||||
u32 titleDataOffset;
|
||||
s32 type;
|
||||
|
||||
@@ -397,6 +397,8 @@ s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location
|
||||
s32 result;
|
||||
u32 fileOffset;
|
||||
WADFileEntry* allocatedFiles;
|
||||
void* fileNames;
|
||||
void* titleList;
|
||||
BOOL streamOpened;
|
||||
u32 transferId;
|
||||
u32 contentCount;
|
||||
@@ -406,9 +408,11 @@ s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location
|
||||
u32 skipTitleMeta = flags & 4;
|
||||
WADFileHeader* fileHeader;
|
||||
|
||||
streamOpened = FALSE;
|
||||
fileOffset = 0;
|
||||
fileNames = 0;
|
||||
titleList = 0;
|
||||
allocatedFiles = 0;
|
||||
streamOpened = FALSE;
|
||||
memset(&workspace.unpackInfo, 0, sizeof(WADUnpackInfo));
|
||||
if (fileListOut != 0) {
|
||||
*fileListOut = 0;
|
||||
@@ -521,6 +525,12 @@ s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location
|
||||
|
||||
cleanup:
|
||||
_WADFreeMemory(&workspace.unpackInfo, allocator);
|
||||
if (fileNames != 0) {
|
||||
_WADMemFree(allocator, fileNames);
|
||||
}
|
||||
if (titleList != 0) {
|
||||
_WADMemFree(allocator, titleList);
|
||||
}
|
||||
if ((fileListOut != 0) && (result != 0)) {
|
||||
if (allocatedFiles != 0) {
|
||||
_WADMemFree(allocator, allocatedFiles);
|
||||
@@ -535,7 +545,7 @@ cleanup:
|
||||
|
||||
static s32 WAD_815BFFA8(WADImportLoopArgs* args) {
|
||||
s32 fd = args->fd;
|
||||
s32 result = 0;
|
||||
s32 result;
|
||||
u32 remaining = args->size;
|
||||
WADImportTransfer* transfer = args->transfer;
|
||||
u32 bufferIndex = 0;
|
||||
@@ -561,7 +571,7 @@ static s32 WAD_815BFFA8(WADImportLoopArgs* args) {
|
||||
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags,
|
||||
WADProcessCallback processCallback) {
|
||||
s32 result = 0;
|
||||
s32 result;
|
||||
ESHash* sharedContentHashes = 0;
|
||||
ESContentId* installedContentIds = 0;
|
||||
ESContentMeta* matchingContents = 0;
|
||||
@@ -1257,6 +1267,7 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
|
||||
s32 contentExportStarted;
|
||||
s32 threadCreated = FALSE;
|
||||
s32 fileFd;
|
||||
WADBackupHeader* headerBlockHeader;
|
||||
|
||||
titleMetaSize = 0;
|
||||
contentDataSize = 0;
|
||||
@@ -1377,7 +1388,6 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
|
||||
result = 0;
|
||||
if (path == 0) {
|
||||
*sizeOut = totalSize + 0x340;
|
||||
result = 0;
|
||||
goto cleanup;
|
||||
}
|
||||
outputBuffer = _WADMemAlloc(allocator, 0x10000);
|
||||
@@ -1398,6 +1408,7 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
|
||||
if (result != 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
headerBlockHeader = &headerBlock.header;
|
||||
paddedSize = sizeof(headerBlock);
|
||||
memset(&headerBlock, 0, paddedSize);
|
||||
if ((u32)WADWriteStream(&stream, &headerBlock, paddedSize) != paddedSize) {
|
||||
@@ -1414,12 +1425,12 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
|
||||
headerBlock.header.fileSize = fileDataSize;
|
||||
headerBlock.header.numFiles = fileCount;
|
||||
headerBlock.header.backupAreaLen = totalSize + 0x340;
|
||||
result = ES_GetDeviceId(&headerBlock.header.deviceId);
|
||||
result = ES_GetDeviceId(&headerBlockHeader->deviceId);
|
||||
if (result != 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
if ((flags & 1) != 0) {
|
||||
memcpy(&headerBlock.header.cidx, &existingContentMask, sizeof(existingContentMask));
|
||||
memcpy(&headerBlockHeader->cidx, &existingContentMask, sizeof(existingContentMask));
|
||||
}
|
||||
if ((flags & 2) != 0) {
|
||||
u32 currentTitleLow;
|
||||
@@ -1442,7 +1453,7 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
|
||||
headerBlock.header.titleId = ((u64)currentTitleHigh << 32) | currentTitleLow;
|
||||
}
|
||||
if (_WADGetTransferId(transferMac) != 0) {
|
||||
memcpy(headerBlock.header.deviceMac, transferMac, sizeof(headerBlock.header.deviceMac));
|
||||
memcpy(headerBlockHeader->deviceMac, transferMac, sizeof(headerBlockHeader->deviceMac));
|
||||
}
|
||||
}
|
||||
SHA1Reset(hashContext);
|
||||
@@ -1683,9 +1694,13 @@ s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32
|
||||
}
|
||||
}
|
||||
file_done:
|
||||
if (fileHeaderBuffer->flags[2] == 1) {
|
||||
fileFd = -1;
|
||||
}
|
||||
if (fileOpened) {
|
||||
NANDClose(&savedFile);
|
||||
}
|
||||
fileFd = -1;
|
||||
if (result != 0) {
|
||||
readSize = (fileHeaderBuffer->fileSize + 0x3F) & ~0x3F;
|
||||
totalSize -= readSize;
|
||||
@@ -3524,6 +3539,9 @@ s32 WADImportDVDExForBS(const char* path, void* buffer, u32 bufferSize) {
|
||||
parts.titleMeta = readBuffer + sectionOffset;
|
||||
sectionOffset += (header.tmdSize + 0x3F) & ~0x3F;
|
||||
}
|
||||
if (header.contentSize != 0) {
|
||||
contentBuffer = readBuffer + sectionOffset;
|
||||
}
|
||||
contentBuffer = readBuffer + sectionOffset;
|
||||
remainingBufferSize = bufferSize - sectionOffset;
|
||||
if ((u32)sectionOffset > bufferSize) {
|
||||
|
||||
@@ -393,6 +393,67 @@ CDBErr CDBRecordGetDataSize(CDBRecord* record, u32* size) {
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordReduceFileSize(CDBRecord* record, u32 newFileSize) {
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
u32 fileSize;
|
||||
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't reduce file size of the record ; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't reduce file size of the record ; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBAttrGetFileSize(&recordFile->attr, &fileSize);
|
||||
if (newFileSize > fileSize) {
|
||||
CDBReportError("can't reduce file size of the record ; file size must be over %d bytes\n", fileSize);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
CDBAttrSetFileSize(&recordFile->attr, newFileSize);
|
||||
recordFile->attr.dirty = TRUE;
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordReduceDataSize(CDBRecord* record, u32 newDataSize) {
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
u32 dataSize;
|
||||
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't reduce data size of the record ; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't reduce data size of the record ; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't reduce data size of the record; permission denied\n");
|
||||
return CDB_ERROR_ACCESS_DENIED;
|
||||
}
|
||||
err = CDBRecordFileGetDataSize(record, &dataSize);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
}
|
||||
if (newDataSize < dataSize) {
|
||||
CDBAttrSetFileSize(&recordFile->attr, newDataSize);
|
||||
recordFile->attr.dirty = TRUE;
|
||||
}
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
if (err != CDB_ERROR_OK) {
|
||||
return err;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordRemove(CDBRecord* record) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
@@ -430,6 +491,50 @@ void CDBRecordGetTypeForce(CDBRecord* record, char* type) {
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordSetFileType(CDBRecord* record, const char* fileType) {
|
||||
CDBRecordDatabaseState* instance;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
|
||||
instance = ((CDBDatabase*)record->database)->instance;
|
||||
recordFile = record->file;
|
||||
if ((instance->openFlags & 2) == 0) {
|
||||
CDBReportError("can't set file type of the record; the database is opened as READONLY\n");
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't set file type of the record ; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't set file type of the record ; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (record->key.location != CDB_FS_LOCATION_NAND) {
|
||||
CDBReportError("can't set file type of the record ; the record must exsist on NAND\n");
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
CDBLock();
|
||||
strcpy(CDBKeyStrType(record->key.keyString), fileType);
|
||||
CDBAttrSetKeyStr(&recordFile->attr, &record->key);
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetFileType(CDBRecord* record, char* fileType) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get file type of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToType(record->key.keyString, fileType);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
void CDBRecordGetGameCodeForce(CDBRecord* record, char* gameCode) {
|
||||
u32 value;
|
||||
CDBLock();
|
||||
@@ -438,12 +543,122 @@ void CDBRecordGetGameCodeForce(CDBRecord* record, char* gameCode) {
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetGameCode(CDBRecord* record, u32* gameCode) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get game code of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToGameCode(record->key.keyString, gameCode);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetMakerCode(CDBRecord* record, u32* makerCode) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get maker code of the record ; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToMakerCode(record->key.keyString, makerCode);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetModifiedTime(CDBRecord* record, u32* modifiedTime) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get modified time of the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
*modifiedTime = ((CDBRecordFile*)record->file)->attr.buf.lastModifiedDate;
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetModifiedCount(CDBRecord* record, u32* modifiedCount) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get modified count of the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBAttrGetModifiedCount(&((CDBRecordFile*)record->file)->attr, modifiedCount);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
void CDBRecordGetKeyForce(CDBRecord* record, CDBRecordKey* key) {
|
||||
CDBLock();
|
||||
CDBRecordKeyCopy(key, &record->key);
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordSetName(CDBRecord* record, const char* name, const char* keyword) {
|
||||
CDBRecordDatabaseState* instance;
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
|
||||
instance = ((CDBDatabase*)record->database)->instance;
|
||||
recordFile = record->file;
|
||||
if ((instance->openFlags & 2) == 0) {
|
||||
CDBReportError("can't set a name of the record; the database is opened as READONLY\n");
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if (!CDBRecordBelongedDBOpenedAsRW(record)) {
|
||||
CDBReportError("can't add keyword to the record; permission denied\n");
|
||||
return CDB_ERROR_ACCESS_DENIED;
|
||||
}
|
||||
if (recordFile == NULL) {
|
||||
CDBReportError("can't set a name of the record; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't set a name of the record; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBLock();
|
||||
strncpy(recordFile->attr.buf.desc, name, CDB_ATTR_BUF_MAX_DESC_LEN);
|
||||
recordFile->attr.buf.descLength = strlen(name);
|
||||
recordFile->attr.dirty = TRUE;
|
||||
err = CDBRecordFileWriteAttrBuf(record);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetKeyword(CDBRecord* record, char* keyword) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get keyword from the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
strcpy(keyword, ((CDBRecordFile*)record->file)->attr.buf.desc);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetKey(CDBRecord* record, CDBRecordKey* key) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get key from the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBRecordKeyCopy(key, &record->key);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
void CDBRecordGetCalendarTimeForce(CDBRecord* record, int* year, int* month, int* day, int* hour, int* min, int* sec) {
|
||||
char epochString[64];
|
||||
CDBDate epoch;
|
||||
@@ -454,6 +669,23 @@ void CDBRecordGetCalendarTimeForce(CDBRecord* record, int* year, int* month, int
|
||||
CDBUnlock();
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetCalendarTime(CDBRecord* record, int* year, int* month, int* day, int* hour, int* min, int* sec) {
|
||||
char epochString[64];
|
||||
CDBDate epoch;
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBLock();
|
||||
if (record->file == NULL) {
|
||||
CDBReportError("can't get calender time from the record; the record is closed\n");
|
||||
err = CDB_ERROR_27;
|
||||
} else {
|
||||
CDBConvKeyStrToEpochStr(record->key.keyString, epochString);
|
||||
CDBConvEpochStrToEpochValue(epochString, &epoch);
|
||||
CDBConvEpochValueToDate(epoch, year, month, day, hour, min, sec);
|
||||
}
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordGetId(CDBRecord* record, CDBId* id) {
|
||||
CDBErr err = CDB_ERROR_OK;
|
||||
CDBRecordFile* recordFile;
|
||||
@@ -532,6 +764,27 @@ CDBErr CDBRecordUpdateModifiedDate(CDBRecord* record) {
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordDuplicate(CDBRecord* record, CDBRecord* newRecord) {
|
||||
CDBRecordFile* recordFile;
|
||||
CDBErr err;
|
||||
|
||||
if (record->key.location != CDB_FS_LOCATION_NAND && record->key.location != CDB_FS_LOCATION_SD) {
|
||||
OSPanic(__FILE__, __LINE__, "CDBRecordDuplicate invalud location\n");
|
||||
return CDB_ERROR_1;
|
||||
}
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBLock();
|
||||
CDBRecordKeyCopy(&newRecord->key, &record->key);
|
||||
newRecord->file = NULL;
|
||||
newRecord->database = record->database;
|
||||
err = CDBRecordFileCreateBlank(newRecord);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordBackupToSD(CDBRecord* record) {
|
||||
CDBErr err;
|
||||
CDBLock();
|
||||
@@ -695,8 +948,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
}
|
||||
{
|
||||
CDBErr result;
|
||||
CDBRecordFile* tempFile;
|
||||
tempFile = record->file;
|
||||
CDBRecordFile* tempFile = record->file;
|
||||
if ((s32)tempFile == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (tempFile->allocFlag == 1) {
|
||||
@@ -825,7 +1077,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
|
||||
CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize, CDBRecordKey* key) {
|
||||
CDBErr status;
|
||||
int fileOffset;
|
||||
s32 fileOffset;
|
||||
CDBRecordFile* recordFile;
|
||||
u32 fileDataSize;
|
||||
u32 fileSize;
|
||||
@@ -960,3 +1212,32 @@ CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordPrivateChangeOwner(CDBRecord* record, u64 newWiiId) {
|
||||
CDBRecordFile* recordFile;
|
||||
char fullPath[256];
|
||||
char newPath[256];
|
||||
CDBErr err;
|
||||
u64 preWiiId;
|
||||
u64 recordWiiId;
|
||||
|
||||
CDBReportError("CDBRecordPrivateChangeOwner\n");
|
||||
|
||||
recordFile = record->file;
|
||||
if (recordFile == NULL) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
preWiiId = CDBGetWiiId();
|
||||
recordWiiId = record->key.wiiId;
|
||||
OSReport(" i_pre-wiiid = %lX\n", preWiiId);
|
||||
OSReport(" record-wiiid = %lX\n", recordWiiId);
|
||||
CDBConvKeyToFullPath(&record->key, fullPath);
|
||||
record->key.wiiId = newWiiId;
|
||||
CDBConvKeyToFullPath(&record->key, newPath);
|
||||
OSReport("path =%s\n", fullPath);
|
||||
OSReport("path2=%s\n", newPath);
|
||||
CDBLock();
|
||||
err = CDBAttrSetWiiId(&recordFile->attr, newWiiId);
|
||||
CDBUnlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -197,8 +197,9 @@ void AESiEncryptBlock(AESContext* context, u32* output, const u32* input) {
|
||||
|
||||
void AESiDecryptBlock(AESContext* context, u32* output, const u32* input) {
|
||||
u32 rounds=context->rounds;
|
||||
u32* key=context->keys + rounds*4;
|
||||
u32* key=context->keys;
|
||||
u32 a,b,c,d;
|
||||
key += rounds*4;
|
||||
if (context->needsTransform) {
|
||||
u32 round;
|
||||
for (round=1; round<context->rounds; ++round) {
|
||||
|
||||
@@ -68,8 +68,14 @@ void NETMD5GetDigest(NETMD5Context* context, void* digest) {
|
||||
memset(context, 0, sizeof(*context));
|
||||
}
|
||||
|
||||
#define ROTATE(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
|
||||
#define STEP(a, b, c, d, f, word, n) ((a) += (f), (a) = (b) + ROTATE(__lwbrx(0, (int)(word)) + (*constant + (a)), n))
|
||||
static inline u32 rotateSum(u32 state, const u32* word, u32 constant, int shift) {
|
||||
// Each rotation half reads its own byte-reversed message word.
|
||||
u32 right = __lwbrx((void*)word, 0);
|
||||
u32 left = __lwbrx((void*)word, 0);
|
||||
return ((state + (constant + left)) << shift) | ((constant + (state + right)) >> (32 - shift));
|
||||
}
|
||||
|
||||
#define STEP(a, b, c, d, f, word, n) ((a) = (b) + rotateSum((a) + (f), word, *constant, n))
|
||||
|
||||
static void ProcessBlock(NETMD5Context* context) {
|
||||
static u32 constants[64] = {0xD76AA478, 0xE8C7B756, 0x242070DB, 0xC1BDCEEE, 0xF57C0FAF, 0x4787C62A, 0xA8304613, 0xFD469501, 0x698098D8, 0x8B44F7AF, 0xFFFF5BB1, 0x895CD7BE, 0x6B901122, 0xFD987193, 0xA679438E, 0x49B40821, 0xF61E2562, 0xC040B340, 0x265E5A51, 0xE9B6C7AA, 0xD62F105D, 0x02441453, 0xD8A1E681, 0xE7D3FBC8, 0x21E1CDE6, 0xC33707D6, 0xF4D50D87, 0x455A14ED, 0xA9E3E905, 0xFCEFA3F8, 0x676F02D9, 0x8D2A4C8A, 0xFFFA3942, 0x8771F681, 0x6D9D6122, 0xFDE5380C, 0xA4BEEA44, 0x4BDECFA9, 0xF6BB4B60, 0xBEBFBC70, 0x289B7EC6, 0xEAA127FA, 0xD4EF3085, 0x04881D05, 0xD9D4D039, 0xE6DB99E5, 0x1FA27CF8, 0xC4AC5665, 0xF4292244, 0x432AFF97, 0xAB9423A7, 0xFC93A039, 0x655B59C3, 0x8F0CCC92, 0xFFEFF47D, 0x85845DD1, 0x6FA87E4F, 0xFE2CE6E0, 0xA3014314, 0x4E0811A1, 0xF7537E82, 0xBD3AF235, 0x2AD7D2BB, 0xEB86D391};
|
||||
@@ -83,13 +89,13 @@ static void ProcessBlock(NETMD5Context* context) {
|
||||
block = context->buffer32;
|
||||
word = block;
|
||||
constant = constants;
|
||||
index = indices;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & c) | (~b & d),word,7); ++word; ++constant;
|
||||
STEP(d,a,b,c,(a & b) | (~a & c),word,12); ++word; ++constant;
|
||||
STEP(c,d,a,b,(d & a) | (~d & b),word,17); ++word; ++constant;
|
||||
STEP(b,c,d,a,(c & d) | (~c & a),word,22); ++word; ++constant;
|
||||
STEP(a,b,c,d,(b & c) | (~b & d),word++,7); ++constant;
|
||||
STEP(d,a,b,c,(a & b) | (~a & c),word++,12); ++constant;
|
||||
STEP(c,d,a,b,(d & a) | (~d & b),word++,17); ++constant;
|
||||
STEP(b,c,d,a,(c & d) | (~c & a),word++,22); ++constant;
|
||||
}
|
||||
index = indices;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & d) | (c & ~d),block + *index,5); ++index; ++constant;
|
||||
STEP(d,a,b,c,(a & c) | (b & ~c),block + *index,9); ++index; ++constant;
|
||||
|
||||
@@ -7441,8 +7441,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
}
|
||||
|
||||
if (leftOp == vmNull || rightOp == vmNull) {
|
||||
result = CHANS_VM_ERR_RESULT_TYPE;
|
||||
break;
|
||||
return CHANS_VM_ERR_RESULT_TYPE;
|
||||
}
|
||||
|
||||
result = opFunc(vm, convTypeIdx, &pVm->accumulator, leftOp, rightOp);
|
||||
@@ -7717,30 +7716,27 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
CHANSVmObjHdr* pAcc;
|
||||
CHANSVmExecutionCtx* ctx;
|
||||
CHANSVmModule* dbg;
|
||||
CHANSVmErr loadResult;
|
||||
opSize = 3;
|
||||
operandBuf = VmGetOperand(vm, 1, 3);
|
||||
if (operandBuf == vmNull) {
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
pAcc = &pVm->accumulator;
|
||||
result = CHANSVmDeleteObject(vm, pAcc);
|
||||
if (result == CHANS_VM_OK) {
|
||||
loadResult = CHANSVmDeleteObject(vm, pAcc);
|
||||
if (loadResult == CHANS_VM_OK) {
|
||||
imm16Val = VM_READ_BE_U16(operandBuf, 0);
|
||||
ctx = pVm->pActiveCtx;
|
||||
dbg = ctx->pDbg;
|
||||
if (imm16Val < dbg->stringCount) {
|
||||
if (dbg->pStringTbl[imm16Val].pStringData != vmNull) {
|
||||
goto load_str_ok;
|
||||
}
|
||||
if (imm16Val >= dbg->stringCount || dbg->pStringTbl[imm16Val].pStringData == vmNull) {
|
||||
loadResult = CHANS_VM_ERR_LOAD_STRING_CONST;
|
||||
} else {
|
||||
pAcc->type = CHANS_VM_OBJ_TYPE_STRING;
|
||||
pAcc->hasData = vmTrue;
|
||||
pAcc->value.wstring_v = (vmWStringObjVal*)&ctx->pDbg->pStringTbl[imm16Val];
|
||||
}
|
||||
}
|
||||
result = CHANS_VM_ERR_LOAD_STRING_CONST;
|
||||
break;
|
||||
|
||||
load_str_ok:
|
||||
pAcc->type = CHANS_VM_OBJ_TYPE_STRING;
|
||||
pAcc->hasData = vmTrue;
|
||||
pAcc->value.wstring_v = (vmWStringObjVal*)&ctx->pDbg->pStringTbl[imm16Val];
|
||||
result = loadResult;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -7885,8 +7881,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
computedAddr += pVm->pActiveCtx->pc + 5;
|
||||
}
|
||||
if (computedAddr < 1 || computedAddr >= pVm->pActiveCtx->pDbg->codeSize) {
|
||||
result = CHANS_VM_ERR_CODE_RANGE;
|
||||
break;
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
pVm->pActiveCtx->pc = computedAddr;
|
||||
opSize = 0;
|
||||
@@ -7934,8 +7929,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
computedAddr += pVm->pActiveCtx->pc + 4;
|
||||
}
|
||||
if (computedAddr < 1 || computedAddr >= pVm->pActiveCtx->pDbg->codeSize) {
|
||||
result = CHANS_VM_ERR_CODE_RANGE;
|
||||
break;
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
pVm->pActiveCtx->pc = computedAddr;
|
||||
opSize = 0;
|
||||
@@ -7960,11 +7954,13 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
}
|
||||
|
||||
case CHANS_VM_OP_DELETE_INDIRECT: {
|
||||
result = CHANS_VM_ERR_DELETE_INDIRECT;
|
||||
if (pVm->accumulator.type == CHANS_VM_TYPE_INDEX_REF) {
|
||||
foundObj = VmGetArrayElement(vm, &pVm->accumulator, *((u32*)&pVm->accumulator.value + 1), vmFalse);
|
||||
result = VmDeleteCommon(vm, foundObj);
|
||||
CHANSVmObjHdr* accumulator = &pVm->accumulator;
|
||||
CHANSVmErr deleteResult = CHANS_VM_ERR_DELETE_INDIRECT;
|
||||
if (accumulator->type == CHANS_VM_TYPE_INDEX_REF) {
|
||||
foundObj = VmGetArrayElement(vm, accumulator, accumulator->value.data.len, vmFalse);
|
||||
deleteResult = VmDeleteCommon(vm, foundObj);
|
||||
}
|
||||
result = deleteResult;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -1179,10 +1179,10 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mState != STATE_NORMAL || mMode != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (mState) {
|
||||
case STATE_NORMAL:
|
||||
switch (mMode) {
|
||||
case 0:
|
||||
if (!mpFriendCache->isThere(buttonNo + mPage * BTN_MAX)) {
|
||||
return;
|
||||
}
|
||||
@@ -1240,6 +1240,8 @@ namespace ipl {
|
||||
snd::getSystem()->startSEwithPos("WIPL_SE_CH_HOLD", mDrag.mPos.x);
|
||||
|
||||
mState = STATE_DRAG;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Address::start_drag_point_event(const char* paneName, controller::Interface* con) {
|
||||
@@ -1425,10 +1427,7 @@ namespace ipl {
|
||||
|
||||
if (con->downTrg(controller::BTN_INTERACT)) {
|
||||
Button* button = static_cast<Button*>(System::getScene(SCENE_BUTTON));
|
||||
if (mState != STATE_COVER_NORMAL && mState != STATE_NORMAL) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (mState == STATE_COVER_NORMAL || mState == STATE_NORMAL) {
|
||||
if (Button::cmpButtonName(paneName, Button::BTN_EXIT) == 0) {
|
||||
MailAddressSelect* mailAddrSel = static_cast<MailAddressSelect*>(System::getScene(SCENE_MAIL_ADDRESS_SELECT));
|
||||
button->animation(Button::IDANIM_SELECT_CALENDAR_EXIT);
|
||||
@@ -1477,7 +1476,7 @@ namespace ipl {
|
||||
snd::getSystem()->startSE("WIPL_SE_FL_PAGE_DEC");
|
||||
onPreviousPage();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
// fallthrough
|
||||
}
|
||||
@@ -1783,13 +1782,15 @@ namespace ipl {
|
||||
nw4r::math::VEC3 baseTrans = mpLayout->FindPaneByName("N_base_move")->GetTranslate();
|
||||
math::VEC2 pos = System::getControllerManager()->getController(mDrag.mChan)->getDpdProjectionPos();
|
||||
nw4r::lyt::TextBox* textBox = static_cast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName("T_name_move"));
|
||||
const u16* name = mpFriendCache->getInfo(mDrag.mButton + mDrag.mPage * BTN_MAX).attr.name;
|
||||
|
||||
f32 width = 0.0f;
|
||||
if (textBox != NULL && name != NULL) {
|
||||
textBox->GetFont()->GetWidth();
|
||||
for (; *name != 0; name++) {
|
||||
width += textBox->GetFont()->GetCharWidth(*name);
|
||||
if (textBox != NULL) {
|
||||
const u16* name = mpFriendCache->getInfo(mDrag.mButton + mDrag.mPage * BTN_MAX).attr.name;
|
||||
if (name != NULL) {
|
||||
textBox->GetFont()->GetWidth();
|
||||
for (; *name != 0; name++) {
|
||||
width += textBox->GetFont()->GetCharWidth(*name);
|
||||
}
|
||||
}
|
||||
}
|
||||
width += 0.01f;
|
||||
@@ -1946,11 +1947,10 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void FriendListCache::update(u32 index, const wchar_t* name, u64 fdId) {
|
||||
NWC24FriendInfo* info = &mInfos[index];
|
||||
info->attr.fdId = fdId;
|
||||
memset(info->attr.name, 0, sizeof(info->attr.name));
|
||||
wcsncpy((wchar_t*)info->attr.name, name, 10);
|
||||
System::getNwc24Manager()->updateFriendInfo(info, index);
|
||||
mInfos[index].attr.fdId = fdId;
|
||||
memset(mInfos[index].attr.name, 0, sizeof(mInfos[index].attr.name));
|
||||
wcsncpy((wchar_t*)getInfo(index).attr.name, name, 10);
|
||||
System::getNwc24Manager()->updateFriendInfo(&getInfo(index), index);
|
||||
}
|
||||
|
||||
void FriendListCache::del(u32 index) {
|
||||
|
||||
@@ -521,7 +521,8 @@ void ipl::scene::AddressEdit::create() {
|
||||
set_textbox(textPane, friendText);
|
||||
textPane = (mpCodeLayout)
|
||||
->getNW4RLyt()->GetRootPane()->FindPaneByName("T_frnd_crd_00", true);
|
||||
set_textbox(textPane, mString.mDisplayText);
|
||||
friendText = mString.mDisplayText;
|
||||
set_textbox(textPane, friendText);
|
||||
mState = 0;
|
||||
break;
|
||||
}
|
||||
@@ -2779,7 +2780,7 @@ void ipl::scene::AddressEdit::set_err_msg(wchar_t* outErrMsg, u32 outErrMsgLen,
|
||||
swprintf(nwc24ErrStr, sizeof(nwc24ErrStr) / sizeof(wchar_t), L"%06d\n", errorCode);
|
||||
wcsncat(outErrMsg, nwc24ErrStr, outErrMsgLen - wcslen(outErrMsg));
|
||||
|
||||
u32 messageId = MESG_ERROR_NWC24_SERVER;
|
||||
u32 messageId;
|
||||
switch (nwc24Err) {
|
||||
case NWC24_ERR_NETWORK:
|
||||
messageId = MESG_ERROR_NWC24_NETWORK;
|
||||
@@ -2865,10 +2866,7 @@ void ipl::scene::AddressEdit::get_friendinfo() {
|
||||
memcpy(&ipl::scene::sFriendInfo, &mpFriendCache->getInfo(mSelectedFriend),
|
||||
sizeof(ipl::scene::sFriendInfo));
|
||||
mString.setName(reinterpret_cast<const wchar_t*>(ipl::scene::sFriendInfo.attr.name));
|
||||
const wchar_t* name = mString.mName;
|
||||
nw4r::lyt::Pane* namePane =
|
||||
mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_name_00", true);
|
||||
set_textbox(namePane, name);
|
||||
set_textbox(mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_name_00", true), mString.mName);
|
||||
|
||||
wchar_t wiiNo[0x100];
|
||||
wchar_t email[0x102];
|
||||
@@ -2881,10 +2879,7 @@ void ipl::scene::AddressEdit::get_friendinfo() {
|
||||
ipl::utility::CharacterCode::ANSIToUTF16(email, reinterpret_cast<const u8*>(&ipl::scene::sFriendInfo.addr), 0x102);
|
||||
mString.setEMail(email);
|
||||
}
|
||||
const wchar_t* displayText = mString.mDisplayText;
|
||||
nw4r::lyt::Pane* friendCodePane =
|
||||
mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_frnd_crd_00", true);
|
||||
set_textbox(friendCodePane, displayText);
|
||||
set_textbox(mpCodeLayout->getNW4RLyt()->GetRootPane()->FindPaneByName("T_frnd_crd_00", true), mString.mDisplayText);
|
||||
memcpy(&mCreateID, &ipl::scene::sFriendInfo.attr.fdId, sizeof(mCreateID));
|
||||
}
|
||||
|
||||
|
||||
@@ -237,10 +237,7 @@ bool MemoryCardManager::isIconValidate(u8 slot, s16 index) {
|
||||
|
||||
bool MemoryCardManager::isBannerEnable(u8 slot, s16 index) {
|
||||
CardIcons* icons = reinterpret_cast<CardIcons*>(memorycard::getIconStateArray());
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::IconState* icon = &icons[slot][file];
|
||||
u8 enabled = icon->bannerEnable;
|
||||
return enabled != 0;
|
||||
return icons[slot][mFile[slot][index].fileNo].bannerEnable != 0;
|
||||
}
|
||||
|
||||
void MemoryCardManager::update_icon_anm() {
|
||||
|
||||
@@ -1341,13 +1341,11 @@ namespace ipl {
|
||||
wchar_t* titleName = System::getChannelManager()->getTitleName(
|
||||
page, channelIndex, 0);
|
||||
memcpy(titleNames + *titleCount * 0x2a, titleName, 0x2a);
|
||||
u32 nextTitleCount = *titleCount + 1;
|
||||
*titleCount = nextTitleCount;
|
||||
++*titleCount;
|
||||
|
||||
if (bytes < secondUsage[0] || blocks < secondUsage[1]) {
|
||||
continue;
|
||||
if (bytes >= secondUsage[0] && blocks >= secondUsage[1]) {
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
#define IPL_SDMEMORY_DIALOG_STATE_ACCESSOR
|
||||
#define IPL_SDMEMORY_COMPLETION_PCT_ACCESSOR
|
||||
|
||||
#define IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#include "math/iplInterporation.h"
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
#include "scene/sdChannelTitle/iplSDChannelTitle.h"
|
||||
#include "scene/sdChannelSelect/iplSDChannelSelect.h"
|
||||
#include "system/iplSystem.h"
|
||||
@@ -1554,15 +1558,5 @@ void SDChannelTitle::startResetting() {
|
||||
snd::getSystem()->resetAllSound();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
handler->onEventDerived(component, event, controller);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
|
||||
u32 event, const controller::Interface* controller) {
|
||||
handler->onEvent(component, event, const_cast<controller::Interface*>(controller));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1362,12 +1362,10 @@ s32 CArGBAOdh::cdj_d_initializeDecompressOdh(SArCDJ_OdhMaster* master, u8* workB
|
||||
}
|
||||
|
||||
s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int workSize) {
|
||||
int blockStride;
|
||||
int workBufferSize = workSize;
|
||||
u8 xSampling;
|
||||
u8 coefficientIndex;
|
||||
u16 blockWidth;
|
||||
int blockRowStride;
|
||||
int planeOffset;
|
||||
u32 sourceLimit = srcSize;
|
||||
int statusOrOffset;
|
||||
@@ -1380,8 +1378,6 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
blockWidth = master->blocksWide;
|
||||
blockRowSize = (u32)blockWidth * 0x38;
|
||||
rowStride = (u32)blockWidth << 3;
|
||||
blockRowStride = blockRowSize * 2;
|
||||
blockStride = (u32)blockWidth << 4;
|
||||
do {
|
||||
xSampling = master->xSampling;
|
||||
if ((xSampling == 1U) && (master->ySampling == 1U)) {
|
||||
@@ -1412,9 +1408,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
statusOrOffset = ((u32)master->blockY << 6) * (u32)master->blocksWide +
|
||||
((u32)master->blocksHigh * ((u32)master->blocksWide << 6) +
|
||||
(u32)master->blockX * 8);
|
||||
statusOrOffset = (u32)master->blockX * 8 +
|
||||
(u32)master->blocksWide * ((u32)master->blockY << 6) +
|
||||
(u32)master->blocksHigh * ((u32)master->blocksWide << 6);
|
||||
if (statusOrOffset + blockRowSize + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
@@ -1454,14 +1450,14 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
planeOffset = (u32)master->blockX * 0x10 +
|
||||
(u32)master->blocksWide * ((u32)master->blockY << 6) * 2;
|
||||
requiredBlockEnd = planeOffset + blockRowStride + 8;
|
||||
requiredBlockEnd = planeOffset + (blockRowSize * 2) + 8;
|
||||
if (requiredBlockEnd > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + planeOffset
|
||||
,blockStride);
|
||||
, ((u32)blockWidth << 4));
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
master->chrominanceRequest.bitstream = master->luminanceRequest.bitstream;
|
||||
@@ -1477,7 +1473,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,
|
||||
planeOffset + master->workBuffer + 8,blockStride);
|
||||
(u8*)((u32)planeOffset + (u32)master->workBuffer) + 8, ((u32)blockWidth << 4));
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->chrominanceRequest, (u16**)(hufftreePtr.tables + 2), 1, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1543,7 +1539,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
planeOffset = planeOffset + (u32)master->blocksWide * 0x40;
|
||||
planeOffset += (u32)master->blocksWide << 6;
|
||||
if (planeOffset + blockRowSize + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
@@ -1600,14 +1596,14 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
planeOffset = (u32)master->blockX * 0x10 +
|
||||
(u32)master->blocksWide * ((u32)master->blockY << 6) * 4;
|
||||
requiredBlockEnd = planeOffset + blockRowStride + 8;
|
||||
requiredBlockEnd = planeOffset + (blockRowSize * 2) + 8;
|
||||
if (requiredBlockEnd > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + planeOffset
|
||||
,blockStride);
|
||||
, ((u32)blockWidth << 4));
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1618,13 +1614,13 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
}
|
||||
int nextOffset = planeOffset + 8;
|
||||
planeOffset = nextOffset;
|
||||
if (nextOffset + blockRowStride + 8 > workBufferSize) {
|
||||
if (nextOffset + (blockRowSize * 2) + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + nextOffset
|
||||
,blockStride);
|
||||
, ((u32)blockWidth << 4));
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1633,15 +1629,16 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
planeOffset = planeOffset + (u32)master->blocksWide * 0x80 + -8;
|
||||
requiredBlockEnd = planeOffset + blockRowStride + 8;
|
||||
if (requiredBlockEnd > workBufferSize) {
|
||||
// Store the updated plane in requiredBlockEnd so MWCC keeps it in r15.
|
||||
requiredBlockEnd = planeOffset + (u32)master->blocksWide * 0x80 + -8;
|
||||
planeOffset = requiredBlockEnd + (blockRowSize * 2) + 8;
|
||||
if (planeOffset > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + planeOffset
|
||||
,blockStride);
|
||||
(range_limit,master->quantizationTables,master->coefficients,master->workBuffer + requiredBlockEnd
|
||||
, ((u32)blockWidth << 4));
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->luminanceRequest, (u16**)hufftreePtr.tables, 0, sourceLimit);
|
||||
master->chrominanceRequest.bitstream = master->luminanceRequest.bitstream;
|
||||
@@ -1651,13 +1648,13 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
coefficientIndex = odh_natural_order[naturalIndex];
|
||||
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
|
||||
}
|
||||
if (requiredBlockEnd + 8 > workBufferSize) {
|
||||
if (planeOffset + 8 > workBufferSize) {
|
||||
statusOrOffset = -0x7ffffffa;
|
||||
goto finishBlock;
|
||||
}
|
||||
idct_fast
|
||||
(range_limit,master->quantizationTables,master->coefficients,
|
||||
planeOffset + master->workBuffer + 8,blockStride);
|
||||
(u8*)((u32)requiredBlockEnd + (u32)master->workBuffer) + 8, ((u32)blockWidth << 4));
|
||||
statusOrOffset = huffmanDecoder
|
||||
(master->dcCoefficients, &master->chrominanceRequest, (u16**)(hufftreePtr.tables + 2), 1, sourceLimit);
|
||||
if (statusOrOffset != 0) return statusOrOffset;
|
||||
@@ -1696,9 +1693,9 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
|
||||
(range_limit,master->quantizationTables + 64,master->coefficients,master->workBuffer + statusOrOffset,
|
||||
rowStride);
|
||||
}
|
||||
blockX = master->blockX + 1;
|
||||
master->blockX = blockX;
|
||||
if (blockX == master->blocksWide) {
|
||||
int nextBlockX = master->blockX + 1;
|
||||
master->blockX = nextBlockX;
|
||||
if ((u16)nextBlockX == master->blocksWide) {
|
||||
master->blockX = 0;
|
||||
master->blockY = master->blockY + 1;
|
||||
}
|
||||
|
||||
@@ -884,172 +884,180 @@ namespace ipl {
|
||||
return ret;
|
||||
}
|
||||
|
||||
void ESMisc::DeleteUnauthorizedData(EGG::Heap* heap) {
|
||||
u32 titleCount = 0;
|
||||
ESTitleId* titleIds = NULL;
|
||||
char path[88];
|
||||
static inline void verifySavedataZD(EGG::Heap* heap, ESTitleId titleId, NANDFileInfo* fileInfo) {
|
||||
char path[NAND_MAX_PATH];
|
||||
s32 ret;
|
||||
u8* saveData = NULL;
|
||||
BOOL fileOpen = FALSE;
|
||||
BOOL deleteSaveData = FALSE;
|
||||
|
||||
sprintf(path, "/title/%08x/%08x/data/%s", (u32)((titleId & 0x00FFFFFFFFFFFFFFULL) >> 32), (u32)(titleId & 0x00FFFFFFFFFFFFFFULL), "zeldaTp.dat");
|
||||
if (!ESMisc::ChangeUid(titleId)) {
|
||||
OSReport("%s::%s: ChangeUid failed\n", __FILE__, __FUNCTION__);
|
||||
ESMisc::DeleteTitle(heap, titleId);
|
||||
} else {
|
||||
ret = NANDPrivateOpen(path, fileInfo, NAND_ACCESS_READ);
|
||||
if (ret == NAND_RESULT_NOEXISTS) {
|
||||
OSReport("%s::%s: Does not exist %s: %d\n", __FILE__, __FUNCTION__, path, ret);
|
||||
} else if (ret != NAND_RESULT_OK) {
|
||||
OSReport("%s::%s: Open save data file failed: %d\n", __FILE__, __FUNCTION__, ret);
|
||||
} else {
|
||||
fileOpen = TRUE;
|
||||
saveData = (u8*)heap->alloc(0x4000, -DEFAULT_ALIGN);
|
||||
if (saveData == NULL) {
|
||||
OSReport("%s::%s: Alloc failed: %d\n", __FILE__, __FUNCTION__, -2);
|
||||
} else {
|
||||
memset(saveData, 0, 0x4000);
|
||||
ret = NANDRead(fileInfo, saveData, 0x4000);
|
||||
if (ret < 0) {
|
||||
OSReport("%s::%s: Read file failed: %d\n", __FILE__, __FUNCTION__, ret);
|
||||
goto cleanup;
|
||||
} else if (ret != 0x4000) {
|
||||
OSReport("%s::%s: File size is not correct: %d\n", __FILE__, __FUNCTION__, ret);
|
||||
deleteSaveData = TRUE;
|
||||
} else {
|
||||
u32 offset = 8;
|
||||
u32 j = 0;
|
||||
BOOL valid = FALSE;
|
||||
while (j < 3) {
|
||||
u8* block = saveData + offset;
|
||||
if (!checkForNullTermination((char*)block + 0x4e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x58, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x72, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x8e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x1b4, 0x11) ||
|
||||
!checkForNullTermination((char*)block + 0x1c5, 0x11)) {
|
||||
goto verify_failed;
|
||||
}
|
||||
j++;
|
||||
offset += 0xa94;
|
||||
}
|
||||
|
||||
offset = 0x2008;
|
||||
j = 0;
|
||||
while (j < 3) {
|
||||
u8* block = saveData + offset;
|
||||
if (!checkForNullTermination((char*)block + 0x4e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x58, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x72, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x8e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x1b4, 0x11) ||
|
||||
!checkForNullTermination((char*)block + 0x1c5, 0x11)) {
|
||||
goto verify_failed;
|
||||
}
|
||||
j++;
|
||||
offset += 0xa94;
|
||||
}
|
||||
valid = TRUE;
|
||||
|
||||
verify_failed:
|
||||
|
||||
if (!valid) {
|
||||
OSReport("%s::%s: Verify failed for %016llx\n", __FILE__, __FUNCTION__,
|
||||
titleId);
|
||||
deleteSaveData = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
NANDClose(fileInfo);
|
||||
fileOpen = FALSE;
|
||||
if (deleteSaveData) {
|
||||
ESMisc::DeleteSavedata(titleId, heap);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if (saveData != NULL) {
|
||||
heap->free(saveData);
|
||||
}
|
||||
if (fileOpen) {
|
||||
NANDClose(fileInfo);
|
||||
}
|
||||
ESMisc::ChangeUid(SYSMENU_TITLE_ID);
|
||||
}
|
||||
|
||||
static inline void DeleteTicketsForce(EGG::Heap* heap, ESTitleId titleId, u8* ticketViews, u32* ticketViewCount) {
|
||||
ESTicketView* ticketViewList = NULL;
|
||||
s32 ret;
|
||||
memset(ticketViews, 0, OSRoundUp32B(sizeof(ESTicketView)));
|
||||
ret = ES_GetTicketViews(titleId, NULL, ticketViewCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret, titleId);
|
||||
} else if (*ticketViewCount != 0) {
|
||||
ticketViewList = (ESTicketView*)heap->alloc(*ticketViewCount * OSRoundUp32B(sizeof(ESTicketView)), -DEFAULT_ALIGN);
|
||||
ret = ES_GetTicketViews(titleId, ticketViewList, ticketViewCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret, titleId);
|
||||
} else {
|
||||
for (u32 j = 0; j < *ticketViewCount; j++) {
|
||||
memcpy(ticketViews, (u8*)ticketViewList + j * sizeof(ESTicketView), sizeof(ESTicketView));
|
||||
ret = ES_DeleteTicket((ESTicketView*)ticketViews);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, __FUNCTION__, ret,
|
||||
((ESTicketView*)ticketViews)->ticketId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ticketViewList != NULL) {
|
||||
heap->free(ticketViewList);
|
||||
}
|
||||
}
|
||||
|
||||
static inline s32 InitSavedata(EGG::Heap* heap) {
|
||||
u8 ticketViews[OSRoundUp32B(sizeof(ESTicketView))] ALIGN32;
|
||||
NANDFileInfo fileInfo ALIGN32;
|
||||
u8 ticketViews[0xe0] ALIGN32;
|
||||
u32 ticketViewCount;
|
||||
ESTicketView* ticketViewList;
|
||||
ESTitleId* titleIds = NULL;
|
||||
u32 titleCount = 0;
|
||||
s32 ret = ES_ListTitlesOnCard(NULL, &titleCount);
|
||||
|
||||
if (ret == ES_ERR_OK) {
|
||||
titleIds = (ESTitleId*)heap->alloc(OSRoundUp32B(titleCount * sizeof(ESTitleId)), -DEFAULT_ALIGN);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: Failed to ES_ListTitlesOnCard1: %d\n", __FILE__, __FUNCTION__, ret);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
titleIds = (ESTitleId*)heap->alloc(OSRoundUp32B(titleCount * sizeof(ESTitleId)), -DEFAULT_ALIGN);
|
||||
if (titleIds == NULL) {
|
||||
OSReport("%s::%s: Unable to allocate\n", __FILE__, "InitSavedata");
|
||||
} else {
|
||||
ret = ES_ListTitlesOnCard(titleIds, &titleCount);
|
||||
if (ret == ES_ERR_OK) {
|
||||
OSReport("%s::%s: Unable to allocate\n", __FILE__, __FUNCTION__);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
ret = ES_ListTitlesOnCard(titleIds, &titleCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: Failed to ES_ListTitlesOnCard2: %d\n", __FILE__, __FUNCTION__, ret);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
u32 titleIdOffset = 0;
|
||||
for (u32 i = 0; i < titleCount; i++) {
|
||||
u32 titleIdHi = *(u32*)((u8*)titleIds + titleIdOffset);
|
||||
u32 titleIdLo = *(u32*)((u8*)titleIds + titleIdOffset + 4);
|
||||
|
||||
if ((titleIdLo & 0xffffff00) == 0x525a4400 && titleIdHi == 0x10000) {
|
||||
u8* saveData = NULL;
|
||||
BOOL fileOpen = FALSE;
|
||||
BOOL deleteSaveData = FALSE;
|
||||
|
||||
sprintf(path - 8, "/title/%08x/%08x/data/%s", titleIdHi & 0xffffff, titleIdLo, "zeldaTp.dat");
|
||||
if (!ChangeUid(((ESTitleId)titleIdHi << 32) | titleIdLo)) {
|
||||
OSReport("%s::%s: ChangeUid failed\n", __FILE__, "verifySavedataZD");
|
||||
DeleteTitle(heap, ((ESTitleId)titleIdHi << 32) | titleIdLo);
|
||||
} else {
|
||||
ret = NANDPrivateOpen(path - 8, (NANDFileInfo*)((u8*)&fileInfo - 0x20), NAND_ACCESS_READ);
|
||||
if (ret == NAND_RESULT_NOEXISTS) {
|
||||
OSReport("%s::%s: Does not exist %s: %d\n", __FILE__, "verifySavedataZD", path - 8, ret);
|
||||
} else if (ret != NAND_RESULT_OK) {
|
||||
OSReport("%s::%s: Open save data file failed: %d\n", __FILE__, "verifySavedataZD", ret);
|
||||
} else {
|
||||
fileOpen = TRUE;
|
||||
saveData = (u8*)heap->alloc(0x4000, -DEFAULT_ALIGN);
|
||||
if (saveData == NULL) {
|
||||
OSReport("%s::%s: Alloc failed: %d\n", __FILE__, "verifySavedataZD", -2);
|
||||
} else {
|
||||
memset(saveData, 0, 0x4000);
|
||||
ret = NANDRead((NANDFileInfo*)((u8*)&fileInfo - 0x20), saveData, 0x4000);
|
||||
if (ret < 0) {
|
||||
OSReport("%s::%s: Read file failed: %d\n", __FILE__, "verifySavedataZD", ret);
|
||||
} else if (ret != 0x4000) {
|
||||
OSReport("%s::%s: File size is not correct: %d\n", __FILE__, "verifySavedataZD", ret);
|
||||
deleteSaveData = TRUE;
|
||||
} else {
|
||||
u32 offset = 8;
|
||||
u32 j = 0;
|
||||
BOOL valid = FALSE;
|
||||
while (j < 3) {
|
||||
u8* block = saveData + offset;
|
||||
if (!checkForNullTermination((char*)block + 0x4e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x58, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x72, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x8e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x1b4, 0x11) ||
|
||||
!checkForNullTermination((char*)block + 0x1c5, 0x11)) {
|
||||
goto verify_failed;
|
||||
}
|
||||
j++;
|
||||
offset += 0xa94;
|
||||
}
|
||||
|
||||
offset = 0x2008;
|
||||
j = 0;
|
||||
while (j < 3) {
|
||||
u8* block = saveData + offset;
|
||||
if (!checkForNullTermination((char*)block + 0x4e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x58, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x72, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x8e, 8) ||
|
||||
!checkForNullTermination((char*)block + 0x1b4, 0x11) ||
|
||||
!checkForNullTermination((char*)block + 0x1c5, 0x11)) {
|
||||
goto verify_failed;
|
||||
}
|
||||
j++;
|
||||
offset += 0xa94;
|
||||
}
|
||||
valid = TRUE;
|
||||
|
||||
verify_failed:
|
||||
|
||||
if (!valid) {
|
||||
OSReport("%s::%s: Verify failed for %016llx\n", __FILE__, "verifySavedataZD",
|
||||
((ESTitleId)titleIdHi << 32) | titleIdLo);
|
||||
deleteSaveData = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
NANDClose((NANDFileInfo*)((u8*)&fileInfo - 0x20));
|
||||
fileOpen = FALSE;
|
||||
if (deleteSaveData) {
|
||||
DeleteSavedata(((ESTitleId)titleIdHi << 32) | titleIdLo, heap);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (saveData != NULL) {
|
||||
heap->free(saveData);
|
||||
}
|
||||
if (fileOpen) {
|
||||
NANDClose((NANDFileInfo*)((u8*)&fileInfo - 0x20));
|
||||
}
|
||||
ChangeUid(SYSMENU_TITLE_ID);
|
||||
if ((titleIds[i] & 0xFFFFFFFFFFFFFF00ULL) == 0x00010000525A4400ULL) {
|
||||
verifySavedataZD(heap, titleIds[i], &fileInfo);
|
||||
continue;
|
||||
}
|
||||
if ((((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x0001000844495343ULL ||
|
||||
((((ESTitleId)titleIdHi << 32) | titleIdLo) < 0x0001000844495343ULL &&
|
||||
((((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x000100014a4f4449ULL ||
|
||||
((((ESTitleId)titleIdHi << 32) | titleIdLo) > 0x000100014a4f4449ULL &&
|
||||
(((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x0001000148415858ULL))) ||
|
||||
((((ESTitleId)titleIdHi << 32) | titleIdLo) > 0x0001000844495343ULL &&
|
||||
((((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x0001000844564458ULL ||
|
||||
((((ESTitleId)titleIdHi << 32) | titleIdLo) > 0x0001000844564458ULL &&
|
||||
(((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x000100084449534bULL)))) {
|
||||
ESTitleId titleId = *(ESTitleId*)((u8*)titleIds + titleIdOffset);
|
||||
ES_DeleteTitle(titleId);
|
||||
|
||||
ticketViewList = NULL;
|
||||
memset(ticketViews, 0, sizeof(ticketViews));
|
||||
ret = ES_GetTicketViews(titleId, NULL, &ticketViewCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret, titleId);
|
||||
} else if (ticketViewCount != 0) {
|
||||
ticketViewList = (ESTicketView*)heap->alloc(ticketViewCount * 0xe0, -DEFAULT_ALIGN);
|
||||
ret = ES_GetTicketViews(titleId, ticketViewList, &ticketViewCount);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret, titleId);
|
||||
} else {
|
||||
for (u32 j = 0; j < ticketViewCount; j++) {
|
||||
memcpy(ticketViews, (u8*)ticketViewList + j * sizeof(ESTicketView), 0xd8);
|
||||
ret = ES_DeleteTicket((ESTicketView*)ticketViews);
|
||||
if (ret != ES_ERR_OK) {
|
||||
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret,
|
||||
((ESTicketView*)ticketViews)->ticketId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ticketViewList != NULL) {
|
||||
heap->free(ticketViewList);
|
||||
}
|
||||
}
|
||||
titleIdOffset += 8;
|
||||
}
|
||||
|
||||
} else {
|
||||
OSReport("%s::%s: Failed to ES_ListTitlesOnCard2: %d\n", __FILE__, "InitSavedata", ret);
|
||||
switch (titleIds[i]) {
|
||||
case 0x0001000844495343ULL:
|
||||
case 0x000100014A4F4449ULL:
|
||||
case 0x0001000148415858ULL:
|
||||
case 0x0001000844564458ULL:
|
||||
case 0x000100084449534BULL:
|
||||
ES_DeleteTitle(titleIds[i]);
|
||||
DeleteTicketsForce(heap, titleIds[i], ticketViews, &ticketViewCount);
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
OSReport("%s::%s: Failed to ES_ListTitlesOnCard1: %d\n", __FILE__, "InitSavedata", ret);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if (titleIds != NULL) {
|
||||
heap->free(titleIds);
|
||||
}
|
||||
return;
|
||||
return ret;
|
||||
}
|
||||
|
||||
s32 ESMisc::DeleteUnauthorizedData(EGG::Heap* heap) {
|
||||
return InitSavedata(heap);
|
||||
}
|
||||
|
||||
BOOL checkForNullTermination(char* str, u32 len) {
|
||||
|
||||
@@ -29,3 +29,26 @@ Additional Decrypt correction: restored 0x3E800 size limit, actual seek/read err
|
||||
Remaining: CDBCryptBuffer 99.97479%, 119/119 instructions, three pool offsets; CDBRecordEncrypt 97.19014%, register allocation and one instruction; CDBRecordDecrypt 99.96789%, stack placement.
|
||||
|
||||
The four forced field accessors end with CDBUnlock and do not produce a CDBErr result. Their void declarations are gated by CDB_RECORD_IMPLEMENTATION, preserving all other translation units and avoiding fall-through non-void definitions.
|
||||
|
||||
## w1008/cdb leaf — dead-fn fossil + Encrypt coloring (worker w1008)
|
||||
|
||||
SOLVED — link-deadstrip fossil mechanism: orig .data's fossil literals (0x398-0x9be)
|
||||
come from ~15 dead functions whose code mwldeppc stripped at link. Added all dead
|
||||
fns (CDBRecordGetFileSize through CDBRecordPrivateChangeOwner) as GLOBAL fns in
|
||||
fossil-emission order; global (not static) emits standalone code AND auto-inlines
|
||||
at use sites. .data content byte-identical (orig has 2B reconstruction tail pad).
|
||||
Verified at DOL level: fossil strings land at exact expected vaddrs.
|
||||
|
||||
SOLVED — Encrypt +0x40 code gap: `err = CDBRecordGetFileSize(record, &fileSize)`
|
||||
calls the dead fn which auto-inlines, reproducing orig's expanded block.
|
||||
`(s32)ptr == 0` → `cmpwi r0,0` required (== NULL gives cmplw). 284/284 insns
|
||||
identical, 0 stream diffs.
|
||||
|
||||
WALL — CDBRecordEncrypt 57 byte diffs, pure callee-reg coloring on identical
|
||||
web structure. Orig packs {key+err}→r24, {tempFile+fileOffset}→r31, pool→r25,
|
||||
args→r26-29; mine packs {tempFile+err}→r24, {key+fileOffset}→r29, pool→r31,
|
||||
args→r25-28. Equal-cost packings (tie-break). ~18 probes all neutral/regressed:
|
||||
recordFile/err/tempFile/fileOffset decl order+scope+init forms, per-block vs
|
||||
shared `result`, single-web fileOffset (-69), fn-scope tempFile, `register`,
|
||||
err dead-init (emits, +4B/831), u32/s32 types, decl+init forms.
|
||||
DOL-verified: the entire DOL diff vs orig = exactly these 57 bytes.
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
# CHANSVm load-constant error preservation
|
||||
|
||||
Baseline: 449529d92405f8f7fda610660c7794914a81dfe6. Scope: CHANSVm.c only; no linking classifications or headers changed.
|
||||
|
||||
## Retained correction
|
||||
|
||||
LOAD_STRING_CONST must preserve a failure from CHANSVmDeleteObject. The original object tests the deletion return and branches directly to the local result merge when it is nonzero. The load-string error is selected only after deletion succeeds and the constant index is out of range or has no string payload. The prior C instead overwrote every deletion error with CHANS_VM_ERR_LOAD_STRING_CONST.
|
||||
|
||||
A native destructor that returns false is a concrete error-producing path through CHANSVmDeleteObject; this distinction is observable, not merely a compiler-scheduling preference.
|
||||
|
||||
The new local loadResult preserves that error, keeps constant validation and installation inside the successful-deletion block, and merges the result afterward. Target and rebuilt blocks have the same instruction count and control-flow destinations; remaining operand differences are registers. No strings, data layout, or generated jump-table destinations changed.
|
||||
|
||||
## Measurements
|
||||
|
||||
- All 233 target functions have compiled C implementations; this is not a claim that all are exact or independently behavior-proven.
|
||||
- Instruction-exact functions: 221/233 -> 221/233; every objdiff-exact function also passes ctxdiff.
|
||||
- Unit decompiled/fuzzy: 99.364426% -> 99.383840%.
|
||||
- Exact code: 37608/53564 bytes -> 37608/53564 bytes (70.211334%).
|
||||
- Exact data: 6904/6904 bytes -> 6904/6904 bytes (100%).
|
||||
- CHANSVmStep: 96.466080% -> 96.673584%; 1253/1253 instructions; ctxdiff differing positions 314 -> 297.
|
||||
- Per-function score regressions relative to the fresh baseline report: zero.
|
||||
- The unit remains NonMatching/unlinked; no link flags were changed.
|
||||
|
||||
## Attempts
|
||||
|
||||
1. Read previous round/wave logs and recent local trials; establish live baseline and run pool_diff first: 125 strings identical.
|
||||
2. Replace the load-string shared error/goto path with a typed local error result and successful-deletion-only constant validation. Retained: correct error behavior, higher fuzzy score, unchanged exact code/data.
|
||||
3. Separately tried consolidating GET_PROPERTY_NAME's local found flag and removing two unused array-index assignments. Rejected and restored completely: Step shrank to 1249 instructions and data dropped to 2232/6904. This unrelated trial is absent from the final source.
|
||||
|
||||
## Validation
|
||||
|
||||
- Full 43U build passed with the assigned wibo wrapper and WIBO_SJIS_MISSING_IMPORTS=1.
|
||||
- DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
- pool_diff: 125/125 identical strings.
|
||||
- .data: 4672/4672 bytes identical; all 352 canonical relocations identical.
|
||||
- .rodata: 1432/1432 bytes identical; all 258 canonical relocations identical.
|
||||
- All 233 functions compared with ctxdiff/odiff: 221 exact; no falsely exact objdiff functions.
|
||||
- git diff --check passed.
|
||||
- Source-extracted host C harness passed six load-constant cases: missing operand; deletion failure with valid index; deletion failure with invalid index; invalid index after successful deletion; null payload; successful installation. The harness stubs surrounding VM dependencies and checks C behavior only; no Wii runtime execution is claimed.
|
||||
|
||||
Source is paused after this focused candidate for parent review. The remaining 12 functions are still non-exact.
|
||||
@@ -0,0 +1,49 @@
|
||||
# CHANSVm opcode error-path reconstruction
|
||||
|
||||
Baseline: 2f399716. This is a separate structural-reconstruction candidate; it preserves the preceding LOAD_STRING_CONST behavior fix. Only CHANSVm.c changed apart from this log. No headers, linking flags, remote branches, or original assets were changed.
|
||||
|
||||
## Retained changes and target evidence
|
||||
|
||||
- Failed binary-operand conversion returns CHANS_VM_ERR_RESULT_TYPE directly. Target Step relative +0x410 selects the error and +0x414 returns through +0x1364.
|
||||
- Invalid GET_PROPERTY_NAME and JUMP destinations return CHANS_VM_ERR_CODE_RANGE directly. Target error tails are +0xd90/+0xd94 and +0xefc/+0xf00, respectively, both ending at +0x1364.
|
||||
- DELETE_INDIRECT has a typed accumulator and a local deletion result, and reads the index through value.data.len rather than an offset-based u32 pointer cast. SET_INDEX elsewhere in the same function establishes this field as the index-reference index. The target holds the opcode-local result until the merge at +0xfb0, then assigns the common interpreter status. The rebuilt +0xf80 through +0xfb4 block is instruction-identical to the target.
|
||||
|
||||
These preserve existing C behavior. Unlike the preceding deletion-error fix, no new behavioral defect is claimed.
|
||||
|
||||
## Measurements
|
||||
|
||||
- Exact functions: 221/233 -> 221/233. Every previously exact function remains instruction-exact, not merely objdiff-exact.
|
||||
- Decompiled/fuzzy unit: 99.383840% -> 99.406320%.
|
||||
- CHANSVmStep: 96.673584% -> 96.913800%; 1253/1253 instructions; differing positions 297 -> 285.
|
||||
- Exact code: unchanged, 37608/53564 bytes (70.211334%).
|
||||
- Exact data: unchanged, 6904/6904 bytes (100%).
|
||||
- Per-function score regressions: zero.
|
||||
- Unit remains NonMatching/unlinked; twelve functions remain non-exact.
|
||||
|
||||
## Rejected investigations
|
||||
|
||||
All rejected source changes were restored, and no register forcing or declaration-order sweep was used.
|
||||
|
||||
- GET_PROPERTY_NAME output-state separation: a local found flag, initialized flag, shared index/output, and inline helper. These produced 1251-1253 instructions but moved generated data-table destinations; rejected.
|
||||
- Direct result-type-table accesses, an explicit zero-count normalization/pretested loop, and indexed operand-type enumeration: 1254-1257 instructions; generated data-table destinations moved; rejected.
|
||||
- Internal linkage for result-type or constant-header tables, individually and together, did not change those results; restored.
|
||||
- CASE strict-comparison result separation, case-local match state, byte-sized operand types, and indexed operand enumeration: improved some local structure but introduced an operand-type spill and 1254-1255 instructions; generated tables moved; rejected.
|
||||
- Direct exceptional returns alone: retained for combination, 96.697525%, data 100%.
|
||||
- Typed DELETE_INDIRECT and local result alone: retained for combination, 96.889860%, data 100%.
|
||||
- Combined direct returns and typed deletion result: accepted candidate, 96.913800%, data 100%.
|
||||
- A first combination script used an obsolete substring end offset and did not compile; restored, corrected, and rerun. No source from the malformed attempt remains.
|
||||
- Adding strict-comparison restructuring to the retained combination still produced 1254 instructions and data regression; rejected.
|
||||
|
||||
## Validation
|
||||
|
||||
- Full 43U build passed with the assigned wrapper and WIBO_SJIS_MISSING_IMPORTS=1.
|
||||
- DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
- pool_diff: 125/125 strings identical.
|
||||
- .data: 4672/4672 raw bytes and 352/352 canonical relocations identical.
|
||||
- .rodata: 1432/1432 raw bytes and 258/258 canonical relocations identical.
|
||||
- All 233 target functions compared: 221 instruction-exact; zero falsely exact objdiff functions; zero per-function score regressions from 2f399716.
|
||||
- Narrow-string-reference audit: all 233 functions analyzed, 40 arguments checked, no candidates/errors/skips.
|
||||
- Source-extracted host C tests: four DELETE_INDIRECT cases passed (wrong type, successful deletion, deletion failure, and null element forwarding), including exact unsigned index forwarding. The six prior LOAD_STRING_CONST cases also passed unchanged. These stub surrounding VM dependencies and are not Wii runtime tests.
|
||||
- git diff --check passed.
|
||||
|
||||
The focused candidate is paused for independent parent review.
|
||||
78
tools/decomp-assist/allhands-aes-keycursor.attempts.md
Normal file
78
tools/decomp-assist/allhands-aes-keycursor.attempts.md
Normal file
@@ -0,0 +1,78 @@
|
||||
# AES key-schedule cursor reconstruction, 2026-10-02
|
||||
|
||||
Source baseline: `449529d9`. This separate candidate follows the frozen MD5
|
||||
commit `521056a9`; it changes only `libs/RevoEX/src/net/aes.c` and this log.
|
||||
43U only. No linking flags, configuration, tables, or public API edits.
|
||||
|
||||
## Target evidence and retained change
|
||||
|
||||
`AESiDecryptBlock` in `build/43U/obj/libs/RevoEX/src/net/aes.o` is 0x3EC bytes /
|
||||
251 instructions. Its entry first forms the key-schedule base at context+0x10
|
||||
(function-relative offset 0x18), extracts the last-round offset from the flags
|
||||
word (offset 0x24), and adds that offset to the already formed base (offset
|
||||
0x28). The baseline combined initializer produced 249 instructions. Explicitly
|
||||
initializing the typed key pointer to `context->keys` before advancing it by
|
||||
`rounds*4` recovers the target's two-stage pointer construction and body size.
|
||||
The retained change is two added source lines and one removed line. All AES
|
||||
round expressions, lazy inverse key transformation, tables and CBC chaining
|
||||
remain unchanged.
|
||||
|
||||
This is a structural matching improvement, not a newly implemented AES path.
|
||||
Both existing block algorithms were already present and pass the behavior tests.
|
||||
|
||||
## Explored and rejected alternatives
|
||||
|
||||
- Inlined single-word round helpers, byte-typed table lookups and table-rotation
|
||||
helpers changed scheduling but regressed encryption or added source complexity.
|
||||
- Staging four inverse-mix column outputs through a typed round helper improved
|
||||
decrypt similarity but required substantially more source and still did not
|
||||
match. Not retained.
|
||||
- Alternate inverse-key-transform local lifetimes and an inverse-key helper
|
||||
gave only small extra fuzzy movement, without new algorithm reconstruction.
|
||||
- Context-relative key indexing and row/word loop variants did not improve the
|
||||
minimal key-base candidate.
|
||||
- Moving next-state locals outside the round loop did not change codegen.
|
||||
- Reordering key-base declarations produced a negligible score change; the
|
||||
original natural declaration order was kept.
|
||||
- Two exploratory C89-incompatible mixed-declaration variants failed to compile
|
||||
and were immediately discarded. No failed source is retained.
|
||||
|
||||
## Verification
|
||||
|
||||
Before -> after:
|
||||
- AESiDecryptBlock: 249 -> 251 instructions against target 251;
|
||||
fuzzy 61.49004 -> 63.836655%. Final ctxdiff: 224 positional differences.
|
||||
- AESiEncryptBlock: unchanged, 158/158 instructions and 60.348103% fuzzy.
|
||||
- Unit fuzzy: 76.844475 -> 77.700584%.
|
||||
- Exact functions: 7/9 -> 7/9. Exact code: 1116/2752 bytes unchanged.
|
||||
- Data: objdiff 2800/2800, 100%, unchanged. Linked status unchanged.
|
||||
- All seven exact functions have ctxdiff diffs 0: NETAESCreateEx 108/108,
|
||||
NETAESCreate 2/2, NETAESDelete 1/1, NETAESEncrypt 46/46, NETAESDecrypt 46/46,
|
||||
NETiAESEncryptoBlock 39/39, NETiAESDecryptoBlock 37/37.
|
||||
- String pool: all four strings identical.
|
||||
- .rodata: 2592 identical bytes; .sdata2: 8 identical bytes. Source .data is
|
||||
197 bytes with the same prefix as the 200-byte target section; three target
|
||||
alignment bytes are an existing extent difference. No padding was added.
|
||||
- The full 1027-unit report has no regressions in exact functions/code/data or
|
||||
fuzzy score against the baseline report. Frozen MD5 metrics are unchanged.
|
||||
- Full 43U build passed with the configured wibo wrapper; build/43U/ok passed.
|
||||
DOL SHA1: `26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
Host validation: `python3 /tmp/crypto-remainder/validate_aes.py` compiles the
|
||||
production C unchanged with minimal types/OSReport shims. Input, key and IV
|
||||
words are represented with their PPC big-endian numeric values, so native host
|
||||
byte order does not change the algorithm. Known-answer tests cover AES-128,
|
||||
AES-192 and AES-256; seeded randomized CBC tests compare against cryptography's
|
||||
AES implementation for all three key sizes. Each tests separate/in-place
|
||||
buffers and single/incremental calls.
|
||||
|
||||
Result: all 2,406 production-source known-answer/randomized checks passed. The
|
||||
original baseline had independently passed the same coverage before changes.
|
||||
A separate saved helper experiment also passed but is not part of this commit.
|
||||
|
||||
Local evidence, not committed or uploaded: `/tmp/crypto-remainder/aes-final.ctx`,
|
||||
`aes-final.json`, `aes-full-build.log`, `aes-vectors.log`, `aes-decrypt.target`,
|
||||
and `validate_aes.py` plus its header shims. No retail assembly is included.
|
||||
|
||||
GATE: validated partial structural candidate; no regressions. Exact matching
|
||||
and linking remain open.
|
||||
89
tools/decomp-assist/allhands-ezitext-remainder.attempts.md
Normal file
89
tools/decomp-assist/allhands-ezitext-remainder.attempts.md
Normal file
@@ -0,0 +1,89 @@
|
||||
# eZiText remainder reconstruction, 2026-10-02
|
||||
|
||||
Base: `449529d9`; branch `agent/bittle/allhands-ezi-decompile`.
|
||||
Only 43U was configured, using `../toolchain/wibo-build/wibo` and
|
||||
`WIBO_SJIS_MISSING_IMPORTS=1 ../.venv/bin/ninja`. No linking flags, shared
|
||||
headers, remote refs, or upstream resources were changed.
|
||||
|
||||
## Baseline and first candidate: alpha engine
|
||||
|
||||
Fresh baseline report: `/tmp/ezi-baseline.json`.
|
||||
`zi8alpha`: 11/12 exact functions, 5880/21664 exact code bytes,
|
||||
516/564 exact data bytes; unit fuzzy 94.17892%.
|
||||
`Zi8AlphaGetCandidates`: 3946/3946 instructions, function fuzzy 92.01039%.
|
||||
These function and unit percentages are deliberately distinguished.
|
||||
|
||||
The scalar layout is four bytes lower in source than in the target because
|
||||
of the target's existing workspace snapshot at stack 0x20. No dummy alias,
|
||||
padding, or unused local was added to occupy that slot.
|
||||
|
||||
Six semantic corrections were established from definitions and uses, not
|
||||
from equal-looking raw offsets:
|
||||
|
||||
- The flag initialized at target stack 0x84 is the current vowel/punctuation
|
||||
restriction. At function +0x0798, the table-31 flag test for bit 4 clears
|
||||
target 0x84 and its primary-language snapshot at 0x8C. Source uses 0x80
|
||||
and 0x88 for those same definitions.
|
||||
- The different completion flag is at target 0x88. The table-31 bit-2 test
|
||||
at +0x07C8 clears target 0x88 and primary snapshot 0x90. Its source slots
|
||||
are 0x84 and 0x8C. Language-pass restoration confirms both identities.
|
||||
- Target reads of 0x84 at +0x2114, +0x2214, +0x32F4, +0x3384 and +0x3664
|
||||
gate punctuation retries, suffix activation, suffix locking and prefix
|
||||
punctuation. The source incorrectly read the completion flag in all five
|
||||
places. The candidate uses the traced current-restriction variable.
|
||||
- At +0x1430 the target loads the dictionary-order index from 0x64, uses it
|
||||
to select a byte dictionary kind, and stores that kind at 0x60. The retry
|
||||
condition at +0x3060 reads 0x64, also used by the following outer-loop
|
||||
increment. Source incorrectly tested dictionaryKind; it now tests
|
||||
dictionaryIndex. The safe existing early dictionaryIndex initialization
|
||||
was preserved.
|
||||
|
||||
The isolated six-line semantic patch is preserved at
|
||||
`/tmp/ezi-alpha-six-conditions.patch`. Alone it gives function 92.009125%,
|
||||
unit 94.17799%, with code/data/exact counts unchanged. This tiny fuzzy
|
||||
fluctuation does not invalidate the traced variable corrections.
|
||||
|
||||
The first handed-off candidate also restores the original address-order
|
||||
suffix-lock block before alternate-prefix fallback, restores positive branch
|
||||
conditions, and places each language's restriction snapshots at its actual
|
||||
control-flow position. No helper prototype change is included in this first
|
||||
candidate.
|
||||
|
||||
First-candidate fresh report: `/tmp/ezi-alpha-minimal.json`.
|
||||
`Zi8AlphaGetCandidates`: 94.47314%, 3946/3946 instructions.
|
||||
Unit fuzzy: 94.17892% -> 95.97323% (about 389 fewer weighted deficit bytes).
|
||||
Exact functions: 11/12 -> 11/12. Exact code: 5880 -> 5880 bytes.
|
||||
Exact data: 516 -> 516 bytes. All non-text section scores are unchanged.
|
||||
Both pools contain no strings and compare identical.
|
||||
|
||||
## Separate later research, not part of the first candidate
|
||||
|
||||
- Further emission/cursor/comparison/switch reconstruction reached function
|
||||
95.63913%, unit 96.82275%, 3950/3946 instructions. Existing exact functions
|
||||
remain exact, but extabindex accounting drops by 108 bytes. Preserved at
|
||||
`/tmp/ezi-alpha-deliver.c`; not included in the first candidate.
|
||||
- Matching PUD return declarations to zi8pud2.c's ziU32 definitions, with
|
||||
explicit caller byte narrowing, leaves alpha's score unchanged but moves
|
||||
one-key candidates 95.39716% -> 95.32416%. Its 5 exact functions and data
|
||||
1280/1388 remain unchanged. Held separately for ABI review.
|
||||
- Matching Chinese Zi8GetPCode to zi8match.c's ziU16 definition restores the
|
||||
two target halfword narrowings in paired-phonetic lookup. Together with the
|
||||
explicit PUD ABI correction: engine 96.27482% -> 96.492134%, unit
|
||||
96.65468% -> 96.848755%, 10678/10676 instructions, 5 exact unchanged.
|
||||
extabindex accounting drops 72 bytes. Held for section/relocation audit.
|
||||
- Splitting the Chinese component cursor/table chained assignment reproduces
|
||||
the target's intermediate reload but lowers the engine to 96.090294%;
|
||||
rejected and restored.
|
||||
- Replacing the spelling candidate-count assignment with postfix increment
|
||||
lowers spelling 99.555885% -> 96.8%; rejected and restored.
|
||||
|
||||
The larger scratch candidate's branch-destination audit found no mapped
|
||||
branch-target differences over 720 alpha, 351 one-key and 1594 Chinese
|
||||
branches. Helper-call counts are respectively 73/73, 71/71 and 168/168.
|
||||
This audit ignores register choices and accounts for the known stack shift;
|
||||
it is evidence of control-flow coverage, not a claim of exact matching.
|
||||
|
||||
First-candidate validation: full 43U build succeeds; DOL SHA1 is
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`. Every one of the 11 baseline
|
||||
exact alpha functions has identical instruction counts and ctxdiff diffs 0.
|
||||
`git diff --check` succeeds. No new exact function or complete unit is claimed.
|
||||
62
tools/decomp-assist/allhands-md5-grouping.attempts.md
Normal file
62
tools/decomp-assist/allhands-md5-grouping.attempts.md
Normal file
@@ -0,0 +1,62 @@
|
||||
# MD5 unsigned arithmetic and cursor reconstruction, 2026-10-02
|
||||
|
||||
Separate follow-on to accepted MD5 commit `521056a9`. AES commit `2a537c14`
|
||||
and both prior logs are unchanged. Only 43U was configured or built.
|
||||
|
||||
## Target-grounded changes
|
||||
|
||||
The target ProcessBlock rotation halves retain independently grouped additions
|
||||
of the unsigned state, round constant and separately byte-reversed message
|
||||
words. Reassociating those three u32 operands inside the accepted helper brings
|
||||
the compiler's data-flow closer to the target while preserving modulo-2^32
|
||||
arithmetic. The first MD5 round consumes sequential message words; expressing
|
||||
that consumption with `word++` as the helper's pointer argument improves its
|
||||
schedule. STEP evaluates this pointer argument exactly once; the helper still
|
||||
uses that captured pointer for both byte-reversed reads. No evaluation-order
|
||||
ambiguity, extra read, undefined value, or new helper is introduced.
|
||||
|
||||
Experiments enumerated 144 valid addition operand/grouping combinations for
|
||||
the two halves. The best target-sized arithmetic expression reached 93.447716%
|
||||
ProcessBlock fuzzy. Five cursor/loop variants and eight independent cursor-
|
||||
consumption combinations then identified the minimal `word++` form, reaching
|
||||
94.30719%. A larger by-reference cursor helper reached 94.98366% but duplicated
|
||||
rotation code for a small gain and was rejected. Three explicit feed-forward
|
||||
variants did not improve the retained result. No declaration/register sweep,
|
||||
assembly, volatile qualifier, padding or linking change was used.
|
||||
|
||||
## Verification
|
||||
|
||||
Accepted MD5 -> this candidate:
|
||||
- ProcessBlock: 81.82026 -> 94.30719% fuzzy; 306/306 instructions unchanged.
|
||||
- Unit fuzzy: 87.80044 -> 96.179825%.
|
||||
- Exact functions 3/4 and exact code 600/1824 are unchanged.
|
||||
- Data 456/456 (100%) and linking status are unchanged.
|
||||
- NETMD5Init 16/16, NETMD5Update 60/60 and NETMD5GetDigest 74/74 still have
|
||||
ctxdiff diffs 0 and objdiff 100%.
|
||||
- ProcessBlock has 215 positional differences. An advisory comparison that
|
||||
ignores GPR names leaves five opcode/immediate-order differences: three
|
||||
sequential cursor offsets and two final state-load positions. This is not
|
||||
an exact match or a proof that every remaining difference is register-only.
|
||||
- Empty string pools remain identical. Constants/index tables and end-marker
|
||||
data are unchanged from the accepted candidate.
|
||||
- AES metrics and source are unchanged from commit 2a537c14.
|
||||
- Full 1027-unit report: zero exact-function/code/data/fuzzy regressions versus
|
||||
baseline449529d9; additionally both owned units preserve the immediately
|
||||
preceding candidate's exact/data scores and improve or preserve fuzzy scores.
|
||||
- Full 43U build and build/43U/ok passed. DOL SHA1:
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
All 3,088 MD5 known-answer/random/chunking comparisons passed again against
|
||||
Python hashlib. Run `python3 /tmp/crypto-remainder/validate_md5.py`. The test
|
||||
compiles production C unchanged with PPC intrinsic shims, supplies RFC1321
|
||||
padding externally, and exercises ProcessBlock through NETMD5Update. The
|
||||
instruction-exact GetDigest platform-endian stores are not host-tested.
|
||||
|
||||
Local evidence (not committed/uploaded): `/tmp/crypto-remainder/` contains
|
||||
`md5.grouping-results.json`, `md5-grouping-final.json`,
|
||||
`md5-grouping-ProcessBlock.ctx`, `md5-grouping-vectors.log`, and
|
||||
`md5-grouping-full-build.log`. Original target evidence remains in the local
|
||||
split object and disassembly; no retail assembly is included in this commit.
|
||||
|
||||
GATE: validated partial structural candidate; no regressions. Exact matching
|
||||
and linking remain open.
|
||||
86
tools/decomp-assist/allhands-md5-rotation.attempts.md
Normal file
86
tools/decomp-assist/allhands-md5-rotation.attempts.md
Normal file
@@ -0,0 +1,86 @@
|
||||
# MD5 rotation-expression reconstruction, 2026-10-02
|
||||
|
||||
Baseline: `449529d9`, 43U only. Owned source: `libs/RevoEX/src/net/md5.c`.
|
||||
The current user priority permits validated structural/fuzzy improvements before
|
||||
exact matching and linking. This is a partial matching candidate, not an exact
|
||||
match or a linking change. AES experiments were saved outside the checkout and
|
||||
AES was restored to the baseline before this candidate was validated.
|
||||
|
||||
## Source evidence
|
||||
|
||||
- Ground truth: `build/43U/obj/libs/RevoEX/src/net/md5.o`, `ProcessBlock`.
|
||||
- The target is 0x4C8 bytes / 306 instructions, with a 0x20-byte stack frame.
|
||||
- Each of the sixteen unrolled MD5 steps contains two byte-reversed word loads.
|
||||
The first pair is at function-relative offsets 0x3C and 0x40. The right-shift
|
||||
half consumes the first value, and the left-shift half consumes the second.
|
||||
- The target retains four additions across the two rotation halves: the
|
||||
right-shift half adds the message word to (round constant + state), and the
|
||||
left-shift half adds the state to (message word + round constant). The state
|
||||
includes the round Boolean function. The first rotation uses right shift 25
|
||||
and left shift 7; the remaining shifts follow the existing MD5 round schedule.
|
||||
- The index-table address is first materialized after the first sixteen steps,
|
||||
rather than before the sequential-word round.
|
||||
- The inline helper expresses these real unsigned 32-bit operands and restores
|
||||
the target-sized body. It introduces no assembly, volatile qualifier,
|
||||
uninitialized value, fake storage, padding, or compiler-option change.
|
||||
- All four round algorithms, all 64 constants, all 48 indices, and all public
|
||||
API bodies are otherwise unchanged. The old ROTATE macro became unused and
|
||||
was removed.
|
||||
|
||||
## Attempts
|
||||
|
||||
1. Direct pointer-form byte-reversed loads and alternate ordinary arithmetic
|
||||
groupings: 274-294 instructions, at best near the starting score. Rejected.
|
||||
2. A typed inline endian-load wrapper: improved instruction similarity but
|
||||
retained 276 instructions and insufficient target operation boundaries.
|
||||
3. Rotation-expression helpers without independent load results: 288-290
|
||||
instructions, approximately 41-44% ProcessBlock fuzzy. Rejected.
|
||||
4. Explicitly named byte-reversed operands for the two rotation halves:
|
||||
306 instructions / 81.82026% fuzzy. Retained the target's first-read/right-
|
||||
shift ordering. Reversing those loads reached 82.0% but added two instructions
|
||||
and contradicted the target's operand ordering, so it was rejected.
|
||||
5. Sequential partial-sum statements and equivalent regroupings did not
|
||||
improve the retained structural form. No register-only declaration sweep.
|
||||
|
||||
## Validation
|
||||
|
||||
Command setup:
|
||||
`python3 configure.py --version 43U --wrapper ../toolchain/wibo-build/wibo`
|
||||
`WIBO_SJIS_MISSING_IMPORTS=1 ../.venv/bin/ninja`
|
||||
|
||||
- `pool_diff.py`: identical empty MD5 string pool, 0/0 strings.
|
||||
- `.data`: all 448 bytes identical. The source `.sdata` is the one-byte
|
||||
end marker (0x80); the target has the same byte followed by seven alignment
|
||||
zeros. This existing section-size difference is unchanged, and objdiff
|
||||
reports `.sdata` and unit data at 100%. No padding was added.
|
||||
- `NETMD5Init`: 16/16 instructions, ctxdiff diffs 0, objdiff 100%.
|
||||
- `NETMD5Update`: 60/60 instructions, ctxdiff diffs 0, objdiff 100%.
|
||||
- `NETMD5GetDigest`: 74/74 instructions, ctxdiff diffs 0, objdiff 100%.
|
||||
- `ProcessBlock`: 294 -> 306 instructions against target 306;
|
||||
43.290848 -> 81.82026% fuzzy. Final ctxdiff has 255 positional differences,
|
||||
primarily allocation, scheduling and remaining arithmetic grouping. Not exact.
|
||||
- MD5 unit: 61.945175 -> 87.80044% fuzzy; exact 3/4 -> 3/4;
|
||||
exact code 600/1824 unchanged; data 456/456 (100%) unchanged; unlinked unchanged.
|
||||
- Full 1027-unit report: no unit regressed in exact functions, exact code,
|
||||
exact data or fuzzy score versus the baseline report. Overall fuzzy moved
|
||||
99.588615 -> 99.60437%; exact code and linking did not change.
|
||||
- Full 43U build passed. `build/43U/ok` passed. DOL SHA1:
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
Host algorithm validation: `/tmp/crypto-remainder/validate_md5.py` compiles the
|
||||
production source unchanged with host shims for PPC byte-reversed intrinsics.
|
||||
It verifies ProcessBlock through NETMD5Update with externally supplied RFC1321
|
||||
padding, comparing state words with Python hashlib. The host test deliberately
|
||||
does not exercise GetDigest's platform-specific big-endian length stores.
|
||||
|
||||
Result: 3,088 successful digest/chunking comparisons, covering the seven RFC1321
|
||||
example strings, one million `a` bytes, 1,500 seeded messages, lengths around
|
||||
55/56/63/64/65 and larger block boundaries, and fixed/random chunk sizes.
|
||||
Run: `python3 /tmp/crypto-remainder/validate_md5.py`.
|
||||
|
||||
Local evidence (not committed or uploaded): `/tmp/crypto-remainder/md5.target`,
|
||||
`md5-final.ctx`, `md5-final.json`, `baseline.json`, `full-build.log`, and the
|
||||
host test plus its header shim. Only source and this summary are committed.
|
||||
|
||||
GATE: partial decompilation candidate validated; no regressions; exact matching
|
||||
and linking remain open. No claim of all-100% completion.
|
||||
129
tools/decomp-assist/allhands-system-decompile.attempts.md
Normal file
129
tools/decomp-assist/allhands-system-decompile.attempts.md
Normal file
@@ -0,0 +1,129 @@
|
||||
# System remainder decompilation, 2026-10-02
|
||||
|
||||
Baseline: `449529d92405f8f7fda610660c7794914a81dfe6`.
|
||||
Branch: `agent/bittle/allhands-system-decompile`.
|
||||
Owned units: `src/utility/iplESMisc.cpp`, `src/scene/setting/AOSS.c`,
|
||||
`src/scene/setting/ATERM.c`. Parent additionally approved the single ESMisc
|
||||
return-type declaration change in `include/utility/iplESMisc.h`.
|
||||
|
||||
The current user priority is complete source reconstruction first, exact code
|
||||
matching second, linking last. This candidate is decompilation progress, not an
|
||||
exact match or a linking change. No configuration, symbol, split, or link flag
|
||||
was changed. AOSS and ATERM are unchanged.
|
||||
|
||||
## Initial audit
|
||||
|
||||
- Read AGENTS.md, CONTRIBUTING.md, local skill inventory, AOSS/ATERM attempt
|
||||
histories, and ESMisc rounds 9/11. The sole local skill is unrelated TypeSafe
|
||||
integration guidance.
|
||||
- Configured and built only 43U with the approved Wibo wrapper.
|
||||
- Before source work, pool_diff found ATERM 0/0 strings and AOSS 1/1 identical.
|
||||
ESMisc first diverged at string 83; both contained 114 strings.
|
||||
- ESMisc's 30 exact functions were preserved in earlier rounds, but a meaningful
|
||||
helper reconstruction had been discarded solely because it was not exact.
|
||||
Reconstructed it from the current C++ and target object, without importing an
|
||||
old experimental source or altering linker behavior.
|
||||
|
||||
## ESMisc reconstruction
|
||||
|
||||
Restored three ordinary inline boundaries named by the target's diagnostic
|
||||
literals: `verifySavedataZD`, `DeleteTicketsForce`, and `InitSavedata`.
|
||||
`ESMisc::DeleteUnauthorizedData` returns the initializer status.
|
||||
|
||||
Concrete correctness corrections:
|
||||
|
||||
1. Use a real NAND_MAX_PATH buffer and a real caller-owned, 32-byte-aligned
|
||||
NANDFileInfo. Removed the out-of-object `path - 8` and `fileInfo - 0x20`
|
||||
accesses. The caller also owns the aligned, rounded ticket-view scratch.
|
||||
2. Traverse `ESTitleId` values by typed array index, with one unconditional loop
|
||||
increment for every title. The old verifier branch continued without
|
||||
advancing its separate byte offset and could repeat the same title.
|
||||
3. Replace the handwritten nested 64-bit switch-lowering expression with the
|
||||
five actual title cases and the independently masked save-title predicate.
|
||||
4. Preserve the two ES_ListTitlesOnCard results independently of inlined file
|
||||
and ticket operation status. The public declaration now returns s32.
|
||||
5. A negative NANDRead result jumps to cleanup, which frees the save buffer
|
||||
before closing the still-open file. The old source took the success-path
|
||||
close before freeing it. Successful or invalid-size reads retain their
|
||||
close-before-delete/free path.
|
||||
6. Use sizeof(ESTicketView) for the 0xD8-byte copy and OSRoundUp32B for the 0xE0
|
||||
scratch/allocation extent, preserving the target's distinct sizes.
|
||||
|
||||
### ABI and control-flow evidence
|
||||
|
||||
Target function: address 0x813673E0, size 0x704 (449 instructions).
|
||||
At original object offsets 0x1D20 and 0x1D9C, the two enumeration return values
|
||||
are saved in r27. Calls through both verifier/ticket paths leave that saved
|
||||
value independent. At 0x23C0 it is copied to return register r3 after the
|
||||
optional title-list free. The prior void declaration discarded this ABI.
|
||||
|
||||
The only declaration is in include/utility/iplESMisc.h. The only call is
|
||||
src/system/iplSystem.cpp:680; it intentionally ignores the result. The symbol
|
||||
name is unchanged because the return type is not encoded in this member name.
|
||||
All 1027 compiled source objects were compared after a forced full rebuild;
|
||||
iplSystem and every unit except iplESMisc were byte/relocation unchanged.
|
||||
|
||||
The target's verifier branch joins the common increment at 0x238C (index +1,
|
||||
byte offset +8). Its negative-read path joins cleanup at 0x2104, whereas its
|
||||
successful close begins at 0x20E0. The reconstruction restores these distinct
|
||||
paths instead of compensating with stack offsets or register tricks.
|
||||
|
||||
### Measurements
|
||||
|
||||
| Unit / measure | Before | After |
|
||||
| --- | ---: | ---: |
|
||||
| ESMisc exact functions | 30/31 | 30/31 |
|
||||
| ESMisc exact code | 9404/11200 | 9404/11200 |
|
||||
| ESMisc fuzzy | 96.76036% | 99.33143% |
|
||||
| DeleteUnauthorizedData fuzzy | 79.797325% | 95.830734% |
|
||||
| Function instructions | 434/449 | 446/449 |
|
||||
| ESMisc matched data | 4416/4416 | 4416/4416 |
|
||||
| ATERM exact / fuzzy / data | 17/26; 96.624664%; 18584/18864 | unchanged |
|
||||
| AOSS exact / fuzzy / data | 16/21; 96.777916%; 3928/3928 | unchanged |
|
||||
| Whole-report fuzzy | 99.588615% | 99.598236% |
|
||||
|
||||
pool_diff now reports all 114 strings identical. The source .data is 4378
|
||||
bytes and exactly equals the original section's first 4378 bytes. The target
|
||||
section is 4384 bytes and ends in six zero alignment bytes. No synthetic
|
||||
padding was added. The objdiff data score remains 100%, and the literal audit
|
||||
checks 204 arguments in all 30 exact functions with zero candidates or errors.
|
||||
|
||||
The candidate remains non-exact. ctxdiff shows 446/449 instructions and
|
||||
remaining register allocation, -1 mask materialization, and scratch-pointer
|
||||
lifetime differences. No brute-force declaration/register search was run.
|
||||
|
||||
## Validation
|
||||
|
||||
Commands:
|
||||
|
||||
- python3 configure.py --version 43U --wrapper ../toolchain/wibo-build/wibo
|
||||
- Delete generated native `build/43U/src/**/*.o`, retaining a private baseline
|
||||
object snapshot for comparison.
|
||||
- WIBO_SJIS_MISSING_IMPORTS=1 ../.venv/bin/ninja all_source build/43U/report.json build/43U/ok
|
||||
- PYTHONPATH=../local-tools ../.venv/bin/python tools/decomp-assist/pool_diff.py
|
||||
- PYTHONPATH=../local-tools ../.venv/bin/python tools/decomp-assist/ctxdiff.py src/utility/iplESMisc DeleteUnauthorizedData__Q33ipl7utility6ESMiscFPQ23EGG4Heap
|
||||
- PYTHONPATH=../local-tools ../.venv/bin/python tools/decomp-assist/literal_reference_diff.py src/utility/iplESMisc
|
||||
- Compare every unit in the fresh report and all 1027 source objects' allocated
|
||||
bytes and normalized relocations against the baseline.
|
||||
- git diff --check
|
||||
|
||||
Full rebuild passed (1031 Ninja steps). DOL SHA1:
|
||||
`26116613f624061ba99c8d1a299aaa6efa85670d`.
|
||||
|
||||
Only the ESMisc report changed: its fuzzy and one function's fuzzy improved.
|
||||
No report metric regressed. Only ESMisc's allocated .text and .data changed:
|
||||
.text 11360 -> 11408 bytes (390 relocations on both sides), .data 4378 -> 4378
|
||||
bytes (zero relocations). Every other allocated section/object is unchanged.
|
||||
|
||||
A temporary host harness extracted the actual reconstructed helper bodies,
|
||||
substituted fake Wii/heap calls, and exercised 12 control-flow scenarios:
|
||||
first and second enumeration errors, title-list allocation failure, mixed
|
||||
Zelda/blocked/ordinary title traversal, negative read, short read, second-save
|
||||
verification failure, absent file, save-buffer allocation failure, ChangeUid
|
||||
failure, ticket enumeration failure, and zero-ticket handling. Tests ran with
|
||||
AddressSanitizer and UndefinedBehaviorSanitizer. LeakSanitizer is unavailable
|
||||
under the execution environment's ptrace, so only that component was disabled.
|
||||
The harness is supplemental behavioral validation, not a retail runtime test.
|
||||
|
||||
GATE: focused decompilation improvement; full 43U/DOL and no-regression checks
|
||||
pass; exact-matching gate remains incomplete at 30/31. No linking claimed.
|
||||
18
tools/decomp-assist/attempts/odh-worker2.md
Normal file
18
tools/decomp-assist/attempts/odh-worker2.md
Normal file
@@ -0,0 +1,18 @@
|
||||
# odh `cdj_d_decompressLoop` (worker-2) 2026-10-02
|
||||
|
||||
Claim was only `cdj_d_decompressLoop`. colorConv, huffmanDecoder, and LineConv11 were not modified in the committed diff.
|
||||
|
||||
## Result
|
||||
|
||||
`cdj_d_decompressLoop` **899/899, 0 diffs, byte-identical** (3596 bytes) to retail. Was 43, then 7.
|
||||
|
||||
## What matched
|
||||
|
||||
- Inlined `(blockRowSize * 2)` and `((u32)blockWidth << 4)` (init `slwi r18` / `slwi r17`).
|
||||
- `planeOffset += (u32)master->blocksWide << 6` coalesces the 1x2 update into `add r15, r15, r0`.
|
||||
- `int nextBlockX = master->blockX + 1` with `(u16)` compare (same shape as compressLoop).
|
||||
- Second 1x1 chroma sum written blockX term first.
|
||||
- idct destinations that need plane-first `add` use `(u8*)((u32)planeOffset + (u32)master->workBuffer) + 8`.
|
||||
- 2x2 tail stores the updated plane in `requiredBlockEnd` and the end pointer in `planeOffset`. That is what puts the plane in r15 and the end in r16 (`addi r15, r3, -8` / `add r16, r15, r18`). Assigning the plane back to `planeOffset` left those two callee-saves swapped (7 diffs). Splitting the `-8` let MWCC cancel it against the later `+8` and dropped to 897.
|
||||
|
||||
colorConv left at the 18 pairwise wall. Not in this diff.
|
||||
130
tools/decomp-assist/revisit.attempts.md
Normal file
130
tools/decomp-assist/revisit.attempts.md
Normal file
@@ -0,0 +1,130 @@
|
||||
# revisit leaf — second-pass evidence (agent/w1007/revisit @ origin/main 29fe1efa)
|
||||
|
||||
Scope: iplSDChannelTitle (99.98883), ut_ArchiveFontBase (98.52), lyt_window (99.76),
|
||||
iplMemoryCardManager (97.88). Post-#834 (linkgap emit gates + .data object names).
|
||||
|
||||
## iplSDChannelTitle — all gates landed
|
||||
|
||||
Per-TU `IPL_SD_CHANNEL_TITLE_CPP` declared-only gates applied to:
|
||||
RuntimeTypeInfo.h DynamicCast, iplMathTypes.h VEC3 3-arg ctor, GUIManager.h
|
||||
(EventHandler setManager/setLatestEventCtrlNo/getLatestEventCtrlNo,
|
||||
Component setTriggerTarget, PaneComponent setPane/getPane), iplGraphics.h
|
||||
setOrthoTrans/setOrthoScale, iplSceneBase.h isReady/isResetProcessDone/getParent/
|
||||
getChild/getNext/getPrev, iplFaderSceneBase.h initCalcNormal/calcCommonAfter,
|
||||
iplNand.h File::isFinished/checkData, iplInterporation.h HermiteIntp<f32>::get
|
||||
(nested under IPL_CHANNEL_TITLE_NOVTABLE spec), Rect.h 0-arg ctor
|
||||
(IPL_SOUND_RECT_OUT_OF_LINE gate), iplGuiManager.h ~PaneManager.
|
||||
Deleted 2 unreferenced extern "C" trampolines (onTitleButtonEvent/onTitlePaneEvent)
|
||||
orig lacks. Result: all data sections 100%; .text 99.98883.
|
||||
|
||||
### VERIFIED WALL — dtor emission policy (decl-immune)
|
||||
Residual .text gap = 2 unreferenced weak deleting-dtor bodies
|
||||
(~FaderSceneBase 88B + ~FrameController 64B) + ~5 dangling no-reloc UNDs
|
||||
(__vt__LangFile, __vt__SDButtonEventHandlerBase, __vt__FrameController,
|
||||
mArg/typeInfo syms — symtab noise, no relocs). Orig's TU had these dtors
|
||||
trivial/implicit: ~SDChannelTitle calls ~Base directly (28 insns), Rect
|
||||
temporaries carry no dtor calls, so correct forms are `virtual ~X() {}`
|
||||
inline or NO decl at all. Declaring them out-of-line adds real `bl` calls →
|
||||
fuzzy dropped 99.98883→99.55799. Implicit/non-virtual variants still emit the
|
||||
weak bodies AND slightly regress — front-end-level MWCC instantiation drag,
|
||||
no decl form eliminates it. Remaining fn wall: flushSaveBeforeExit 98.59 —
|
||||
&smArg materialization register choice (orig r3→scratch r4, mine r4/r5→recv-first);
|
||||
8+ source forms all shift the home, never to r3.
|
||||
|
||||
## ut_ArchiveFontBase — ConstructOpAnalyzeGLGR 92.09 (956B)
|
||||
|
||||
20 normalized diffs, insns 116-147 of 239 — issue-order inside the
|
||||
ready-set around the CalcOffsetSheetFlags/CalcSizeFlagSet scratch math.
|
||||
Orig hoists lhz 0x1c (sheetGlyphCount) / lhz 0x24 (sheetCount) / lhz 0xe
|
||||
(dataBlockCount) + lwz 0x4c(r20) into the marshal block.
|
||||
FAILED variants: decl-order swap of the three u16s (identical 20 diffs —
|
||||
scheduler ignores decl order); moving ctx->m* tail stores adjacent to the
|
||||
u16 loads (regressed 20→108, whole-web rotation). Conclusion: pure list-
|
||||
scheduling tie, same family as before.
|
||||
|
||||
## lyt_window — DrawFrame 98.18 (1504B)
|
||||
|
||||
376=376 insns. One callee-window permutation: orig numbers the static
|
||||
flipInfos[] array base early (r21, first materialized at insn 36) pushing
|
||||
arg webs to r27-r31; mine puts it deepest (r31), args r26-r30. Same web
|
||||
count (12 callee webs r20-r31 both), identical prologue/epilogue; only the
|
||||
allocator's numbering differs. Plus a repeated stfsx/fadds store-weave in
|
||||
the 4 DRAW_QUAD_FOR_FRAME_1 corner blocks.
|
||||
FAILED variants: scoping polPt/polSize inside the macro (385 insns,
|
||||
worse); moving texSize decl after polPt/polSize (372 insns, worse).
|
||||
NOTE: paired-single ops — capstone can't decode psq_*/ps_* insns, so
|
||||
ndiff.py/disasm_fn.py truncate at the first one; use raw-word diffs.
|
||||
|
||||
## iplMemoryCardManager — 8 sub-100 fns all decomposed
|
||||
|
||||
- isMoveEnable/isCopyEnable (99.83), update_file_array (99.72),
|
||||
getComment (98.94): 0 normalized diffs — pure regname webs.
|
||||
- isBannerEnable (92.31, 26 insns, 7 diffs) + getBlocks (92.0, 25 insns,
|
||||
6 diffs): single diff = `addi r11,r1,0x20` restgpr-setup placement —
|
||||
orig emits it at tail (after the full member-chain load), mine hoists
|
||||
to slot 11. Folded-return variant (`return icons[slot][mFile..]` no
|
||||
locals) emits identical code — scheduler-internal, decl-form insensitive.
|
||||
Folded form kept (same output, terser).
|
||||
- _create_icon (87.55) + create_banner (90.42): `(base+const)+var`
|
||||
member-chain regroup — orig computes (&mFileCell + memberOffs) +
|
||||
(slot*row + file*0x15C combined index) with `this+0x10EC`/`this+0x110C`
|
||||
bases cached in callee regs reused across both GX_TF branches, and
|
||||
rematerializes &cell.icon per call (`add r3,...` then `add r24,...`
|
||||
post-bl) while mine pins it; marshal order `li r4,0` before `mr r3`
|
||||
in orig. FAILED variants: `MCFileCell* cell = &mFileCell[slot][file]`
|
||||
(90 insns — MWCC folded the pointer, worse); `mFileCell[0] +
|
||||
slot*0x7F + file` flat-index (89 insns — aggressive CSE, worse).
|
||||
Same documented mcard2 wall.
|
||||
|
||||
All units stay NonMatching — no shims, no flips. Every residual is a
|
||||
verified allocator/scheduler/emission-policy tie with source-form evidence.
|
||||
|
||||
## Round 2 (post-#834 rebase @11c75ddb) — sdChannelTitle emit-parity probe
|
||||
|
||||
Investigated per orchestrator hint whether the 152B weak-dtor + dangling-UND
|
||||
residual was the same dedup-loss family as channelTitle's symbols.txt fix.
|
||||
VERDICT: NOT a naming issue and NOT a flip blocker.
|
||||
|
||||
- orig iplSDChannelTitle.o: ZERO weak FUNC syms. Mine emits 2 unreferenced
|
||||
weak deleting-dtor bodies: `__dt__FaderSceneBase` (88B @0x1f4) +
|
||||
`__dt__FrameController` (64B @0xb30), plus 3 zero-reloc UND vtable refs
|
||||
(`__vt__FrameController`, `__vt__SDButtonEventHandlerBase`, `__vt__LangFile`).
|
||||
- orig iplFaderSceneBase.o's own view: `~FaderSceneBase` is DECLARED-ONLY
|
||||
(its `__dt__` is UND there, defined in another TU).
|
||||
- Tried `__declspec(novtable)` on all 4 classes under
|
||||
IPL_SD_CHANNEL_TITLE_CPP: removed the 3 dangling `__vt__` UNDs (correct
|
||||
mechanism — orig stores only most-derived vt) but weak bodies persisted.
|
||||
- Tried implicit-trivial dtor (removing decl): `__dt__FrameController` emit
|
||||
STOPPED (64B gone), but `calc()` vtable slot shifted 0x0c→0x08 →
|
||||
calcFadein/calcFadeout single-word diffs (`lwz r12,0x0c(r12)` vs 0x08)
|
||||
→ REVERTED everything.
|
||||
- CRITICAL PROOF these bodies are harmless: main's iplChannelTitle.o
|
||||
(unit fuzzy 100.0 post-#834) emits the IDENTICAL `__dt__FaderSceneBase`
|
||||
88B + `__dt__FrameController` 64B weak bodies that orig's .o lacks.
|
||||
They are linker-stripped dead emission; objdiff fn-pairing ignores them.
|
||||
=> The 152B was never the blocker. Real residual = flushSaveBeforeExit
|
||||
98.59 only.
|
||||
|
||||
## flushSaveBeforeExit — 6-diff → 2-diff minimum
|
||||
|
||||
Window is the `sm` (System globals) base web: orig binds &sm to r3 and
|
||||
loads +0x94→r4 (store), +0x28→r4 (heap arg), +0x94→r3 (recv); mine binds
|
||||
r4 and marshals recv before arg. Variants:
|
||||
- saveHeap decl hoisted above getSDPrevPage store: 2 diffs (base→r5,
|
||||
+0x28 load moved early) — closer but not orig's order.
|
||||
- `flushAsync(System::getMem2App())` inline: same 2 diffs, base→r4.
|
||||
Residual = base-web home + marshal eval order — allocator tie.
|
||||
|
||||
## GLGR — ready-set issue-order re-probes
|
||||
|
||||
- def-move (sheetGlyphCount/dataBlockCount to tail): 20→99 diffs, REGRESSION.
|
||||
- `u32 remWorkSpace = ctx->remWorkSpace()` hoist: 20→25, REGRESSION.
|
||||
- stepSheetFlags after flagsSheetsOff (dependency-chain reorder): identical
|
||||
20 diffs — MWCC issue-order insensitive to stmt order here. Wall stands.
|
||||
|
||||
## DrawFrame / MCManager re-verified
|
||||
|
||||
DrawFrame 376=376: flipInfos base pinned r21(orig)/r31(mine) + stfsx weave
|
||||
— callee-numbering tie unchanged. create_banner/_create_icon: `(base+const)
|
||||
+var` regroup + recompute-vs-CSE (`add r3,r29,r25` remat per call in orig)
|
||||
— same documented wall.
|
||||
File diff suppressed because it is too large
Load Diff
86
tools/decomp-assist/scene4.attempts.md
Normal file
86
tools/decomp-assist/scene4.attempts.md
Normal file
@@ -0,0 +1,86 @@
|
||||
# scene4 leaf — decode attempts & evidence
|
||||
|
||||
Branch `agent/w1008/scene4` off origin/main@e3457d11.
|
||||
Scope: iplAddress, iplAddressEdit, iplSDChannelSelect are the only sub-100 units in
|
||||
the scene/address + sdChannelSelect remainder (iplAddressAddSel, iplAddressInputName,
|
||||
iplAddressSelect, addressHelpers, addressInputHelpers, agreeSettings, agreeHttp,
|
||||
iplFaceSelect, iplNCDSetting all verified already 100% on main; no open PR claims).
|
||||
|
||||
## Decodes that landed (this leaf)
|
||||
|
||||
### Single-case `switch` produces the `b<eq> caseblock; b after` 2-branch guard
|
||||
`switch (x) { case C:` emits `cmp; beq caseblock; b exit` — MWCC keeps the
|
||||
dispatch's second `b` because the case-block is a separate labelled region.
|
||||
Equivalent `if`, `if||`, `if&&`, `goto`-goto, `if/else`-goto all get normalized
|
||||
to a single fused `beq`/`bne`. Used in:
|
||||
|
||||
- `Address::start_drag_event` (892B): outer `switch (mState) { case STATE_NORMAL:`
|
||||
+ inner `switch (mMode) { case 0:` reproduces orig's two nested 2-branch guards.
|
||||
Residual: 7 word diffs, pure regname — nigaoe web pinned r26 (orig) vs r29
|
||||
(mine), miiPane web r29 vs r26. Allocator home-order tie; decl-hoist of
|
||||
miiPane above the `if` was a no-op (web homes unchanged).
|
||||
- `Address::onEventDerived` (1080B): TRIG case falls through to ON_POINT
|
||||
(orig has NO `break`); the `mState == COVER_NORMAL || mState == NORMAL`
|
||||
guard folds to `beq`+`bne` inside the TRIG case. Residual: 81 word diffs,
|
||||
all regname — insn sequence identical.
|
||||
|
||||
### `addic.` fusion for `ptr = base + const` NULL-tested members
|
||||
`record->attr.name` tested `!= 0` fuses into `addic.` only when the pointer is
|
||||
materialized lazily at the compare — decl the local inside the `if`. Hoisted
|
||||
decls emit `addi`+`cmpwi`. (movePane_onDrag `name` web.)
|
||||
|
||||
## Walls re-verified (evidence)
|
||||
|
||||
### `Address::movePane_onDrag` 92.45 (620 orig vs 612 mine)
|
||||
- Orig emits `bne next; b exit` 2-branch guards for both `textBox != NULL` and
|
||||
`name != NULL` (the `b` skips to the shared `width += 0.01f` block).
|
||||
- This is switch-dispatch-shaped, but every legal polarity fails:
|
||||
`switch(ptr) { case NULL: break; default: body }` bool-materializes
|
||||
(`addic/subfe/cmpwi 1` — +3 insns); `switch (p != NULL) { case true:` also
|
||||
bool-materializes; `do { if (!x) break; } while (0)` folds to single `beq`.
|
||||
- Orig computes the record math (`lwz 0x70 / mulli 5 / lwz 0x274 / mulli 0x140`)
|
||||
before the textBox branch — scheduler interleave around the guard.
|
||||
- Residual also regname r27↔r29 (textBox web) + loop `name` web.
|
||||
|
||||
### `FriendListCache::update` 95.5 (160 orig vs 156 mine)
|
||||
Orig remats `mInfos + index*0x140` per use site (memset, wcsncpy,
|
||||
updateFriendInfo = 3 `mulli`+`add` pairs). Mine CSEs into callee r31.
|
||||
`getInfo(index)` vs `mInfos[index]` vs `(int)index` cast — all VN-identical,
|
||||
still CSE. Remat-vs-pin in the unusual remat-is-orig direction; no lever.
|
||||
|
||||
### `AddressEdit::create` 97.45 (3280B)
|
||||
Two distinct residuals:
|
||||
- Wholesale r30↔r31 web-order swap: orig pins string-table const web in r31
|
||||
and `boardFile` (getScene+0xd20) in r30; mine the reverse. Webs born in the
|
||||
same source order — allocator processing order tie.
|
||||
- `friendText` (this+0x2b4 / this+0x2cc) pin: orig materializes
|
||||
`addi r25, r29, 0x2b4` at decl point between `initFrame()` and `restart()`,
|
||||
reassigns `addi r25, r29, 0x2cc` mid-block — the reg+const web is pinned.
|
||||
Mine remats `addi r5, r29, 0x2b4` at each marshal. Variants tried: non-const
|
||||
`wchar_t*`, decl moved before `animator =` — both no-op. Same this+const
|
||||
pin family as get_friendinfo.
|
||||
|
||||
### `AddressEdit::get_friendinfo` 88.04 (336 orig vs 328 mine)
|
||||
Orig: this→r28, `this+0x2b4` (mName) pinned in r29 materialized before the
|
||||
FindPaneByName marshal — 2 extra insns vs mine's marshal-site remats, and one
|
||||
more callee web (savegpr_28 vs my _29 window differs). Same `this+const`
|
||||
pin-vs-remat wall as create's friendText.
|
||||
|
||||
### `AddressEdit::update_friendinfo` 99.42 (152B)
|
||||
Single 2-insn scheduling swap: `addi r4,r30,0x2b4` vs `addi r3,r31,8` order
|
||||
in the wcsncpy marshal.
|
||||
|
||||
### iplSDChannelSelect 99.58 — 7 fns
|
||||
- `create` 97.74: regname r29↔r30 swap + marshal interleaves around `bl`s
|
||||
(scheduler family); insn count equal.
|
||||
- `collectTitles*` ×4 (97.29–97.83): documented ties — callee-web rotations
|
||||
around the same ES_GetTitleCount/ES_GetTitles marshal blocks.
|
||||
- `flushSaveDataAndMountSD` 99.66 (140B): marshal order tie.
|
||||
- `setChannelScissor` 93.47 (932B): fp/scheduling family (DrawFrame-class).
|
||||
|
||||
## Notes
|
||||
- ndiff.py NORMALIZES register names — "diffs 0" can hide regname-only
|
||||
diffs. Always confirm with raw byte-compare of `.text` (readelf -sW for
|
||||
addr/size, -SW for file offset).
|
||||
- `objdiff-cli diff` is interactive-only (fails headless); use disasm_fn.py
|
||||
+ byte-compare.
|
||||
31
tools/decomp-assist/wad.attempts.md
Normal file
31
tools/decomp-assist/wad.attempts.md
Normal file
@@ -0,0 +1,31 @@
|
||||
|
||||
## WADBackupEx decode (this leaf session)
|
||||
- file_done region: orig CFG has inner `goto file_done` edges landing PAST a `flags[2]==1`
|
||||
check (goto-specialized entries). Faithful source = label inside the flags-if:
|
||||
`if (hdr->flags[2]==1) { file_done: if (fileOpened) NANDClose(&savedFile); }`.
|
||||
Orig folds the outer if to a dead lbz+cmplwi fossil (no bne) via edge-prop that
|
||||
fileOpened==0 on the flags!=1 path; our MWCC emits the bne (+4B).
|
||||
- result=0 at file-loop head: orig keeps ZERO in dedicated callee reg (r31);
|
||||
ours spills an extra zero to stack slot (extra stw+lwz). keep-vs-remat wall.
|
||||
- Several base+offset addi folds (0x340+8 vs 0x348 etc.) = documented fold family.
|
||||
- GetBlocks vestigial NULL ptr locals + conditional frees = orig-faithful decode (solved).
|
||||
- DVDExForBS `if (header.contentSize != 0)` dead-check fossil = conditional-assign
|
||||
overwritten by later unconditional assign (solved).
|
||||
|
||||
## WADBackupEx decode round 2 (fossil + ptr web)
|
||||
- Dead-compare fossil SOLVED: `if (A) { X = v; } ... X = v;` — conditional assign whose
|
||||
store is killed by a later unconditional assign → MWCC keeps lbz+cmplwi, drops bne.
|
||||
Applied: `if (flags[2]==1) { fileFd = -1; } if (fileOpened) NANDClose; fileFd = -1;`
|
||||
reproduces orig's exact `lbz;cmplwi;lwz;cmpwi;beq` sequence (-8B wall gone).
|
||||
- file_done label placement: label sits BEFORE the flags-if (inner gotos land past it,
|
||||
outer bne/beq edges land on it) — `file_done:` above the fossil if.
|
||||
- result=0 redundant-store dedup inside `if (path==0)` arm: orig omits it (already 0).
|
||||
- &headerBlock member-address chains: orig emits `addi r3,r1,0x340; addi r3,r3,+off`
|
||||
(remat base + member offset) for deviceId/cidx/deviceMac args. Best source form =
|
||||
`WADBackupHeader* headerBlockHeader = &headerBlock.header` used for the three
|
||||
member args → `addi r3,r18,+off` (structurally right; r18-kept vs orig remat =
|
||||
keep-vs-remat wall). `(&x)->y` and `x.y` fold to absolute; per-site ptr assigns
|
||||
fold remat+offset — all worse.
|
||||
- Remaining diffs (all documented keep-vs-remat/web-coloring): `li 0;stw` vs `li;mr`
|
||||
for result head store, `addi r1,0x340` remats vs r18/mr, stw 0x814/lwz 0x80c spill
|
||||
webs, `li -1` fileFd slot, addi+0x80 loop-IV position, `addi r1,0x3c0` remat order.
|
||||
Reference in New Issue
Block a user