dspico/pico-loader
1
0
Fork 0
mirror of https://github.com/LNH-team/pico-loader.git synced 2026-06-02 09:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved Sdk5DsiSdCardRedirectPatch to take autoload into account and to support the situation where a function is missing

Browse Source 
Fixes WRFU Tester (#23)
This commit is contained in:
Gericom
2025-12-06 11:53:32 +01:00
parent d12036e6a7
commit b0c8dfa5bc
3 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
arm9/source/patches/arm7/sdk5/Sdk5DsiSdCardRedirectPatch.cpp
View File

@@ -1,4 +1,7 @@
#include "common.h" #include "common.h"
#include "sharedMemory.h"
#include "ndsHeader.h"
#include "moduleParams.h"
#include "patches/platform/LoaderPlatform.h" #include "patches/platform/LoaderPlatform.h"
#include "Sdk5DsiSdCardRedirectPatchAsm.h" #include "Sdk5DsiSdCardRedirectPatchAsm.h"
#include "Sdk5DsiSdCardRedirectPatch.h" #include "Sdk5DsiSdCardRedirectPatch.h"
@@ -7,6 +10,12 @@ static const u32 sAttachFunctionPattern[] = { 0xE92D4018u, 0xE24DDF5Du, 0xE24DDB
static const u32 sAttachFunctionPatternThumb[] = { 0xB0FFB518u, 0xB0DFB0FFu, 0x4A0E490Du, 0x64CA4469u }; static const u32 sAttachFunctionPatternThumb[] = { 0xB0FFB518u, 0xB0DFB0FFu, 0x4A0E490Du, 0x64CA4469u };
#define BL_TO_GET_DRIVE_STRUCT_OFFSET (-0x20) #define BL_TO_GET_DRIVE_STRUCT_OFFSET (-0x20)
#define BL_TO_GET_DRIVE_STRUCT_OFFSET_ALT 0x88
static bool isArmUnconditionalBl(u32 armInstruction)
{
return (armInstruction >> 24) == 0xEB;
}
bool Sdk5DsiSdCardRedirectPatch::FindPatchTarget(PatchContext& patchContext) bool Sdk5DsiSdCardRedirectPatch::FindPatchTarget(PatchContext& patchContext)
{ {
@@ -22,12 +31,17 @@ bool Sdk5DsiSdCardRedirectPatch::FindPatchTarget(PatchContext& patchContext)
if (_attachFunction) if (_attachFunction)
{ {
LOG_DEBUG("Found FATFSi_sdmcRtfsAttach at %p\n", _attachFunction); LOG_DEBUG("Found FATFSi_sdmcRtfsAttach at %p\n", _attachFunction);
if (!_thumb && (*(u32*)((u8*)_attachFunction + BL_TO_GET_DRIVE_STRUCT_OFFSET) >> 24) != 0xEB) _blToGetDriveStructOffset = BL_TO_GET_DRIVE_STRUCT_OFFSET;
if (!_thumb && !isArmUnconditionalBl(*(u32*)((u8*)_attachFunction + _blToGetDriveStructOffset)))
{
_blToGetDriveStructOffset = BL_TO_GET_DRIVE_STRUCT_OFFSET_ALT;
if (!isArmUnconditionalBl(*(u32*)((u8*)_attachFunction + _blToGetDriveStructOffset)))
{ {
LOG_WARNING("Unsupported arm7 version for SD redirection patches\n"); LOG_WARNING("Unsupported arm7 version for SD redirection patches\n");
_attachFunction = nullptr; _attachFunction = nullptr;
} }
} }
}
else else
{ {
LOG_WARNING("FATFSi_sdmcRtfsAttach not found\n"); LOG_WARNING("FATFSi_sdmcRtfsAttach not found\n");
@@ -49,6 +63,29 @@ static u32 getThumbBlAddress(const u32* instructionPointer)
return (u32)instructionPointer + 5 + ((int)((((blInstruction1 & 0x7FF) << 11) | (blInstruction2 & 0x7FF)) << 10) >> 9); return (u32)instructionPointer + 5 + ((int)((((blInstruction1 & 0x7FF) << 11) | (blInstruction2 & 0x7FF)) << 10) >> 9);
} }
static u32 correctAddressForArm7iAutoLoad(u32 address)
{
auto romHeader = (const nds_header_twl_t*)TWL_SHARED_MEMORY->twlRomHeader;
auto arm7iModuleParams = (const module_params_twl_t*)(
romHeader->ntrHeader.arm7LoadAddress + romHeader->arm7iModuleParamsAddress);
auto autoLoadListEntry = (autoload_list_entry_sdk5_t*)arm7iModuleParams->autoloadListStart;
u32 currentAddress = arm7iModuleParams->autoloadStart;
while (autoLoadListEntry != (autoload_list_entry_sdk5_t*)arm7iModuleParams->autoloadListEnd)
{
if (address >= currentAddress && address < currentAddress + autoLoadListEntry->size)
{
address -= currentAddress;
address += autoLoadListEntry->targetAddress;
break;
}
currentAddress += autoLoadListEntry->size;
autoLoadListEntry++;
}
return address;
}
void Sdk5DsiSdCardRedirectPatch::ApplyPatch(PatchContext& patchContext) void Sdk5DsiSdCardRedirectPatch::ApplyPatch(PatchContext& patchContext)
{ {
if (!_attachFunction) if (!_attachFunction)
@@ -57,13 +94,15 @@ void Sdk5DsiSdCardRedirectPatch::ApplyPatch(PatchContext& patchContext)
u32 getDriveStructAddress; u32 getDriveStructAddress;
if (_thumb) if (_thumb)
{ {
getDriveStructAddress = getThumbBlAddress((u32*)((u8*)_attachFunction + BL_TO_GET_DRIVE_STRUCT_OFFSET)); getDriveStructAddress = getThumbBlAddress((u32*)((u8*)_attachFunction + _blToGetDriveStructOffset));
} }
else else
{ {
getDriveStructAddress = getArmBlAddress((u32*)((u8*)_attachFunction + BL_TO_GET_DRIVE_STRUCT_OFFSET)); getDriveStructAddress = getArmBlAddress((u32*)((u8*)_attachFunction + _blToGetDriveStructOffset));
} }
getDriveStructAddress = correctAddressForArm7iAutoLoad(getDriveStructAddress);
auto sdRead = patchContext.GetLoaderPlatform()->CreateSdReadPatchCode( auto sdRead = patchContext.GetLoaderPlatform()->CreateSdReadPatchCode(
patchContext.GetPatchCodeCollection(), patchContext.GetPatchHeap()); patchContext.GetPatchCodeCollection(), patchContext.GetPatchHeap());
auto sdWrite = patchContext.GetLoaderPlatform()->CreateSdWritePatchCode( auto sdWrite = patchContext.GetLoaderPlatform()->CreateSdWritePatchCode(

1
arm9/source/patches/arm7/sdk5/Sdk5DsiSdCardRedirectPatch.h
View File

@@ -10,5 +10,6 @@ public:
private: private:
u32* _attachFunction = nullptr; u32* _attachFunction = nullptr;
s16 _blToGetDriveStructOffset = 0;
u16 _thumb = false; u16 _thumb = false;
}; };

8
common/moduleParams.h
View File

@@ -42,3 +42,11 @@ struct build_params_t
u32 magicBigEndian; //0xDEC08133 u32 magicBigEndian; //0xDEC08133
u32 magicLittleEndian; //0x3381C0DE u32 magicLittleEndian; //0x3381C0DE
}; };
struct autoload_list_entry_sdk5_t
{
u32 targetAddress;
u32 size;
u32 staticInitStart;
u32 bssSize;
};