Support Kamekfile v3 (WriteRange command) in loader

Author: RoadrunnerWMC

loader/kamekLoader.cpp

@@ -1,6 +1,6 @@
 #include "kamekLoader.h"
 
-#define KM_FILE_VERSION 2
+#define KM_FILE_VERSION 3
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
 
@@ -28,6 +28,7 @@ struct KBHeader {
 #define kCondWrite32 36
 #define kCondWrite16 37
 #define kCondWrite8 38
+#define kWriteRange 39
 #define kBranch 64
 #define kBranchLink 65
 
@@ -48,9 +49,9 @@ static inline u32 resolveAddress(u32 text, u32 address) {
 
 
 #define kCommandHandler(name) \
-	static inline const u8 *kHandle##name(const u8 *input, u32 text, u32 address)
+	static inline const u8 *kHandle##name(const u8 *input, u32 text, u32 address, const loaderFunctions *funcs)
 #define kDispatchCommand(name) \
-	case k##name: input = kHandle##name(input, text, address); break
+	case k##name: input = kHandle##name(input, text, address, funcs); break
 
 kCommandHandler(Addr32) {
 	u32 target = resolveAddress(text, *(const u32 *)input);
@@ -124,13 +125,22 @@ kCommandHandler(CondWrite8) {
 		*(u8 *)address = value & 0xFF;
 	return input + 8;
 }
+kCommandHandler(WriteRange) {
+	u32 size = *(const u32 *)input;
+	// skip 1, 2, or 3 bytes to align to 4
+	u32 startOfBuffer = (u32)input + 4 + (address & 3);
+	funcs->memcpy((void *)address, (const void *)(startOfBuffer), (size_t)size);
+	u32 endOfBuffer = startOfBuffer + size;
+	// skip 1, 2, or 3 bytes to align to 4
+	return (const u8 *)((endOfBuffer + 3) & ~3);
+}
 kCommandHandler(Branch) {
 	*(u32 *)address = 0x48000000;
-	return kHandleRel24(input, text, address);
+	return kHandleRel24(input, text, address, funcs);
 }
 kCommandHandler(BranchLink) {
 	*(u32 *)address = 0x48000001;
-	return kHandleRel24(input, text, address);
+	return kHandleRel24(input, text, address, funcs);
 }
 
 
@@ -207,6 +217,7 @@ void loadKamekBinary(const loaderFunctions *funcs, const void *binary, u32 binar
 			kDispatchCommand(CondWrite32);
 			kDispatchCommand(CondWrite16);
 			kDispatchCommand(CondWrite8);
+			kDispatchCommand(WriteRange);
 			kDispatchCommand(Branch);
 			kDispatchCommand(BranchLink);
 			default:

loader/kamekLoader.h

@@ -17,6 +17,7 @@ typedef bool (*DVDFastOpen_t) (int entrynum, DVDHandle *handle);
 typedef int (*DVDReadPrio_t) (DVDHandle *handle, void *buffer, int length, int offset, int unk);
 typedef bool (*DVDClose_t) (DVDHandle *handle);
 typedef int (*sprintf_t) (char *str, const char *format, ...);
+typedef void *(*memcpy_t) (void *dest, const void *src, size_t count);
 typedef void *(*KamekAlloc_t) (u32 size, bool isForCode, const loaderFunctions *funcs);
 typedef void (*KamekFree_t) (void *buffer, bool isForCode, const loaderFunctions *funcs);
 
@@ -29,6 +30,7 @@ struct loaderFunctions {
 	DVDReadPrio_t DVDReadPrio;
 	DVDClose_t DVDClose;
 	sprintf_t sprintf;
+	memcpy_t memcpy;
 	KamekAlloc_t kamekAlloc;
 	KamekFree_t kamekFree;
 };

loader/nsmbw.cpp

@@ -7,14 +7,12 @@
 
 typedef void *(*EGG_Heap_alloc_t) (u32 size, s32 align, void *heap);
 typedef void (*EGG_Heap_free_t) (void *buffer, void *heap);
-typedef void *(*memcpy_t) (void *dest, const void *src, size_t count);
 typedef void (*flush_cache_t) (void *buffer, size_t size);
 
 struct loaderFunctionsEx {
 	loaderFunctions base;
 	EGG_Heap_alloc_t EGG_Heap_alloc;
 	EGG_Heap_free_t EGG_Heap_free;
-	memcpy_t memcpy;
 	flush_cache_t __flush_cache;
 	void **mHeap_g_gameHeaps;
 	void **mHeap_g_archiveHeap;
@@ -50,11 +48,11 @@ const loaderFunctionsEx functions_p = {
 	(DVDReadPrio_t) 0x801CAC60,
 	(DVDClose_t) 0x801CAB40,
 	(sprintf_t) 0x802E1ACC,
+	(memcpy_t) 0x80004364,
 	allocAdapter,
 	freeAdapter},
 	(EGG_Heap_alloc_t) 0x802B8E00,
 	(EGG_Heap_free_t) 0x802B90B0,
-	(memcpy_t) 0x80004364,
 	(flush_cache_t) 0x80004330,
 	(void **) 0x80377F48,
 	(void **) 0x8042A72C,
@@ -69,11 +67,11 @@ const loaderFunctionsEx functions_e = {
 	(DVDReadPrio_t) 0x801CAB20,
 	(DVDClose_t) 0x801CAA00,
 	(sprintf_t) 0x802E17DC,
+	(memcpy_t) 0x80004364,
 	allocAdapter,
 	freeAdapter},
 	(EGG_Heap_alloc_t) 0x802B8CC0,
 	(EGG_Heap_free_t) 0x802B8F70,
-	(memcpy_t) 0x80004364,
 	(flush_cache_t) 0x80004330,
 	(void **) 0x80377C48,
 	(void **) 0x8042A44C,
@@ -89,11 +87,11 @@ const loaderFunctionsEx functions_j = {
 	(DVDReadPrio_t) 0x801CA930,
 	(DVDClose_t) 0x801CA810,
 	(sprintf_t) 0x802E15EC,
+	(memcpy_t) 0x80004364,
 	allocAdapter,
 	freeAdapter},
 	(EGG_Heap_alloc_t) 0x802B8AD0,
 	(EGG_Heap_free_t) 0x802B8D80,
-	(memcpy_t) 0x80004364,
 	(flush_cache_t) 0x80004330,
 	(void **) 0x803779C8,
 	(void **) 0x8042A16C,
@@ -108,11 +106,11 @@ const loaderFunctionsEx functions_k = {
 	(DVDReadPrio_t) 0x801CB060,
 	(DVDClose_t) 0x801CAF40,
 	(sprintf_t) 0x802E1D1C,
+	(memcpy_t) 0x80004364,
 	allocAdapter,
 	freeAdapter},
 	(EGG_Heap_alloc_t) 0x802B9200,
 	(EGG_Heap_free_t) 0x802B94B0,
-	(memcpy_t) 0x80004364,
 	(flush_cache_t) 0x80004330,
 	(void **) 0x80384948,
 	(void **) 0x804370EC,
@@ -127,11 +125,11 @@ const loaderFunctionsEx functions_w = {
 	(DVDReadPrio_t) 0x801CB060,
 	(DVDClose_t) 0x801CAF40,
 	(sprintf_t) 0x802E1D1C,
+	(memcpy_t) 0x80004364,
 	allocAdapter,
 	freeAdapter},
 	(EGG_Heap_alloc_t) 0x802B9200,
 	(EGG_Heap_free_t) 0x802B94B0,
-	(memcpy_t) 0x80004364,
 	(flush_cache_t) 0x80004330,
 	(void **) 0x80382D48,
 	(void **) 0x804354EC,
@@ -147,11 +145,11 @@ const loaderFunctionsEx functions_c = {
 	(DVDReadPrio_t) 0x801CCE80,
 	(DVDClose_t) 0x801CCD60,
 	(sprintf_t) 0x802E4DF8,
+	(memcpy_t) 0x80004364,
 	allocAdapter,
 	freeAdapter},
 	(EGG_Heap_alloc_t) 0x802BB360,
 	(EGG_Heap_free_t) 0x802BB610,
-	(memcpy_t) 0x80004364,
 	(flush_cache_t) 0x80004330,
 	(void **) 0x8037D4C8,
 	(void **) 0x8042FCCC,
@@ -254,7 +252,7 @@ void loadIntoNSMBW() {
 
 	// modify myBackGround_PhaseMethod to load rels earlier & load the kamek binary
 	u32 temp[20];
-	sFuncs->memcpy(&temp, sFuncs->myBackGround_PhaseMethod, 0x50);
+	sFuncs->base.memcpy(&temp, sFuncs->myBackGround_PhaseMethod, 0x50);
 
 	// set rel loading functions as the first entries in the table
 	sFuncs->myBackGround_PhaseMethod[0] = temp[15];
@@ -265,7 +263,7 @@ void loadIntoNSMBW() {
 	sFuncs->myBackGround_PhaseMethod[3] = (u32)&loadBinary;
 
 	// set all the other functions
-	sFuncs->memcpy(&sFuncs->myBackGround_PhaseMethod[4], &temp, 0x3C);
+	sFuncs->base.memcpy(&sFuncs->myBackGround_PhaseMethod[4], &temp, 0x3C);
 	sFuncs->myBackGround_PhaseMethod[19] = temp[18];
 	sFuncs->myBackGround_PhaseMethod[20] = temp[19];