From 57163d61039d84ea9e87a2d75722eab0a70838ab Mon Sep 17 00:00:00 2001 From: Maschell Date: Thu, 23 Sep 2021 18:30:08 +0200 Subject: [PATCH] Formatting --- src/ElfUtils.cpp | 3 ++- src/ElfUtils.h | 3 ++- src/common/relocation_defines.h | 1 + src/main.cpp | 4 ++-- src/module/ModuleData.cpp | 2 +- src/module/ModuleDataFactory.cpp | 10 ++++++---- src/module/ModuleDataFactory.h | 3 ++- src/module/RelocationData.cpp | 3 ++- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/ElfUtils.cpp b/src/ElfUtils.cpp index 310c8b5..df99d17 100644 --- a/src/ElfUtils.cpp +++ b/src/ElfUtils.cpp @@ -22,7 +22,8 @@ #include "ElfUtils.h" // 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, RelocationType reloc_type) { +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, + RelocationType reloc_type) { if (type == R_PPC_NONE) { return true; } diff --git a/src/ElfUtils.h b/src/ElfUtils.h index 06f57af..15e150f 100644 --- a/src/ElfUtils.h +++ b/src/ElfUtils.h @@ -59,5 +59,6 @@ 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, RelocationType reloc_type); + 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, + RelocationType reloc_type); }; diff --git a/src/common/relocation_defines.h b/src/common/relocation_defines.h index b7661f1..73c1256 100644 --- a/src/common/relocation_defines.h +++ b/src/common/relocation_defines.h @@ -16,6 +16,7 @@ ****************************************************************************/ #pragma once + #include typedef enum RelocationTrampolinStatus{ diff --git a/src/main.cpp b/src/main.cpp index 506d486..9af028f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -181,8 +181,8 @@ int do_start(int argc, char **argv) { } bool doRelocation(const std::vector &relocData, relocation_trampolin_entry_t *tramp_data, uint32_t tramp_length) { - for (auto const &curReloc : relocData) { - const RelocationData& cur = curReloc; + for (auto const &curReloc: relocData) { + const RelocationData &cur = curReloc; std::string functionName = cur.getName(); std::string rplName = cur.getImportRPLInformation().getName(); int32_t isData = cur.getImportRPLInformation().isData(); diff --git a/src/module/ModuleData.cpp b/src/module/ModuleData.cpp index 78bba7a..2888eb6 100644 --- a/src/module/ModuleData.cpp +++ b/src/module/ModuleData.cpp @@ -20,7 +20,7 @@ std::string ModuleData::toString() const { std::string res = StringTools::strfmt("Entrypoint %08X, bss: %08X (%d), bss: %08X (%d)\n", getEntrypoint(), getBSSAddr(), getBSSSize(), getSBSSAddr(), getSBSSSize()); - for (auto const &reloc : relocation_data_list) { + for (auto const &reloc: relocation_data_list) { res += reloc.toString(); } return res; diff --git a/src/module/ModuleDataFactory.cpp b/src/module/ModuleDataFactory.cpp index d890d5d..1f17337 100644 --- a/src/module/ModuleDataFactory.cpp +++ b/src/module/ModuleDataFactory.cpp @@ -25,7 +25,8 @@ using namespace ELFIO; -std::optional ModuleDataFactory::load(const std::string &path, uint32_t destination_address, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length) { +std::optional +ModuleDataFactory::load(const std::string &path, uint32_t destination_address, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length) { elfio reader; ModuleData moduleData; @@ -37,7 +38,7 @@ std::optional ModuleDataFactory::load(const std::string &path, uint3 uint32_t sec_num = reader.sections.size(); - auto **destinations = (uint8_t **) malloc(sizeof(uint8_t *) * sec_num); + auto **destinations = (uint8_t **) malloc(sizeof(uint8_t * ) * sec_num); uint32_t sizeOfModule = 0; for (uint32_t i = 0; i < sec_num; ++i) { @@ -133,7 +134,7 @@ std::optional ModuleDataFactory::load(const std::string &path, uint3 } std::vector relocationData = getImportRelocationData(reader, destinations); - for (auto const &reloc : relocationData) { + for (auto const &reloc: relocationData) { moduleData.addRelocationData(reloc); } @@ -202,7 +203,8 @@ std::vector ModuleDataFactory::getImportRelocationData(const elf return result; } -bool ModuleDataFactory::linkSection(const 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(const 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) { uint32_t sec_num = reader.sections.size(); for (uint32_t i = 0; i < sec_num; ++i) { diff --git a/src/module/ModuleDataFactory.h b/src/module/ModuleDataFactory.h index 4d758ba..ec74202 100644 --- a/src/module/ModuleDataFactory.h +++ b/src/module/ModuleDataFactory.h @@ -28,7 +28,8 @@ class ModuleDataFactory { public: static std::optional load(const std::string &path, uint32_t destination_address, uint32_t maximum_size, relocation_trampolin_entry_t *trampolin_data, uint32_t trampolin_data_length); - static bool linkSection(const 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(const 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 std::vector getImportRelocationData(const ELFIO::elfio &reader, uint8_t **destinations); }; diff --git a/src/module/RelocationData.cpp b/src/module/RelocationData.cpp index be713fb..c29103b 100644 --- a/src/module/RelocationData.cpp +++ b/src/module/RelocationData.cpp @@ -19,5 +19,6 @@ #include "utils/StringTools.h" std::string RelocationData::toString() const { - return StringTools::strfmt("%s destination: %08X offset: %08X type: %02X addend: %d rplName: %s isData: %d \n", name.c_str(), destination, offset, type, addend, rplInfo.getName().c_str(), rplInfo.isData()); + return StringTools::strfmt("%s destination: %08X offset: %08X type: %02X addend: %d rplName: %s isData: %d \n", name.c_str(), destination, offset, type, addend, rplInfo.getName().c_str(), + rplInfo.isData()); }