rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimize dldiLoadFromBin

Browse Source 
Fixes Guru Meditation Error
This commit is contained in:
RocketRobz 2018-10-10 16:52:47 -06:00
parent 54cd443e40
commit 67c827fca2
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arm9/source/driveOperations.cpp
View File

@ -84,38 +84,12 @@ TWL_CODE void sdUnmount(void) {
} }
TWL_CODE DLDI_INTERFACE* dldiLoadFromBin (const u8 dldiAddr[]) { TWL_CODE DLDI_INTERFACE* dldiLoadFromBin (const u8 dldiAddr[]) {
DLDI_INTERFACE* device;
size_t dldiSize;
// Read in the DLDI header
if ((device = (DLDI_INTERFACE*)malloc (sizeof(DLDI_INTERFACE))) == NULL) {
return NULL;
}
memcpy(device, dldiAddr, sizeof(DLDI_INTERFACE));
// Check that it is a valid DLDI // Check that it is a valid DLDI
if (!dldiIsValid (device)) { if (!dldiIsValid ((DLDI_INTERFACE*)dldiAddr)) {
free (device);
return NULL; return NULL;
} }
// Calculate actual size of DLDI DLDI_INTERFACE* device = (DLDI_INTERFACE*)dldiAddr;
// Although the file may only go to the dldiEnd, the BSS section can extend past that
if (device->dldiEnd > device->bssEnd) {
dldiSize = (char*)device->dldiEnd - (char*)device->dldiStart;
} else {
dldiSize = (char*)device->bssEnd - (char*)device->dldiStart;
}
dldiSize = (dldiSize + 0x03) & ~0x03; // Round up to nearest integer multiple
// Load entire DLDI
free (device);
if ((device = (DLDI_INTERFACE*)malloc (dldiSize)) == NULL) {
return NULL;
}
memcpy(device, dldiAddr, dldiSize);
dldiFixDriverAddresses (device); dldiFixDriverAddresses (device);
@ -202,7 +176,7 @@ TWL_CODE bool twl_flashcardMount(void) {
} else if (!memcmp(gameid, "ALXX", 4)) { } else if (!memcmp(gameid, "ALXX", 4)) {
loadedDldi = dldiLoadFromBin(dstwo_dldi); loadedDldi = dldiLoadFromBin(dstwo_dldi);
loadedDldi->ioInterface.startup(); loadedDldi->ioInterface.startup();
fatMountSimple("fat", &io_dldi_data->ioInterface); fatMountSimple("fat", &loadedDldi->ioInterface);
} }
if (flashcardFound()) { if (flashcardFound()) {