From 1bd36b9ba10d5d6f6467c481f7633be0bdf68ff8 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 30 Jan 2022 13:44:24 +0100 Subject: [PATCH] Use latest WUMS version, fix spelling of trampoline --- Dockerfile | 2 +- source/main.cpp | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc66eea..1b17201 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM wiiuenv/devkitppc:20211229 COPY --from=wiiuenv/libmappedmemory:20210924 /artifacts $DEVKITPRO -COPY --from=wiiuenv/wiiumodulesystem:20220123 /artifacts $DEVKITPRO +COPY --from=wiiuenv/wiiumodulesystem:20220127 /artifacts $DEVKITPRO WORKDIR project \ No newline at end of file diff --git a/source/main.cpp b/source/main.cpp index 36472cf..b2a9a55 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -10,7 +10,7 @@ WUMS_MODULE_EXPORT_NAME("homebrew_patchmemoryrelocations"); WUMS_MODULE_INIT_BEFORE_RELOCATION_DONE_HOOK(); WUMS_MODULE_SKIP_INIT_FINI(); -bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length, +bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampoline_entry_t *trampoline_data, uint32_t trampoline_data_length, RelocationType reloc_type); WUMS_RELOCATIONS_DONE(args) { @@ -71,7 +71,7 @@ WUMS_RELOCATIONS_DONE(args) { #define R_PPC_GHS_REL16_LO 253 // See https://github.com/decaf-emu/decaf-emu/blob/43366a34e7b55ab9d19b2444aeb0ccd46ac77dea/src/libdecaf/src/cafe/loader/cafe_loader_reloc.cpp#L144 -bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length, +bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampoline_entry_t *trampoline_data, uint32_t trampoline_data_length, RelocationType reloc_type) { if (type == R_PPC_NONE) { return true; @@ -140,42 +140,42 @@ bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, // } auto distance = static_cast(value) - static_cast(target); if (distance > 0x1FFFFFC || distance < -0x1FFFFFC) { - if (trampolin_data == nullptr) { + if (trampoline_data == nullptr) { DEBUG_FUNCTION_LINE("***24-bit relative branch cannot hit target. Trampoline isn't provided\n"); DEBUG_FUNCTION_LINE("***value %08X - target %08X = distance %08X\n", value, target, distance); return false; } else { - relocation_trampolin_entry_t *freeSlot = nullptr; - for (uint32_t i = 0; i < trampolin_data_length; i++) { + relocation_trampoline_entry_t *freeSlot = nullptr; + for (uint32_t i = 0; i < trampoline_data_length; i++) { // We want to override "old" relocations of imports // Pending relocations have the status RELOC_TRAMP_IMPORT_IN_PROGRESS. // When all relocations are done successfully, they will be turned into RELOC_TRAMP_IMPORT_DONE // so they can be overridden/updated/reused on the next application launch. // // Relocations that won't change will have the status RELOC_TRAMP_FIXED and are set to free when the module is unloaded. - if (trampolin_data[i].status == RELOC_TRAMP_FREE || - trampolin_data[i].status == RELOC_TRAMP_IMPORT_DONE) { - freeSlot = &(trampolin_data[i]); + if (trampoline_data[i].status == RELOC_TRAMP_FREE || + trampoline_data[i].status == RELOC_TRAMP_IMPORT_DONE) { + freeSlot = &(trampoline_data[i]); break; } } if (freeSlot == nullptr) { - DEBUG_FUNCTION_LINE("***24-bit relative branch cannot hit target. Trampolin data list is full\n"); + DEBUG_FUNCTION_LINE("***24-bit relative branch cannot hit target. Trampoline data list is full\n"); DEBUG_FUNCTION_LINE("***value %08X - target %08X = distance %08X\n", value, target, distance); return false; } - if (target - (uint32_t) &(freeSlot->trampolin[0]) > 0x1FFFFFC) { + if (target - (uint32_t) &(freeSlot->trampoline[0]) > 0x1FFFFFC) { DEBUG_FUNCTION_LINE("**Cannot link 24-bit jump (too far to tramp buffer)."); DEBUG_FUNCTION_LINE("***value %08X - target %08X = distance %08X\n", value, target, distance); return false; } - freeSlot->trampolin[0] = 0x3D600000 | ((((uint32_t) value) >> 16) & 0x0000FFFF); // lis r11, real_addr@h - freeSlot->trampolin[1] = 0x616B0000 | (((uint32_t) value) & 0x0000ffff); // ori r11, r11, real_addr@l - freeSlot->trampolin[2] = 0x7D6903A6; // mtctr r11 - freeSlot->trampolin[3] = 0x4E800420; // bctr - DCFlushRange((void *) freeSlot->trampolin, sizeof(freeSlot->trampolin)); - ICInvalidateRange((unsigned char *) freeSlot->trampolin, sizeof(freeSlot->trampolin)); + freeSlot->trampoline[0] = 0x3D600000 | ((((uint32_t) value) >> 16) & 0x0000FFFF); // lis r11, real_addr@h + freeSlot->trampoline[1] = 0x616B0000 | (((uint32_t) value) & 0x0000ffff); // ori r11, r11, real_addr@l + freeSlot->trampoline[2] = 0x7D6903A6; // mtctr r11 + freeSlot->trampoline[3] = 0x4E800420; // bctr + DCFlushRange((void *) freeSlot->trampoline, sizeof(freeSlot->trampoline)); + ICInvalidateRange((unsigned char *) freeSlot->trampoline, sizeof(freeSlot->trampoline)); if (reloc_type == RELOC_TYPE_FIXED) { freeSlot->status = RELOC_TRAMP_FIXED; @@ -183,7 +183,7 @@ bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, // Relocations for the imports may be overridden freeSlot->status = RELOC_TRAMP_IMPORT_IN_PROGRESS; } - uint32_t symbolValue = (uint32_t) &(freeSlot->trampolin[0]); + uint32_t symbolValue = (uint32_t) &(freeSlot->trampoline[0]); value = symbolValue + addend; distance = static_cast(value) - static_cast(target); DEBUG_FUNCTION_LINE("Created tramp\n");