From 70eebb31b0912afc4ada93805d2288eb52bb119e Mon Sep 17 00:00:00 2001 From: Maschell Date: Fri, 13 May 2022 16:14:46 +0200 Subject: [PATCH] Fix typo, trampolin -> trampoline --- source/ElfUtils.cpp | 32 ++++++++++++++--------------- source/ElfUtils.h | 4 ++-- source/common/module_defines.h | 2 +- source/common/relocation_defines.h | 12 +++++------ source/module/ModuleDataFactory.cpp | 10 ++++----- source/module/ModuleDataFactory.h | 6 +++--- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/source/ElfUtils.cpp b/source/ElfUtils.cpp index 83fbd0c..0fa8ac2 100644 --- a/source/ElfUtils.cpp +++ b/source/ElfUtils.cpp @@ -8,7 +8,7 @@ #include "ElfUtils.h" #include "elfio/elfio.hpp" -bool ElfUtils::doRelocation(std::vector> &relocData, relocation_trampolin_entry_t *tramp_data, uint32_t tramp_length) { +bool ElfUtils::doRelocation(std::vector> &relocData, relocation_trampoline_entry_t *tramp_data, uint32_t tramp_length) { for (auto const &curReloc : relocData) { std::string functionName = curReloc->getName(); std::string rplName = curReloc->getImportRPLInformation()->getName(); @@ -35,13 +35,13 @@ bool ElfUtils::doRelocation(std::vector> &relocD } } - DCFlushRange(tramp_data, tramp_length * sizeof(relocation_trampolin_entry_t)); - ICInvalidateRange(tramp_data, tramp_length * sizeof(relocation_trampolin_entry_t)); + DCFlushRange(tramp_data, tramp_length * sizeof(relocation_trampoline_entry_t)); + ICInvalidateRange(tramp_data, tramp_length * sizeof(relocation_trampoline_entry_t)); return true; } // See https://github.com/decaf-emu/decaf-emu/blob/43366a34e7b55ab9d19b2444aeb0ccd46ac77dea/src/libdecaf/src/cafe/loader/cafe_loader_reloc.cpp#L144 -bool ElfUtils::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 ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampoline_entry_t *trampolin_data, uint32_t trampolin_data_length, RelocationType reloc_type) { if (type == R_PPC_NONE) { return true; @@ -112,11 +112,11 @@ bool ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t des auto distance = static_cast(value) - static_cast(target); if (distance > 0x1FFFFFC || distance < -0x1FFFFFC) { if (trampolin_data == nullptr) { - DEBUG_FUNCTION_LINE_ERR("***24-bit relative branch cannot hit target. Trampolin isn't provided\n"); + DEBUG_FUNCTION_LINE_ERR("***24-bit relative branch cannot hit target. Trampoline isn't provided\n"); DEBUG_FUNCTION_LINE_ERR("***value %08X - target %08X = distance %08X\n", value, target, distance); return false; } else { - relocation_trampolin_entry_t *freeSlot = nullptr; + relocation_trampoline_entry_t *freeSlot = nullptr; for (uint32_t i = 0; i < trampolin_data_length; i++) { // We want to override "old" relocations of imports // Pending relocations have the status RELOC_TRAMP_IMPORT_IN_PROGRESS. @@ -131,22 +131,22 @@ bool ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t des } } if (freeSlot == nullptr) { - DEBUG_FUNCTION_LINE_ERR("***24-bit relative branch cannot hit target. Trampolin data list is full\n"); - DEBUG_FUNCTION_LINE_ERR("***value %08X - target %08X = distance %08X\n", value, target, (target - (uint32_t) & (freeSlot->trampolin[0]))); + DEBUG_FUNCTION_LINE_ERR("***24-bit relative branch cannot hit target. Trampoline data list is full\n"); + DEBUG_FUNCTION_LINE_ERR("***value %08X - target %08X = distance %08X\n", value, target, (target - (uint32_t) & (freeSlot->trampoline[0]))); return false; } if (target - (uint32_t) & (freeSlot->trampoline[0]) > 0x1FFFFFC) { DEBUG_FUNCTION_LINE_ERR("**Cannot link 24-bit jump (too far to tramp buffer)."); - DEBUG_FUNCTION_LINE_ERR("***value %08X - target %08X = distance %08X\n", value, target, (target - (uint32_t) & (freeSlot->trampolin[0]))); + DEBUG_FUNCTION_LINE_ERR("***value %08X - target %08X = distance %08X\n", value, target, (target - (uint32_t) & (freeSlot->trampoline[0]))); 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; @@ -154,7 +154,7 @@ bool ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t des // Relocations for the imports may be overridden freeSlot->status = RELOC_TRAMP_IMPORT_DONE; } - auto symbolValue = (uint32_t) & (freeSlot->trampolin[0]); + auto symbolValue = (uint32_t) & (freeSlot->trampoline[0]); value = symbolValue + addend; distance = static_cast(value) - static_cast(target); } diff --git a/source/ElfUtils.h b/source/ElfUtils.h index 619f4dc..1b616d2 100644 --- a/source/ElfUtils.h +++ b/source/ElfUtils.h @@ -46,9 +46,9 @@ extern "C" { class ElfUtils { public: - static 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, + static bool elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampoline_entry_t *trampolin_data, uint32_t trampolin_data_length, RelocationType reloc_type); - static bool doRelocation(std::vector> &relocData, relocation_trampolin_entry_t *tramp_data, uint32_t tramp_length); + static bool doRelocation(std::vector> &relocData, relocation_trampoline_entry_t *tramp_data, uint32_t tramp_length); }; diff --git a/source/common/module_defines.h b/source/common/module_defines.h index e7b684e..f214b8f 100644 --- a/source/common/module_defines.h +++ b/source/common/module_defines.h @@ -27,7 +27,7 @@ extern "C" { #endif struct module_information_t { - relocation_trampolin_entry_t trampolines[DYN_LINK_TRAMPOLIN_LIST_LENGTH]; + relocation_trampoline_entry_t trampolines[DYN_LINK_TRAMPOLIN_LIST_LENGTH]; }; #ifdef __cplusplus diff --git a/source/common/relocation_defines.h b/source/common/relocation_defines.h index c0b8159..bd38689 100644 --- a/source/common/relocation_defines.h +++ b/source/common/relocation_defines.h @@ -19,19 +19,19 @@ #include -typedef enum RelocationTrampolinStatus { +typedef enum RelocationTrampolineStatus { RELOC_TRAMP_FREE = 0, RELOC_TRAMP_FIXED = 1, RELOC_TRAMP_IMPORT_IN_PROGRESS = 2, RELOC_TRAMP_IMPORT_DONE = 3, -} RelocationTrampolinStatus; +} RelocationTrampolineStatus; typedef enum RelocationType { RELOC_TYPE_FIXED = 0, RELOC_TYPE_IMPORT = 1 } RelocationType; -typedef struct relocation_trampolin_entry_t { - uint32_t trampolin[4]; - RelocationTrampolinStatus status; -} relocation_trampolin_entry_t; \ No newline at end of file +typedef struct relocation_trampoline_entry_t { + uint32_t trampoline[4]; + RelocationTrampolineStatus status; +} relocation_trampoline_entry_t; \ No newline at end of file diff --git a/source/module/ModuleDataFactory.cpp b/source/module/ModuleDataFactory.cpp index 27286b9..3cc6d06 100644 --- a/source/module/ModuleDataFactory.cpp +++ b/source/module/ModuleDataFactory.cpp @@ -26,7 +26,7 @@ using namespace ELFIO; std::optional> -ModuleDataFactory::load(const std::string &path, uint32_t destination_address_end, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length) { +ModuleDataFactory::load(const std::string &path, uint32_t destination_address_end, uint32_t maximum_size, relocation_trampoline_entry_t *trampoline_data, uint32_t trampoline_data_length) { elfio reader; std::shared_ptr moduleData = std::make_shared(); @@ -149,7 +149,7 @@ ModuleDataFactory::load(const std::string &path, uint32_t destination_address_en section *psec = reader.sections[i]; if ((psec->get_type() == SHT_PROGBITS || psec->get_type() == SHT_NOBITS) && (psec->get_flags() & SHF_ALLOC)) { DEBUG_FUNCTION_LINE("Linking (%d)... %s", i, psec->get_name().c_str()); - if (!linkSection(reader, psec->get_index(), (uint32_t) destinations[psec->get_index()], offset_text, offset_data, trampolin_data, trampolin_data_length)) { + if (!linkSection(reader, psec->get_index(), (uint32_t) destinations[psec->get_index()], offset_text, offset_data, trampoline_data, trampoline_data_length)) { DEBUG_FUNCTION_LINE_ERR("elfLink failed"); free(destinations); free(buffer); @@ -230,8 +230,8 @@ std::vector> ModuleDataFactory::getImportRelocat return result; } -bool ModuleDataFactory::linkSection(elfio &reader, uint32_t section_index, uint32_t destination, uint32_t base_text, uint32_t base_data, relocation_trampolin_entry_t *trampolin_data, - uint32_t trampolin_data_length) { +bool ModuleDataFactory::linkSection(elfio &reader, uint32_t section_index, uint32_t destination, uint32_t base_text, uint32_t base_data, relocation_trampoline_entry_t *trampoline_data, + uint32_t trampoline_data_length) { uint32_t sec_num = reader.sections.size(); for (uint32_t i = 0; i < sec_num; ++i) { @@ -276,7 +276,7 @@ bool ModuleDataFactory::linkSection(elfio &reader, uint32_t section_index, uint3 return false; } - if (!ElfUtils::elfLinkOne(type, offset, addend, destination, adjusted_sym_value, trampolin_data, trampolin_data_length, RELOC_TYPE_FIXED)) { + if (!ElfUtils::elfLinkOne(type, offset, addend, destination, adjusted_sym_value, trampoline_data, trampoline_data_length, RELOC_TYPE_FIXED)) { DEBUG_FUNCTION_LINE_ERR("Link failed"); return false; } diff --git a/source/module/ModuleDataFactory.h b/source/module/ModuleDataFactory.h index f012199..f636c57 100644 --- a/source/module/ModuleDataFactory.h +++ b/source/module/ModuleDataFactory.h @@ -27,10 +27,10 @@ class ModuleDataFactory { public: static std::optional> - load(const std::string &path, uint32_t destination_address_end, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length); + load(const std::string &path, uint32_t destination_address_end, uint32_t maximum_size, relocation_trampoline_entry_t *trampoline_data, uint32_t trampoline_data_length); - static bool linkSection(ELFIO::elfio &reader, uint32_t section_index, uint32_t destination, uint32_t base_text, uint32_t base_data, relocation_trampolin_entry_t *trampolin_data, - uint32_t trampolin_data_length); + static bool linkSection(ELFIO::elfio &reader, uint32_t section_index, uint32_t destination, uint32_t base_text, uint32_t base_data, relocation_trampoline_entry_t *trampoline_data, + uint32_t trampoline_data_length); static std::vector> getImportRelocationData(ELFIO::elfio &reader, uint8_t **destinations); };