Fix ROM mirroring for if ROM size is larger than device size

Fixes #1645
DS-Homebrew · Oct 21, 2023 · 7b5a709 · 7b5a709
1 parent 880ffff
commit 7b5a709
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 19 deletions.
diff --git a/retail/bootloader/source/arm7/hook_arm9.c b/retail/bootloader/source/arm7/hook_arm9.c
@@ -192,6 +192,7 @@ int hookNdsRetailArm9(
 	nocashMessage("hookNdsRetailArm9");
 
 	const char* romTid = getRomTid(ndsHeader);
+	extern u32 romPaddingSize;
 	extern u32 romLocation;
 	extern u32 romSizeLimit;
 	extern u16 s2FlashcardId;
@@ -249,7 +250,8 @@ int hookNdsRetailArm9(
 	ce9->s2FlashcardId          = s2FlashcardId;
 	ce9->overlaysSize           = overlaysSize;
 	ce9->ioverlaysSize          = ioverlaysSize;
-	ce9->romLocation = romLocation;
+	ce9->romPaddingSize         = romPaddingSize;
+	ce9->romLocation            = romLocation;
 
 	u32 romOffset = 0;
 	if (ROMinRAM) {

diff --git a/retail/bootloader/source/arm7/main.arm7.c b/retail/bootloader/source/arm7/main.arm7.c
@@ -137,6 +137,7 @@ u8 baseUnitCode = 0;
 u16 baseHeaderCRC = 0;
 u16 baseSecureCRC = 0;
 u32 baseRomSize = 0;
+u32 romPaddingSize = 0;
 u32 arm9ibinarySize = 0;
 u32 baseChipID = 0;
 bool pkmnHeader = false;
@@ -540,6 +541,13 @@ static void loadBinary_ARM7(const tDSiHeader* dsiHeaderTemp, aFile* file) {
 		}
 	}
 
+	dbg_printf("Header CRC is ");
+	u16 currentHeaderCRC = swiCRC16(0xFFFF, (void*)&dsiHeaderTemp->ndshdr, 0x15E);
+	if (currentHeaderCRC != dsiHeaderTemp->ndshdr.headerCRC16) {
+		dbg_printf("in");
+	}
+	dbg_printf("valid!\n");
+
 	if (
 		strncmp(baseTid, "ADA", 3) == 0    // Diamond
 		|| strncmp(baseTid, "APA", 3) == 0 // Pearl
@@ -556,6 +564,19 @@ static void loadBinary_ARM7(const tDSiHeader* dsiHeaderTemp, aFile* file) {
 	fileRead((char*)&baseHeaderCRC, file, 0x15E, sizeof(u16));
 	fileRead((char*)&baseSecureCRC, file, 0x6C, sizeof(u16));
 	fileRead((char*)&baseRomSize, file, 0x80, sizeof(u32));
+
+	u8 baseDeviceSize = 0;
+	fileRead((char*)&baseDeviceSize, file, 0x14, sizeof(u8));
+
+	romPaddingSize = 0x20000 << baseDeviceSize;
+	if (baseRomSize == 0 ? (romSize > romPaddingSize) : (baseRomSize > romPaddingSize)) {
+		dbg_printf("ROM size is larger than device size!\n");
+		while (baseRomSize == 0 ? (romSize > romPaddingSize) : (baseRomSize > romPaddingSize)) {
+			baseDeviceSize++;
+			romPaddingSize = 0x20000 << baseDeviceSize;
+		}
+	}
+
 	arm9ibinarySize = dsiHeaderTemp->arm9ibinarySize;
 }
 

diff --git a/retail/bootloaderi/source/arm7/hook_arm9.c b/retail/bootloaderi/source/arm7/hook_arm9.c
@@ -280,6 +280,7 @@ int hookNdsRetailArm9(
 	extern u32 iUncompressedSize;
 	extern u32 overlaysSize;
 	extern bool overlayPatch;
+	extern u32 romPaddingSize;
 	extern u32 dataToPreloadAddr[2];
 	extern u32 dataToPreloadSize[2];
 	extern bool dataToPreloadFound(const tNDSHeader* ndsHeader);
@@ -330,6 +331,7 @@ int hookNdsRetailArm9(
 	}
 	ce9->mainScreen             = mainScreen;
 	ce9->overlaysSize           = overlaysSize;
+	ce9->romPaddingSize         = romPaddingSize;
 	ce9->consoleModel           = consoleModel;
 
 	if (!ROMinRAM) {

diff --git a/retail/bootloaderi/source/arm7/main.arm7.c b/retail/bootloaderi/source/arm7/main.arm7.c
@@ -155,6 +155,7 @@ u16 baseHeaderCRC = 0;
 u16 baseSecureCRC = 0;
 u32 baseRomSize = 0;
 u32 baseChipID = 0;
+u32 romPaddingSize = 0;
 bool pkmnHeader = false;
 bool ndmaDisabled = false;
 
@@ -712,6 +713,13 @@ static void loadBinary_ARM7(const tDSiHeader* dsiHeaderTemp, aFile* file) {
 		}
 	}
 
+	dbg_printf("Header CRC is ");
+	u16 currentHeaderCRC = swiCRC16(0xFFFF, (void*)&dsiHeaderTemp->ndshdr, 0x15E);
+	if (currentHeaderCRC != dsiHeaderTemp->ndshdr.headerCRC16) {
+		dbg_printf("in");
+	}
+	dbg_printf("valid!\n");
+
 	char baseTid[5] = {0};
 	fileRead((char*)&baseTid, file, 0xC, 4);
 	if (
@@ -731,9 +739,17 @@ static void loadBinary_ARM7(const tDSiHeader* dsiHeaderTemp, aFile* file) {
 	fileRead((char*)&baseSecureCRC, file, 0x6C, sizeof(u16));
 	fileRead((char*)&baseRomSize, file, 0x80, sizeof(u32));
 
-	/*isGSDD = (strncmp(romTid, "BO5", 3) == 0)			// Golden Sun: Dark Dawn
-        || (strncmp(romTid, "TBR", 3) == 0)			    // Disney Pixar Brave 
-        ;*/
+	u8 baseDeviceSize = 0;
+	fileRead((char*)&baseDeviceSize, file, 0x14, sizeof(u8));
+
+	romPaddingSize = 0x20000 << baseDeviceSize;
+	if (baseRomSize == 0 ? (romSize > romPaddingSize) : (baseRomSize > romPaddingSize)) {
+		dbg_printf("ROM size is larger than device size!\n");
+		while (baseRomSize == 0 ? (romSize > romPaddingSize) : (baseRomSize > romPaddingSize)) {
+			baseDeviceSize++;
+			romPaddingSize = 0x20000 << baseDeviceSize;
+		}
+	}
 
 	sdmmc_set_ndma_slot(4);
 }

diff --git a/retail/cardengine/arm9/source/card_engine_header.s b/retail/cardengine/arm9/source/card_engine_header.s
@@ -74,6 +74,8 @@ overlaysSize:
 	.word	0x00000000
 ioverlaysSize:
 	.word	0x00000000
+romPaddingSize:
+	.word	0x00000000
 irqTable:
 	.word	0x00000000
 romLocation:

diff --git a/retail/cardengine/arm9/source/cardengine.c b/retail/cardengine/arm9/source/cardengine.c
@@ -702,9 +702,8 @@ void cardRead(u32* cacheStruct, u8* dst0, u32 src0, u32 len0) {
 	u32 len = ((ce9->valueBits & isSdk5) ? len0 : cardStruct[2]);
 
 	// Simulate ROM mirroring
-	const u32 romPaddingSize = 0x20000 << ndsHeader->deviceSize;
-	while (src >= romPaddingSize) {
-		src -= romPaddingSize;
+	while (src >= ce9->romPaddingSize) {
+		src -= ce9->romPaddingSize;
 	}
 
 	if ((ce9->valueBits & cardReadFix) && src < 0x8000) {

diff --git a/retail/cardenginei/arm9/source/cardDma.thumb.c b/retail/cardenginei/arm9/source/cardDma.thumb.c
@@ -416,9 +416,8 @@ void cardSetDma(u32 * params) {
 	u32 len = params[5];
 
 	// Simulate ROM mirroring
-	const u32 romPaddingSize = 0x20000 << ndsHeader->deviceSize;
-	while (src >= romPaddingSize) {
-		src -= romPaddingSize;
+	while (src >= ce9->romPaddingSize) {
+		src -= ce9->romPaddingSize;
 	}
 	params[3] = src;
 
@@ -467,9 +466,8 @@ void cardSetDma(u32 * params) {
 	u32 len = ((ce9->valueBits & isSdk5) ? dmaParams[5] : cardStruct[2]);
 
 	// Simulate ROM mirroring
-	const u32 romPaddingSize = 0x20000 << ndsHeader->deviceSize;
-	while (src >= romPaddingSize) {
-		src -= romPaddingSize;
+	while (src >= ce9->romPaddingSize) {
+		src -= ce9->romPaddingSize;
 	}
 	if (ce9->valueBits & isSdk5) {
 		dmaParams[3] = src;
@@ -675,9 +673,8 @@ void cardSetDma(u32 * params) {
 	#endif
 
 	// Simulate ROM mirroring
-	const u32 romPaddingSize = 0x20000 << ndsHeader->deviceSize;
-	while (src >= romPaddingSize) {
-		src -= romPaddingSize;
+	while (src >= ce9->romPaddingSize) {
+		src -= ce9->romPaddingSize;
 	}
 
 	disableIrqMask(IRQ_CARD);

diff --git a/retail/cardenginei/arm9/source/card_engine_header.s b/retail/cardenginei/arm9/source/card_engine_header.s
@@ -37,6 +37,8 @@ mainScreen:
 	.word	0x00000000
 overlaysSize:
 	.word	0x00000000
+romPaddingSize:
+	.word	0x00000000
 consoleModel:
 	.word	0x00000000
 irqTable:

diff --git a/retail/cardenginei/arm9/source/cardengine.c b/retail/cardenginei/arm9/source/cardengine.c
@@ -645,9 +645,8 @@ void cardRead(u32* cacheStruct, u8* dst0, u32 src0, u32 len0) {
 	#endif
 
 	// Simulate ROM mirroring
-	const u32 romPaddingSize = 0x20000 << ndsHeader->deviceSize;
-	while (src >= romPaddingSize) {
-		src -= romPaddingSize;
+	while (src >= ce9->romPaddingSize) {
+		src -= ce9->romPaddingSize;
 	}
 
 	#ifdef DEBUG

diff --git a/retail/cardenginei/arm9_dsiware/source/card_engine_header.s b/retail/cardenginei/arm9_dsiware/source/card_engine_header.s
@@ -37,6 +37,8 @@ mainScreen:
 	.word	0x00000000
 overlaysSize:
 	.word	0x00000000
+romPaddingSize:
+	.word	0x00000000
 consoleModel:
 	.word	0x00000000
 irqTable:

diff --git a/retail/common/include/cardengine_header_arm9.h b/retail/common/include/cardengine_header_arm9.h
@@ -103,6 +103,7 @@ typedef struct cardengineArm9 {
 	*/
 	s32 mainScreen;
 	u32 overlaysSize;
+	u32 romPaddingSize;
 	u32 consoleModel;
 	u32* irqTable;
 	// Below not used for DSiWare ce9 binary
@@ -221,6 +222,7 @@ typedef struct cardengineArm9 {
 	u16 padding;
 	u32 overlaysSize;
 	u32 ioverlaysSize;
+	u32 romPaddingSize;
 	u32* irqTable;
 	u32 romLocation;
 	u32 rumbleFrames[2];