Remove obsolete // clang-format off

This commit is contained in:
Maschell 2022-02-13 14:25:28 +01:00
parent 65e460606f
commit 446dacdaac
5 changed files with 53 additions and 62 deletions

View File

@ -7,40 +7,37 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
// clang-format off #define R_PPC_NONE 0
#define R_PPC_NONE 0 #define R_PPC_ADDR32 1
#define R_PPC_ADDR32 1 #define R_PPC_ADDR16_LO 4
#define R_PPC_ADDR16_LO 4 #define R_PPC_ADDR16_HI 5
#define R_PPC_ADDR16_HI 5 #define R_PPC_ADDR16_HA 6
#define R_PPC_ADDR16_HA 6 #define R_PPC_REL24 10
#define R_PPC_REL24 10 #define R_PPC_REL14 11
#define R_PPC_REL14 11 #define R_PPC_DTPMOD32 68
#define R_PPC_DTPMOD32 68 #define R_PPC_DTPREL32 78
#define R_PPC_DTPREL32 78 #define R_PPC_EMB_SDA21 109
#define R_PPC_EMB_SDA21 109 #define R_PPC_EMB_RELSDA 116
#define R_PPC_EMB_RELSDA 116 #define R_PPC_DIAB_SDA21_LO 180
#define R_PPC_DIAB_SDA21_LO 180 #define R_PPC_DIAB_SDA21_HI 181
#define R_PPC_DIAB_SDA21_HI 181 #define R_PPC_DIAB_SDA21_HA 182
#define R_PPC_DIAB_SDA21_HA 182 #define R_PPC_DIAB_RELSDA_LO 183
#define R_PPC_DIAB_RELSDA_LO 183 #define R_PPC_DIAB_RELSDA_HI 184
#define R_PPC_DIAB_RELSDA_HI 184 #define R_PPC_DIAB_RELSDA_HA 185
#define R_PPC_DIAB_RELSDA_HA 185 #define R_PPC_GHS_REL16_HA 251
#define R_PPC_GHS_REL16_HA 251 #define R_PPC_GHS_REL16_HI 252
#define R_PPC_GHS_REL16_HI 252 #define R_PPC_GHS_REL16_LO 253
#define R_PPC_GHS_REL16_LO 253
// Masks for manipulating Power PC relocation targets // Masks for manipulating Power PC relocation targets
#define PPC_WORD32 0xFFFFFFFF #define PPC_WORD32 0xFFFFFFFF
#define PPC_WORD30 0xFFFFFFFC #define PPC_WORD30 0xFFFFFFFC
#define PPC_LOW24 0x03FFFFFC #define PPC_LOW24 0x03FFFFFC
#define PPC_LOW14 0x0020FFFC #define PPC_LOW14 0x0020FFFC
#define PPC_HALF16 0xFFFF #define PPC_HALF16 0xFFFF
// clang-format on
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -24,15 +24,14 @@
extern "C" { extern "C" {
#endif #endif
// clang-format off #define DYN_LINK_FUNCTION_NAME_LENGTH 351
#define DYN_LINK_FUNCTION_NAME_LENGTH 351 #define DYN_LINK_IMPORT_NAME_LENGTH 50
#define DYN_LINK_IMPORT_NAME_LENGTH 50
#define DYN_LINK_FUNCTION_LIST_LENGTH 500 #define DYN_LINK_FUNCTION_LIST_LENGTH 500
#define DYN_LINK_IMPORT_LIST_LENGTH 50 #define DYN_LINK_IMPORT_LIST_LENGTH 50
#define DYN_LINK_TRAMPOLIN_LIST_LENGTH DYN_LINK_FUNCTION_LIST_LENGTH
#define DYN_LINK_TRAMPOLIN_LIST_LENGTH DYN_LINK_FUNCTION_LIST_LENGTH
// clang-format on
typedef struct _dyn_linking_function_t { typedef struct _dyn_linking_function_t {
char functionName[DYN_LINK_FUNCTION_NAME_LENGTH + 1]; char functionName[DYN_LINK_FUNCTION_NAME_LENGTH + 1];

View File

@ -19,21 +19,19 @@
#include <cstdint> #include <cstdint>
// clang-format off
typedef enum RelocationTrampolinStatus { typedef enum RelocationTrampolinStatus {
RELOC_TRAMP_FREE = 0, RELOC_TRAMP_FREE = 0,
RELOC_TRAMP_FIXED = 1, RELOC_TRAMP_FIXED = 1,
RELOC_TRAMP_IMPORT_IN_PROGRESS = 2, RELOC_TRAMP_IMPORT_IN_PROGRESS = 2,
RELOC_TRAMP_IMPORT_DONE = 3, RELOC_TRAMP_IMPORT_DONE = 3,
} RelocationTrampolinStatus; } RelocationTrampolinStatus;
typedef enum RelocationType { typedef enum RelocationType {
RELOC_TYPE_FIXED = 0, RELOC_TYPE_FIXED = 0,
RELOC_TYPE_IMPORT = 1 RELOC_TYPE_IMPORT = 1
} RelocationType; } RelocationType;
typedef struct relocation_trampolin_entry_t { typedef struct relocation_trampolin_entry_t {
uint32_t trampolin[4]; uint32_t trampolin[4];
RelocationTrampolinStatus status; RelocationTrampolinStatus status;
} relocation_trampolin_entry_t; } relocation_trampolin_entry_t;
// clang-format on

View File

@ -2,15 +2,14 @@
#include <cstdint> #include <cstdint>
// clang-format off #define ADDRESS_main_entry_hook 0x0101C56C
#define ADDRESS_main_entry_hook 0x0101C56C
#define KERN_SYSCALL_TBL_1 0xFFE84C70 // unknown
#define KERN_SYSCALL_TBL_2 0xFFE85070 // works with games
#define KERN_SYSCALL_TBL_3 0xFFE85470 // works with loader
#define KERN_SYSCALL_TBL_4 0xFFEAAA60 // works with home menu
#define KERN_SYSCALL_TBL_5 0xFFEAAE60 // works with browser (previously KERN_SYSCALL_TBL)
#define KERN_SYSCALL_TBL_1 0xFFE84C70 // unknown
#define KERN_SYSCALL_TBL_2 0xFFE85070 // works with games
#define KERN_SYSCALL_TBL_3 0xFFE85470 // works with loader
#define KERN_SYSCALL_TBL_4 0xFFEAAA60 // works with home menu
#define KERN_SYSCALL_TBL_5 0xFFEAAE60 // works with browser (previously KERN_SYSCALL_TBL)
// clang-format on
void RevertMainHook(); void RevertMainHook();

View File

@ -238,17 +238,15 @@ int main(int argc, char **argv) {
return 0; return 0;
} }
// clang-format off #define COLOR_WHITE Color(0xffffffff)
#define COLOR_WHITE Color(0xffffffff) #define COLOR_BLACK Color(0, 0, 0, 255)
#define COLOR_BLACK Color(0, 0, 0, 255) #define COLOR_RED Color(237, 28, 36, 255)
#define COLOR_RED Color(237, 28, 36, 255) #define COLOR_BACKGROUND Color(0, 40, 100, 255)
#define COLOR_BACKGROUND Color(0, 40, 100, 255) #define COLOR_TEXT COLOR_WHITE
#define COLOR_TEXT COLOR_WHITE #define COLOR_TEXT2 Color(0xB3ffffff)
#define COLOR_TEXT2 Color(0xB3ffffff) #define COLOR_AUTOBOOT Color(0xaeea00ff)
#define COLOR_AUTOBOOT Color(0xaeea00ff) #define COLOR_BORDER Color(204, 204, 204, 255)
#define COLOR_BORDER Color(204, 204, 204, 255)
#define COLOR_BORDER_HIGHLIGHTED Color(0x3478e4ff) #define COLOR_BORDER_HIGHLIGHTED Color(0x3478e4ff)
// clang-format on
std::string EnvironmentSelectionScreen(const std::map<std::string, std::string> &payloads, int32_t autobootIndex) { std::string EnvironmentSelectionScreen(const std::map<std::string, std::string> &payloads, int32_t autobootIndex) {
OSScreenInit(); OSScreenInit();