Formatting

relocator/src/DynamicLinkingHelper.cpp

@@ -65,10 +65,12 @@ dyn_linking_import_t * DynamicLinkingHelper::getOrAddImport(dyn_linking_relocati
 }
 
 bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, const RelocationData &relocationData) {
-    return addReloationEntry(linking_data, linking_entries, linking_entry_length, relocationData.getType(), relocationData.getOffset(), relocationData.getAddend(), relocationData.getDestination(), relocationData.getName(), relocationData.getImportRPLInformation());
+    return addReloationEntry(linking_data, linking_entries, linking_entry_length, relocationData.getType(), relocationData.getOffset(), relocationData.getAddend(), relocationData.getDestination(), relocationData.getName(),
+                             relocationData.getImportRPLInformation());
 }
 
-bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t * linking_data, dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, std::string name, const ImportRPLInformation& rplInfo) {
+bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination,
+                                             std::string name, const ImportRPLInformation &rplInfo) {
     dyn_linking_import_t *importInfoGbl = DynamicLinkingHelper::getOrAddImport(linking_data, rplInfo.getName().c_str(), rplInfo.isData());
     if (importInfoGbl == NULL) {
         DEBUG_FUNCTION_LINE("Getting import info failed. Probably maximum of %d rpl files to import reached.\n", DYN_LINK_IMPORT_LIST_LENGTH);
@@ -84,7 +86,8 @@ bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t * lin
     return addReloationEntry(linking_entries, linking_entry_length, type, offset, addend, destination, functionInfo, importInfoGbl);
 }
 
-bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t * functionName, dyn_linking_import_t * importInfo) {
+bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t *functionName,
+                                             dyn_linking_import_t *importInfo) {
     for (uint32_t i = 0; i < linking_entry_length; i++) {
         dyn_linking_relocation_entry_t *curEntry = &(linking_entries[i]);
         if (curEntry->functionEntry != NULL) {

relocator/src/DynamicLinkingHelper.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "../../source/common/dynamic_linking_defines.h"
 #include "utils/logger.h"
 #include <string>
@@ -48,9 +49,12 @@ public:
 
     static bool addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, const RelocationData &relocationData);
 
-    static bool addReloationEntry(dyn_linking_relocation_data_t * linking_data, dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, std::string name, const ImportRPLInformation& rplInfo);
+    static bool addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, std::string name,
+                                  const ImportRPLInformation &rplInfo);
+
+    static bool
+    addReloationEntry(dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t *functionName, dyn_linking_import_t *importInfo);
 
-    static bool addReloationEntry(dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t * functionName, dyn_linking_import_t * importInfo);
 private:
     DynamicLinkingHelper() {
     }

relocator/src/ModuleDataPersistence.h

@@ -6,5 +6,6 @@
 class ModuleDataPersistence {
 public:
     static bool saveModuleData(module_information_t *moduleInformation, const ModuleData &module);
+
     static std::vector<ModuleData> loadModuleData(module_information_t *moduleInformation);
 };

relocator/src/entry.cpp

@@ -66,6 +66,7 @@ bool doRelocation(std::vector<RelocationData> &relocData, relocation_trampolin_e
     ICInvalidateRange(tramp_data, tramp_length * sizeof(relocation_trampolin_entry_t));
     return true;
 }
+
 bool ResolveRelocations() {
     std::vector<ModuleData> loadedModules = ModuleDataPersistence::loadModuleData(gModuleData);
     bool wasSuccessful = true;

relocator/src/utils/dynamic.c

@@ -4,6 +4,7 @@
 #define IMPORT(name) void* addr_##name
 #define IMPORT_BEGIN(lib)
 #define IMPORT_END()
+
 #include "imports.h"
 
 #undef IMPORT

relocator/src/utils/logger.h

@@ -8,9 +8,12 @@ extern "C" {
 #include <string.h>
 
 void log_init_();
+
 //void log_deinit_(void);
 void log_print_(const char *str);
+
 void log_printf_(const char *format, ...);
+
 void OSFatal_printf(const char *format, ...);
 
 #define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
@@ -21,7 +24,6 @@ void OSFatal_printf(const char *format, ...);
     } while (0)
 
 
-
 #define log_init() log_init_()
 //#define log_deinit() log_deinit_()
 #define log_print(str) log_print_(str)

relocator/src/utils/memory.h

@@ -24,15 +24,19 @@ extern "C" {
 #include <malloc.h>
 
 void memoryInitialize(void);
+
 void memoryRelease(void);
 
 void *MEM2_alloc(u32 size, u32 align);
+
 void MEM2_free(void *ptr);
 
 void *MEM1_alloc(u32 size, u32 align);
+
 void MEM1_free(void *ptr);
 
 void *MEMBucket_alloc(u32 size, u32 align);
+
 void MEMBucket_free(void *ptr);
 
 #ifdef __cplusplus

source/fs/CFile.hpp

@@ -18,11 +18,15 @@ public:
     };
 
     CFile();
+
     CFile(const std::string &filepath, eOpenTypes mode);
+
     CFile(const uint8_t *memory, int32_t memsize);
+
     virtual ~CFile();
 
     int32_t open(const std::string &filepath, eOpenTypes mode);
+
     int32_t open(const uint8_t *memory, int32_t memsize);
 
     BOOL isOpen() const {
@@ -38,15 +42,21 @@ public:
     void close();
 
     int32_t read(uint8_t *ptr, size_t size);
+
     int32_t write(const uint8_t *ptr, size_t size);
+
     int32_t fwrite(const char *format, ...);
+
     int32_t seek(long int offset, int32_t origin);
+
     uint64_t tell() {
         return pos;
     };
+
     uint64_t size() {
         return filesize;
     };
+
     void rewind() {
         this->seek(0, SEEK_SET);
     };

source/fs/DirList.h

@@ -40,17 +40,22 @@ class DirList {
 public:
     //!Constructor
     DirList(void);
+
     //!\param path Path from where to load the filelist of all files
     //!\param filter A fileext that needs to be filtered
     //!\param flags search/filter flags from the enum
     DirList(const std::string &path, const char *filter = NULL, uint32_t flags = Files | Dirs, uint32_t maxDepth = 0xffffffff);
+
     //!Destructor
     virtual ~DirList();
+
     //! Load all the files from a directory
     BOOL LoadPath(const std::string &path, const char *filter = NULL, uint32_t flags = Files | Dirs, uint32_t maxDepth = 0xffffffff);
+
     //! Get a filename of the list
     //!\param list index
     const char *GetFilename(int32_t index) const;
+
     //! Get the a filepath of the list
     //!\param list index
     const char *GetFilepath(int32_t index) const {
@@ -59,9 +64,11 @@ public:
         else
             return FileInfo[index].FilePath;
     }
+
     //! Get the a filesize of the list
     //!\param list index
     uint64_t GetFilesize(int32_t index) const;
+
     //! Is index a dir or a file
     //!\param list index
     BOOL IsDir(int32_t index) const {
@@ -69,16 +76,21 @@ public:
             return false;
         return FileInfo[index].isDir;
     };
+
     //! Get the filecount of the whole list
     int32_t GetFilecount() const {
         return FileInfo.size();
     };
+
     //! Sort list by filepath
     void SortList();
+
     //! Custom sort command for custom sort functions definitions
     void SortList(BOOL (*SortFunc)(const DirEntry &a, const DirEntry &b));
+
     //! Get the index of the specified filename
     int32_t GetFileIndex(const char *filename) const;
+
     //! Enum for search/filter flags
     enum {
         Files = 0x01,
@@ -88,10 +100,13 @@ public:
 protected:
     // Internal parser
     BOOL InternalLoadPath(std::string &path);
+
     //!Add a list entrie
     void AddEntrie(const std::string &filepath, const char *filename, BOOL isDir);
+
     //! Clear the list
     void ClearList();
+
     //! Check if valid pos is requested
     inline BOOL valid(uint32_t pos) const {
         return (pos < FileInfo.size());

source/kernel.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <stdint.h>
 
 #define ADDRESS_main_entry_hook                         0x0101C56C
@@ -10,5 +11,7 @@
 #define KERN_SYSCALL_TBL_5          0xFFEAAE60 // works with browser (previously KERN_SYSCALL_TBL)
 
 void SetupRelocator();
+
 void KernelWriteU32(uint32_t addr, uint32_t value);
+
 void __attribute__ ((noinline)) kern_write(void *addr, uint32_t value);

source/module/DynamicLinkingHelper.cpp

@@ -66,10 +66,12 @@ dyn_linking_import_t * DynamicLinkingHelper::getOrAddImport(dyn_linking_relocati
 }
 
 bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, const RelocationData &relocationData) {
-    return addReloationEntry(linking_data, linking_entries, linking_entry_length, relocationData.getType(), relocationData.getOffset(), relocationData.getAddend(), relocationData.getDestination(), relocationData.getName(), relocationData.getImportRPLInformation());
+    return addReloationEntry(linking_data, linking_entries, linking_entry_length, relocationData.getType(), relocationData.getOffset(), relocationData.getAddend(), relocationData.getDestination(), relocationData.getName(),
+                             relocationData.getImportRPLInformation());
 }
 
-bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t * linking_data, dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, std::string name, const ImportRPLInformation& rplInfo) {
+bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination,
+                                             std::string name, const ImportRPLInformation &rplInfo) {
     dyn_linking_import_t *importInfoGbl = DynamicLinkingHelper::getOrAddImport(linking_data, rplInfo.getName().c_str(), rplInfo.isData());
     if (importInfoGbl == NULL) {
         DEBUG_FUNCTION_LINE("Getting import info failed. Probably maximum of %d rpl files to import reached.\n", DYN_LINK_IMPORT_LIST_LENGTH);
@@ -85,7 +87,8 @@ bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_data_t * lin
     return addReloationEntry(linking_entries, linking_entry_length, type, offset, addend, destination, functionInfo, importInfoGbl);
 }
 
-bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t * functionName, dyn_linking_import_t * importInfo) {
+bool DynamicLinkingHelper::addReloationEntry(dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t *functionName,
+                                             dyn_linking_import_t *importInfo) {
     for (uint32_t i = 0; i < linking_entry_length; i++) {
         dyn_linking_relocation_entry_t *curEntry = &(linking_entries[i]);
         if (curEntry->functionEntry != NULL) {

source/module/DynamicLinkingHelper.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "common/dynamic_linking_defines.h"
 #include "utils/logger.h"
 #include <string>
@@ -48,9 +49,12 @@ public:
 
     static bool addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, const RelocationData &relocationData);
 
-    static bool addReloationEntry(dyn_linking_relocation_data_t * linking_data, dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, std::string name, const ImportRPLInformation& rplInfo);
+    static bool addReloationEntry(dyn_linking_relocation_data_t *linking_data, dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, std::string name,
+                                  const ImportRPLInformation &rplInfo);
+
+    static bool
+    addReloationEntry(dyn_linking_relocation_entry_t *linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t *functionName, dyn_linking_import_t *importInfo);
 
-    static bool addReloationEntry(dyn_linking_relocation_entry_t * linking_entries, uint32_t linking_entry_length, char type, size_t offset, int32_t addend, void *destination, dyn_linking_function_t * functionName, dyn_linking_import_t * importInfo);
 private:
     DynamicLinkingHelper() {
     }

source/module/ModuleData.h

@@ -105,6 +105,7 @@ public:
     }
 
     std::string toString() const;
+
 private:
     std::vector<RelocationData> relocation_data_list;
     std::map<std::string, SectionInfo> section_info_list;

source/module/ModuleDataFactory.cpp

@@ -200,6 +200,7 @@ std::vector<RelocationData> ModuleDataFactory::getImportRelocationData(elfio& re
     }
     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) {
     uint32_t sec_num = reader.sections.size();
 

source/module/ModuleDataFactory.h

@@ -27,6 +27,8 @@
 class ModuleDataFactory {
 public:
     static std::optional<ModuleData> load(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(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<RelocationData> getImportRelocationData(ELFIO::elfio &reader, uint8_t **destinations);
 };

source/module/ModuleDataPersistence.h

@@ -6,5 +6,6 @@
 class ModuleDataPersistence {
 public:
     static bool saveModuleData(module_information_t *moduleInformation, const ModuleData &module);
+
     static std::vector<ModuleData> loadModuleData(module_information_t *moduleInformation);
 };

source/module/RelocationData.h

@@ -59,6 +59,7 @@ public:
     }
 
     std::string toString() const;
+
 private:
     char type;
     size_t offset;

source/utils/StringTools.h

@@ -33,18 +33,31 @@
 class StringTools {
 public:
     static BOOL EndsWith(const std::string &a, const std::string &b);
+
     static const char *byte_to_binary(int32_t x);
+
     static std::string removeCharFromString(std::string &input, char toBeRemoved);
+
     static const char *fmt(const char *format, ...);
+
     static const wchar_t *wfmt(const char *format, ...);
+
     static int32_t strprintf(std::string &str, const char *format, ...);
+
     static std::string strfmt(const char *format, ...);
+
     static BOOL char2wchar_t(const char *src, wchar_t *dest);
+
     static int32_t strtokcmp(const char *string, const char *compare, const char *separator);
+
     static int32_t strextcmp(const char *string, const char *extension, char seperator);
+
     static char *str_replace(char *orig, char *rep, char *with);
+
     static const char *FullpathToFilename(const char *path);
+
     static void RemoveDoubleSlashs(std::string &str);
+
     static std::vector<std::string> stringSplit(const std::string &value, const std::string &splitter);
 };
 

source/utils/logger.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <whb/log.h>
 #include <string.h>