anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: refactor part around HIO

Browse Source
This commit is contained in:
TuxSH 2022-05-06 19:53:27 +01:00
parent 6573fc4247
commit ea8f9f4667
2 changed files with 30 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
sysmodules/loader/source/loader.c
View File

@ -154,26 +154,21 @@ static Result loadCode(u64 titleId, prog_addrs_t *shared, u64 programHandle, int
return 0; return 0;
} }
static inline bool IsHioId(u64 id)
{
// FS load HIO titles at boot when it can. For HIO titles, title/programId and "program handle"
// are the same thing, although some of them can be aliased with their "real" titleId (i.e. in ExHeader).
if (id >> 32 == 0xFFFF0000u)
return true;
else
return R_LEVEL(FSREG_CheckHostLoadId(id)) == RL_SUCCESS; // check if this is an alias to an HIO-loaded title
}
static Result GetProgramInfo(ExHeader_Info *exheaderInfo, u64 programHandle) static Result GetProgramInfo(ExHeader_Info *exheaderInfo, u64 programHandle)
{ {
Result res = 0; Result res;
TRY(IsHioId(programHandle) ? FSREG_GetProgramInfo(exheaderInfo, 1, programHandle) : PXIPM_GetProgramInfo(exheaderInfo, programHandle));
if (programHandle >> 32 == 0xFFFF0000)
res = FSREG_GetProgramInfo(exheaderInfo, 1, programHandle);
else
{
res = FSREG_CheckHostLoadId(programHandle);
//if ((res >= 0 && (unsigned)res >> 27) || (res < 0 && ((unsigned)res >> 27)-32))
//so use PXIPM if FSREG fails OR returns "info", is the second condition a bug?
if (R_FAILED(res) || (R_SUCCEEDED(res) && R_LEVEL(res) != RL_SUCCESS))
{
TRY(PXIPM_GetProgramInfo(exheaderInfo, programHandle));
}
else
{
TRY(FSREG_GetProgramInfo(exheaderInfo, 1, programHandle));
}
}
// Tweak 3dsx placeholder title exheaderInfo // Tweak 3dsx placeholder title exheaderInfo
if (hbldrIs3dsxTitle(exheaderInfo->aci.local_caps.title_id)) if (hbldrIs3dsxTitle(exheaderInfo->aci.local_caps.title_id))
@ -287,56 +282,29 @@ static Result RegisterProgram(u64 *programHandle, FS_ProgramInfo *title, FS_Prog
u64 titleId; u64 titleId;
titleId = title->programId; titleId = title->programId;
if (titleId >> 32 != 0xFFFF0000) if (IsHioId(titleId))
{ {
res = FSREG_CheckHostLoadId(titleId); if ((title->mediaType != update->mediaType) || (titleId != update->programId))
//if ((res >= 0 && (unsigned)res >> 27) || (res < 0 && ((unsigned)res >> 27)-32)) panic(1);
if (R_FAILED(res) || (R_SUCCEEDED(res) && R_LEVEL(res) != RL_SUCCESS))
{ TRY(FSREG_LoadProgram(programHandle, title));
TRY(PXIPM_RegisterProgram(programHandle, title, update));
if (*programHandle >> 32 != 0xFFFF0000) if (!IsHioId(*programHandle)) // double check this is indeed HIO
{ panic(2);
res = FSREG_CheckHostLoadId(*programHandle); }
//if ((res >= 0 && (unsigned)res >> 27) || (res < 0 && ((unsigned)res >> 27)-32)) else
if (R_FAILED(res) || (R_SUCCEEDED(res) && R_LEVEL(res) != RL_SUCCESS)) {
{ TRY(PXIPM_RegisterProgram(programHandle, title, update));
return 0; if (IsHioId(*programHandle)) // double check this is indeed *not* HIO
} panic(0);
}
panic(0);
}
} }
if ((title->mediaType != update->mediaType) || (titleId != update->programId))
panic(1);
TRY(FSREG_LoadProgram(programHandle, title));
if (*programHandle >> 32 == 0xFFFF0000)
return 0;
res = FSREG_CheckHostLoadId(*programHandle);
//if ((res >= 0 && (unsigned)res >> 27) || (res < 0 && ((unsigned)res >> 27)-32))
if (R_FAILED(res) || (R_SUCCEEDED(res) && R_LEVEL(res) != RL_SUCCESS))
panic(2);
return res; return res;
} }
static Result UnregisterProgram(u64 programHandle) static Result UnregisterProgram(u64 programHandle)
{ {
Result res; return IsHioId(programHandle) ? FSREG_UnloadProgram(programHandle) : PXIPM_UnregisterProgram(programHandle);
if (programHandle >> 32 == 0xFFFF0000)
return FSREG_UnloadProgram(programHandle);
else
{
res = FSREG_CheckHostLoadId(programHandle);
//if ((res >= 0 && (unsigned)res >> 27) || (res < 0 && ((unsigned)res >> 27)-32))
if (R_FAILED(res) || (R_SUCCEEDED(res) && R_LEVEL(res) != RL_SUCCESS))
return PXIPM_UnregisterProgram(programHandle);
else
return FSREG_UnloadProgram(programHandle);
}
} }
void loaderHandleCommands(void *ctx) void loaderHandleCommands(void *ctx)

2
sysmodules/pm/source/info.c
View File

@ -12,6 +12,8 @@ Result registerProgram(u64 *programHandle, const FS_ProgramInfo *programInfo, co
if (IS_N3DS) { if (IS_N3DS) {
if (pi.programId >> 48 == 0xFFFF) { if (pi.programId >> 48 == 0xFFFF) {
// Check for HIO TIDs. PM is a bit more lax, as the condition
// in Loader and FS is (x >> 32) == 0xFFFF0000 instead.
return LOADER_RegisterProgram(programHandle, &pi, &piu); return LOADER_RegisterProgram(programHandle, &pi, &piu);
} }
pi.programId = (pi.programId & ~N3DS_TID_MASK) | N3DS_TID_BIT; pi.programId = (pi.programId & ~N3DS_TID_MASK) | N3DS_TID_BIT;