From b6d98d4b72f2d1ca4af7cc3e20a281fa44dcff3a Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Tue, 21 Nov 2023 16:54:10 +0200 Subject: [PATCH] some cleanups --- src/core/loader/elf.h | 445 ++++++++++++++++-------------------- src/core/virtual_memory.cpp | 6 +- src/core/virtual_memory.h | 10 + 3 files changed, 216 insertions(+), 245 deletions(-) diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h index 349d8029..2e72e073 100644 --- a/src/core/loader/elf.h +++ b/src/core/loader/elf.h @@ -1,21 +1,20 @@ #pragma once -#include #include #include +#include #include -#include "common/types.h" #include "common/fs_file.h" +#include "common/types.h" -struct self_header -{ +struct self_header { static const u32 signature = 0x1D3D154Fu; u32 magic; u08 version; u08 mode; - u08 endian;// 1 is little endian + u08 endian; // 1 is little endian u08 attributes; u08 category; u08 program_type; @@ -25,34 +24,31 @@ struct self_header u32 file_size; u32 padding2; u16 segment_count; - u16 unknown1A; //always 0x22 + u16 unknown1A; // always 0x22 u32 padding3; }; -struct self_segment_header -{ +struct self_segment_header { bool IsBlocked() const { - return (flags & 0x800) != 0;//0 or 0x800 + return (flags & 0x800) != 0; // 0 or 0x800 } - u32 GetId() const { - return (flags >> 20u) & 0xFFFu; - } + u32 GetId() const { return (flags >> 20u) & 0xFFFu; } bool IsOrdered() const { - return (flags & 1) != 0;//0 or 1 + return (flags & 1) != 0; // 0 or 1 } - bool IsEncrypted() const { - return (flags & 2) != 0;//0 or 2 + bool IsEncrypted() const { + return (flags & 2) != 0; // 0 or 2 } - bool IsSigned() const { - return (flags & 4) != 0;//0 or 4 + bool IsSigned() const { + return (flags & 4) != 0; // 0 or 4 } - bool IsCompressed() const { - return (flags & 8) != 0;//0 or 8 + bool IsCompressed() const { + return (flags & 8) != 0; // 0 or 8 } u64 flags; @@ -61,8 +57,7 @@ struct self_segment_header u64 memory_size; }; - -constexpr u08 EI_MAG0 = 0;/* e_ident[] indexes */ +constexpr u08 EI_MAG0 = 0; /* e_ident[] indexes */ constexpr u08 EI_MAG1 = 1; constexpr u08 EI_MAG2 = 2; constexpr u08 EI_MAG3 = 3; @@ -91,149 +86,132 @@ typedef enum : u16 { } e_type_s; typedef enum : u16 { - EM_NONE = 0, /* No machine */ - EM_M32 = 1, /* AT&T WE 32100 */ - EM_SPARC = 2, /* SPARC */ - EM_386 = 3, /* Intel 80386 */ - EM_68K = 4, /* Motorola 68000 */ - EM_88K = 5, /* Motorola 88000 */ - EM_860 = 7, /* Intel 80860 */ - EM_MIPS = 8, /* MIPS I Architecture */ - EM_S370 = 9, /* IBM System/370 Processor */ - EM_MIPS_RS3_LE = 10, /* MIPS RS3000 Little-endian */ - EM_PARISC = 15, /* Hewlett-Packard PA-RISC */ - EM_VPP500 = 17, /* Fujitsu VPP500 */ - EM_SPARC32PLUS = 18, /* Enhanced instruction set SPARC */ - EM_960 = 19, /* Intel 80960 */ - EM_PPC = 20, /* PowerPC */ - EM_PPC64 = 21, /* 64-bit PowerPC */ - EM_S390 = 22, /* IBM System/390 Processor */ - EM_V800 = 36, /* NEC V800 */ - EM_FR20 = 37, /* Fujitsu FR20 */ - EM_RH32 = 38, /* TRW RH-32 */ - EM_RCE = 39, /* Motorola RCE */ - EM_ARM = 40, /* Advanced RISC Machines ARM */ - EM_ALPHA = 41, /* Digital Alpha */ - EM_SH = 42, /* Hitachi SH */ - EM_SPARCV9 = 43, /* SPARC Version 9 */ - EM_TRICORE = 44, /* Siemens TriCore embedded processor */ - EM_ARC = 45, /* Argonaut RISC Core, Argonaut Technologies Inc. */ - EM_H8_300 = 46, /* Hitachi H8/300 */ - EM_H8_300H = 47, /* Hitachi H8/300H */ - EM_H8S = 48, /* Hitachi H8S */ - EM_H8_500 = 49, /* Hitachi H8/500 */ - EM_IA_64 = 50, /* Intel IA-64 processor architecture */ - EM_MIPS_X = 51, /* Stanford MIPS-X */ + EM_NONE = 0, /* No machine */ + EM_M32 = 1, /* AT&T WE 32100 */ + EM_SPARC = 2, /* SPARC */ + EM_386 = 3, /* Intel 80386 */ + EM_68K = 4, /* Motorola 68000 */ + EM_88K = 5, /* Motorola 88000 */ + EM_860 = 7, /* Intel 80860 */ + EM_MIPS = 8, /* MIPS I Architecture */ + EM_S370 = 9, /* IBM System/370 Processor */ + EM_MIPS_RS3_LE = 10, /* MIPS RS3000 Little-endian */ + EM_PARISC = 15, /* Hewlett-Packard PA-RISC */ + EM_VPP500 = 17, /* Fujitsu VPP500 */ + EM_SPARC32PLUS = 18, /* Enhanced instruction set SPARC */ + EM_960 = 19, /* Intel 80960 */ + EM_PPC = 20, /* PowerPC */ + EM_PPC64 = 21, /* 64-bit PowerPC */ + EM_S390 = 22, /* IBM System/390 Processor */ + EM_V800 = 36, /* NEC V800 */ + EM_FR20 = 37, /* Fujitsu FR20 */ + EM_RH32 = 38, /* TRW RH-32 */ + EM_RCE = 39, /* Motorola RCE */ + EM_ARM = 40, /* Advanced RISC Machines ARM */ + EM_ALPHA = 41, /* Digital Alpha */ + EM_SH = 42, /* Hitachi SH */ + EM_SPARCV9 = 43, /* SPARC Version 9 */ + EM_TRICORE = 44, /* Siemens TriCore embedded processor */ + EM_ARC = 45, /* Argonaut RISC Core, Argonaut Technologies Inc. */ + EM_H8_300 = 46, /* Hitachi H8/300 */ + EM_H8_300H = 47, /* Hitachi H8/300H */ + EM_H8S = 48, /* Hitachi H8S */ + EM_H8_500 = 49, /* Hitachi H8/500 */ + EM_IA_64 = 50, /* Intel IA-64 processor architecture */ + EM_MIPS_X = 51, /* Stanford MIPS-X */ EM_COLDFIRE = 52, /* Motorola ColdFire */ - EM_68HC12 = 53, /* Motorola M68HC12 */ - EM_MMA = 54, /* Fujitsu MMA Multimedia Accelerator */ - EM_PCP = 55, /* Siemens PCP */ - EM_NCPU = 56, /* Sony nCPU embedded RISC processor */ - EM_NDR1 = 57, /* Denso NDR1 microprocessor */ + EM_68HC12 = 53, /* Motorola M68HC12 */ + EM_MMA = 54, /* Fujitsu MMA Multimedia Accelerator */ + EM_PCP = 55, /* Siemens PCP */ + EM_NCPU = 56, /* Sony nCPU embedded RISC processor */ + EM_NDR1 = 57, /* Denso NDR1 microprocessor */ EM_STARCORE = 58, /* Motorola Star*Core processor */ - EM_ME16 = 59, /* Toyota ME16 processor */ - EM_ST100 = 60, /* STMicroelectronics ST100 processor */ - EM_TINYJ = 61, /* Advanced Logic Corp. TinyJ embedded processor family */ - EM_X86_64 = 62, /* AMD x86-64 architecture (PS4) */ - EM_PDSP = 63, /* Sony DSP Processor */ - EM_PDP10 = 64, /* Digital Equipment Corp. PDP-10 */ - EM_PDP11 = 65, /* Digital Equipment Corp. PDP-11 */ - EM_FX66 = 66, /* Siemens FX66 microcontroller */ - EM_ST9PLUS = 67, /* STMicroelectronics ST9+ 8/16 bit microcontroller */ - EM_ST7 = 68, /* STMicroelectronics ST7 8-bit microcontroller */ - EM_68HC16 = 69, /* Motorola MC68HC16 Microcontroller */ - EM_68HC11 = 70, /* Motorola MC68HC11 Microcontroller */ - EM_68HC08 = 71, /* Motorola MC68HC08 Microcontroller */ - EM_68HC05 = 72, /* Motorola MC68HC05 Microcontroller */ - EM_SVX = 73, /* Silicon Graphics SVx */ - EM_ST19 = 75, /* Digital VAX */ - EM_CRIS = 76, /* Axis Communications 32-bit embedded processor */ - EM_JAVELIN = 77, /* Infineon Technologies 32-bit embedded processor */ + EM_ME16 = 59, /* Toyota ME16 processor */ + EM_ST100 = 60, /* STMicroelectronics ST100 processor */ + EM_TINYJ = 61, /* Advanced Logic Corp. TinyJ embedded processor family */ + EM_X86_64 = 62, /* AMD x86-64 architecture (PS4) */ + EM_PDSP = 63, /* Sony DSP Processor */ + EM_PDP10 = 64, /* Digital Equipment Corp. PDP-10 */ + EM_PDP11 = 65, /* Digital Equipment Corp. PDP-11 */ + EM_FX66 = 66, /* Siemens FX66 microcontroller */ + EM_ST9PLUS = 67, /* STMicroelectronics ST9+ 8/16 bit microcontroller */ + EM_ST7 = 68, /* STMicroelectronics ST7 8-bit microcontroller */ + EM_68HC16 = 69, /* Motorola MC68HC16 Microcontroller */ + EM_68HC11 = 70, /* Motorola MC68HC11 Microcontroller */ + EM_68HC08 = 71, /* Motorola MC68HC08 Microcontroller */ + EM_68HC05 = 72, /* Motorola MC68HC05 Microcontroller */ + EM_SVX = 73, /* Silicon Graphics SVx */ + EM_ST19 = 75, /* Digital VAX */ + EM_CRIS = 76, /* Axis Communications 32-bit embedded processor */ + EM_JAVELIN = 77, /* Infineon Technologies 32-bit embedded processor */ EM_FIREPATH = 78, /* Element 14 64-bit DSP Processor */ - EM_ZSP = 79, /* LSI Logic 16-bit DSP Processor */ - EM_MMIX = 80, /* Donald Knuth's educational 64-bit processor */ - EM_HUANY = 81, /* Harvard University machine-independent object files */ - EM_PRISM = 82, /* SiTera Prism */ - EM_AVR = 83, /* Atmel AVR 8-bit microcontroller */ - EM_FR30 = 84, /* Fujitsu FR30 */ - EM_D10V = 85, /* Mitsubishi D10V */ - EM_D30V = 86, /* Mitsubishi D30V */ - EM_V850 = 87, /* NEC v850 */ - EM_M32R = 88, /* Mitsubishi M32R */ - EM_MN10300 = 89, /* Matsushita MN10300 */ - EM_MN10200 = 90, /* Matsushita MN10200 */ - EM_PJ = 91, /* PicoJava */ + EM_ZSP = 79, /* LSI Logic 16-bit DSP Processor */ + EM_MMIX = 80, /* Donald Knuth's educational 64-bit processor */ + EM_HUANY = 81, /* Harvard University machine-independent object files */ + EM_PRISM = 82, /* SiTera Prism */ + EM_AVR = 83, /* Atmel AVR 8-bit microcontroller */ + EM_FR30 = 84, /* Fujitsu FR30 */ + EM_D10V = 85, /* Mitsubishi D10V */ + EM_D30V = 86, /* Mitsubishi D30V */ + EM_V850 = 87, /* NEC v850 */ + EM_M32R = 88, /* Mitsubishi M32R */ + EM_MN10300 = 89, /* Matsushita MN10300 */ + EM_MN10200 = 90, /* Matsushita MN10200 */ + EM_PJ = 91, /* PicoJava */ EM_OPENRISC = 92, /* OpenRISC 32-bit embedded processor */ - EM_ARC_A5 = 93, /* ARC Cores Tangent-A5 */ - EM_XTENSA = 94, /* Tensilica Xtensa Architecture */ - EM_VIDEOCORE = 95, /* Alphamosaic VideoCore processor */ - EM_TMM_GPP = 96, /* Thompson Multimedia General Purpose Processor */ - EM_NS32K = 97, /* National Semiconductor 32000 series */ - EM_TPC = 98, /* Tenor Network TPC processor */ - EM_SNP1K = 99, /* Trebia SNP 1000 processor */ - EM_ST200 = 100, /* STMicroelectronics (www.st.com) ST200 microcontroller */ - EM_IP2K = 101, /* Ubicom IP2xxx microcontroller family */ - EM_MAX = 102, /* MAX Processor */ - EM_CR = 103, /* National Semiconductor CompactRISC microprocessor */ - EM_F2MC16 = 104, /* Fujitsu F2MC16 */ - EM_MSP430 = 105, /* Texas Instruments embedded microcontroller msp430 */ + EM_ARC_A5 = 93, /* ARC Cores Tangent-A5 */ + EM_XTENSA = 94, /* Tensilica Xtensa Architecture */ + EM_VIDEOCORE = 95, /* Alphamosaic VideoCore processor */ + EM_TMM_GPP = 96, /* Thompson Multimedia General Purpose Processor */ + EM_NS32K = 97, /* National Semiconductor 32000 series */ + EM_TPC = 98, /* Tenor Network TPC processor */ + EM_SNP1K = 99, /* Trebia SNP 1000 processor */ + EM_ST200 = 100, /* STMicroelectronics (www.st.com) ST200 microcontroller */ + EM_IP2K = 101, /* Ubicom IP2xxx microcontroller family */ + EM_MAX = 102, /* MAX Processor */ + EM_CR = 103, /* National Semiconductor CompactRISC microprocessor */ + EM_F2MC16 = 104, /* Fujitsu F2MC16 */ + EM_MSP430 = 105, /* Texas Instruments embedded microcontroller msp430 */ EM_BLACKFIN = 106, /* Analog Devices Blackfin (DSP) processor */ - EM_SE_C33 = 107, /* S1C33 Family of Seiko Epson processors */ - EM_SEP = 108, /* Sharp embedded microprocessor */ - EM_ARCA = 109, /* Arca RISC Microprocessor */ - EM_UNICORE = 110 /* Microprocessor series from PKU-Unity Ltd. and MPRC */ + EM_SE_C33 = 107, /* S1C33 Family of Seiko Epson processors */ + EM_SEP = 108, /* Sharp embedded microprocessor */ + EM_ARCA = 109, /* Arca RISC Microprocessor */ + EM_UNICORE = 110 /* Microprocessor series from PKU-Unity Ltd. and MPRC */ } e_machine_es; -typedef enum :u32 { - EV_NONE = 0x0, - EV_CURRENT = 0x1 -} e_version_es; +typedef enum : u32 { EV_NONE = 0x0, EV_CURRENT = 0x1 } e_version_es; + +typedef enum : u08 { ELF_CLASS_NONE = 0x0, ELF_CLASS_32 = 0x1, ELF_CLASS_64 = 0x2, ELF_CLASS_NUM = 0x3 } ident_class_es; + +typedef enum : u08 { ELF_DATA_NONE = 0x0, ELF_DATA_2LSB = 0x1, ELF_DATA_2MSB = 0x2, ELF_DATA_NUM = 0x3 } ident_endian_es; + +typedef enum : u08 { ELF_VERSION_NONE = 0x0, ELF_VERSION_CURRENT = 0x1, ELF_VERSION_NUM = 0x2 } ident_version_es; typedef enum : u08 { - ELF_CLASS_NONE =0x0, - ELF_CLASS_32 =0x1, - ELF_CLASS_64 =0x2, - ELF_CLASS_NUM =0x3 -} ident_class_es; - -typedef enum : u08 { - ELF_DATA_NONE = 0x0, - ELF_DATA_2LSB = 0x1, - ELF_DATA_2MSB = 0x2, - ELF_DATA_NUM = 0x3 -} ident_endian_es; - -typedef enum :u08 { - ELF_VERSION_NONE = 0x0, - ELF_VERSION_CURRENT = 0x1, - ELF_VERSION_NUM = 0x2 -} ident_version_es; - -typedef enum :u08 { - ELF_OSABI_NONE = 0x0, /* No extensions or unspecified */ - ELF_OSABI_HPUX = 0x1, /* Hewlett-Packard HP-UX */ - ELF_OSABI_NETBSD = 0x2, /* NetBSD */ - ELF_OSABI_LINUX = 0x3, /* Linux */ + ELF_OSABI_NONE = 0x0, /* No extensions or unspecified */ + ELF_OSABI_HPUX = 0x1, /* Hewlett-Packard HP-UX */ + ELF_OSABI_NETBSD = 0x2, /* NetBSD */ + ELF_OSABI_LINUX = 0x3, /* Linux */ ELF_OSABI_SOLARIS = 0x6, /* Sun Solaris */ - ELF_OSABI_AIX = 0x7, /* AIX */ - ELF_OSABI_IRIX = 0x8, /* IRIX */ + ELF_OSABI_AIX = 0x7, /* AIX */ + ELF_OSABI_IRIX = 0x8, /* IRIX */ ELF_OSABI_FREEBSD = 0x9, /* FreeBSD (PS4) */ - ELF_OSABI_TRU64 = 0xA, /* Compaq TRU64 UNIX */ + ELF_OSABI_TRU64 = 0xA, /* Compaq TRU64 UNIX */ ELF_OSABI_MODESTO = 0xB, /* Novell Modesto */ ELF_OSABI_OPENBSD = 0xC, /* Open BSD */ ELF_OSABI_OPENVMS = 0xD, /* Open VMS */ - ELF_OSABI_NSK = 0xE, /* Hewlett-Packard Non-Stop Kernel */ - ELF_OSABI_AROS = 0xF, /* Amiga Research OS */ - ELF_OSABI_ARM_AEABI = 0x40, /* ARM EABI */ - ELF_OSABI_ARM = 0x61, /* ARM */ - ELF_OSABI_STANDALONE = 0xFF /* Standalone (embedded applications) */ + ELF_OSABI_NSK = 0xE, /* Hewlett-Packard Non-Stop Kernel */ + ELF_OSABI_AROS = 0xF, /* Amiga Research OS */ + ELF_OSABI_ARM_AEABI = 0x40, /* ARM EABI */ + ELF_OSABI_ARM = 0x61, /* ARM */ + ELF_OSABI_STANDALONE = 0xFF /* Standalone (embedded applications) */ } ident_osabi_es; -typedef enum :u08 { - ELF_ABI_VERSION_AMDGPU_HSA_V2=0x0, - ELF_ABI_VERSION_AMDGPU_HSA_V3=0x1, - ELF_ABI_VERSION_AMDGPU_HSA_V4=0x2, - ELF_ABI_VERSION_AMDGPU_HSA_V5=0x3 +typedef enum : u08 { + ELF_ABI_VERSION_AMDGPU_HSA_V2 = 0x0, + ELF_ABI_VERSION_AMDGPU_HSA_V3 = 0x1, + ELF_ABI_VERSION_AMDGPU_HSA_V4 = 0x2, + ELF_ABI_VERSION_AMDGPU_HSA_V5 = 0x3 } ident_abiversion_es; struct elf_ident { @@ -246,8 +224,7 @@ struct elf_ident { u08 pad[6]; }; -struct elf_header -{ +struct elf_header { static const u32 signature = 0x7F454C46u; elf_ident e_ident; /* ELF identification */ @@ -306,20 +283,18 @@ typedef enum : u32 { PF_READ_WRITE_EXEC = 0x7 } elf_program_flags; -struct elf_program_header -{ +struct elf_program_header { elf_program_type p_type; /* Type of segment */ - elf_program_flags p_flags; /* Segment attributes */ - u64 p_offset; /* Offset in file */ - u64 p_vaddr; /* Virtual address in memory */ - u64 p_paddr; /* Reserved */ - u64 p_filesz; /* Size of segment in file */ - u64 p_memsz; /* Size of segment in memory */ - u64 p_align; /* Alignment of segment */ + elf_program_flags p_flags; /* Segment attributes */ + u64 p_offset; /* Offset in file */ + u64 p_vaddr; /* Virtual address in memory */ + u64 p_paddr; /* Reserved */ + u64 p_filesz; /* Size of segment in file */ + u64 p_memsz; /* Size of segment in memory */ + u64 p_align; /* Alignment of segment */ }; -struct elf_section_header -{ +struct elf_section_header { u32 sh_name; /* Section name */ u32 sh_type; /* Section type */ u64 sh_flags; /* Section attributes */ @@ -332,7 +307,7 @@ struct elf_section_header u64 sh_entsize; /* Size of entries, if section has table */ }; -typedef enum :u64 { +typedef enum : u64 { PT_FAKE = 0x1, PT_NPDRM_EXEC = 0x4, PT_NPDRM_DYNLIB = 0x5, @@ -343,8 +318,7 @@ typedef enum :u64 { PT_SECURE_KERNEL = 0xF } program_type_es; -struct elf_program_id_header -{ +struct elf_program_id_header { u64 authid; program_type_es program_type; u64 appver; @@ -352,79 +326,75 @@ struct elf_program_id_header u08 digest[32]; }; -constexpr s64 DT_NULL = 0; -constexpr s64 DT_NEEDED = 0x00000001; -constexpr s64 DT_RELA = 0x00000007; -constexpr s64 DT_INIT = 0x0000000c; -constexpr s64 DT_FINI = 0x0000000d; -constexpr s64 DT_DEBUG = 0x00000015; -constexpr s64 DT_TEXTREL = 0x00000016; -constexpr s64 DT_INIT_ARRAY = 0x00000019; -constexpr s64 DT_FINI_ARRAY = 0x0000001a; -constexpr s64 DT_INIT_ARRAYSZ = 0x0000001b; -constexpr s64 DT_FINI_ARRAYSZ = 0x0000001c; -constexpr s64 DT_FLAGS = 0x0000001e; -constexpr s64 DT_PREINIT_ARRAY = 0x00000020; -constexpr s64 DT_PREINIT_ARRAYSZ = 0x00000021; -constexpr s64 DT_SCE_FINGERPRINT = 0x61000007; +constexpr s64 DT_NULL = 0; +constexpr s64 DT_NEEDED = 0x00000001; +constexpr s64 DT_RELA = 0x00000007; +constexpr s64 DT_INIT = 0x0000000c; +constexpr s64 DT_FINI = 0x0000000d; +constexpr s64 DT_DEBUG = 0x00000015; +constexpr s64 DT_TEXTREL = 0x00000016; +constexpr s64 DT_INIT_ARRAY = 0x00000019; +constexpr s64 DT_FINI_ARRAY = 0x0000001a; +constexpr s64 DT_INIT_ARRAYSZ = 0x0000001b; +constexpr s64 DT_FINI_ARRAYSZ = 0x0000001c; +constexpr s64 DT_FLAGS = 0x0000001e; +constexpr s64 DT_PREINIT_ARRAY = 0x00000020; +constexpr s64 DT_PREINIT_ARRAYSZ = 0x00000021; +constexpr s64 DT_SCE_FINGERPRINT = 0x61000007; constexpr s64 DT_SCE_ORIGINAL_FILENAME = 0x61000009; -constexpr s64 DT_SCE_MODULE_INFO = 0x6100000d; -constexpr s64 DT_SCE_NEEDED_MODULE = 0x6100000f; -constexpr s64 DT_SCE_MODULE_ATTR = 0x61000011; -constexpr s64 DT_SCE_EXPORT_LIB = 0x61000013; -constexpr s64 DT_SCE_IMPORT_LIB = 0x61000015; -constexpr s64 DT_SCE_IMPORT_LIB_ATTR = 0x61000019; -constexpr s64 DT_SCE_HASH = 0x61000025; -constexpr s64 DT_SCE_PLTGOT = 0x61000027; -constexpr s64 DT_SCE_JMPREL = 0x61000029; -constexpr s64 DT_SCE_PLTREL = 0x6100002b; -constexpr s64 DT_SCE_PLTRELSZ = 0x6100002d; -constexpr s64 DT_SCE_RELA = 0x6100002f; -constexpr s64 DT_SCE_RELASZ = 0x61000031; -constexpr s64 DT_SCE_RELAENT = 0x61000033; -constexpr s64 DT_SCE_SYMENT = 0x6100003b; -constexpr s64 DT_SCE_HASHSZ = 0x6100003d; -constexpr s64 DT_SCE_STRTAB = 0x61000035; -constexpr s64 DT_SCE_STRSZ = 0x61000037; -constexpr s64 DT_SCE_SYMTAB = 0x61000039; -constexpr s64 DT_SCE_SYMTABSZ = 0x6100003f; +constexpr s64 DT_SCE_MODULE_INFO = 0x6100000d; +constexpr s64 DT_SCE_NEEDED_MODULE = 0x6100000f; +constexpr s64 DT_SCE_MODULE_ATTR = 0x61000011; +constexpr s64 DT_SCE_EXPORT_LIB = 0x61000013; +constexpr s64 DT_SCE_IMPORT_LIB = 0x61000015; +constexpr s64 DT_SCE_IMPORT_LIB_ATTR = 0x61000019; +constexpr s64 DT_SCE_HASH = 0x61000025; +constexpr s64 DT_SCE_PLTGOT = 0x61000027; +constexpr s64 DT_SCE_JMPREL = 0x61000029; +constexpr s64 DT_SCE_PLTREL = 0x6100002b; +constexpr s64 DT_SCE_PLTRELSZ = 0x6100002d; +constexpr s64 DT_SCE_RELA = 0x6100002f; +constexpr s64 DT_SCE_RELASZ = 0x61000031; +constexpr s64 DT_SCE_RELAENT = 0x61000033; +constexpr s64 DT_SCE_SYMENT = 0x6100003b; +constexpr s64 DT_SCE_HASHSZ = 0x6100003d; +constexpr s64 DT_SCE_STRTAB = 0x61000035; +constexpr s64 DT_SCE_STRSZ = 0x61000037; +constexpr s64 DT_SCE_SYMTAB = 0x61000039; +constexpr s64 DT_SCE_SYMTABSZ = 0x6100003f; - -struct elf_dynamic -{ +struct elf_dynamic { s64 d_tag; - union - { + union { u64 d_val; u64 d_ptr; } d_un; }; -constexpr u08 STB_LOCAL = 0; +constexpr u08 STB_LOCAL = 0; constexpr u08 STB_GLOBAL = 1; -constexpr u08 STB_WEAK = 2; +constexpr u08 STB_WEAK = 2; -constexpr u08 STT_NOTYPE = 0; -constexpr u08 STT_OBJECT = 1; -constexpr u08 STT_FUN = 2; +constexpr u08 STT_NOTYPE = 0; +constexpr u08 STT_OBJECT = 1; +constexpr u08 STT_FUN = 2; constexpr u08 STT_SECTION = 3; -constexpr u08 STT_FILE = 4; -constexpr u08 STT_COMMON = 5; -constexpr u08 STT_TLS = 6; -constexpr u08 STT_LOOS = 10; -constexpr u08 STT_SCE = 11; //module_start/module_stop -constexpr u08 STT_HIOS = 12; -constexpr u08 STT_LOPRO = 13; +constexpr u08 STT_FILE = 4; +constexpr u08 STT_COMMON = 5; +constexpr u08 STT_TLS = 6; +constexpr u08 STT_LOOS = 10; +constexpr u08 STT_SCE = 11; // module_start/module_stop +constexpr u08 STT_HIOS = 12; +constexpr u08 STT_LOPRO = 13; constexpr u08 STT_SPARC_REGISTER = 13; -constexpr u08 STT_HIPROC = 15; +constexpr u08 STT_HIPROC = 15; constexpr u08 STV_DEFAULT = 0; constexpr u08 STV_INTERNAL = 1; constexpr u08 STV_HIDDEN = 2; constexpr u08 STV_PROTECTED = 3; -struct elf_symbol -{ +struct elf_symbol { u08 GetBind() const { return st_info >> 4u; } u08 GetType() const { return st_info & 0xfu; } u08 GetVisibility() const { return st_other & 3u; } @@ -437,18 +407,19 @@ struct elf_symbol u64 st_size; }; -struct elf_relocation -{ +struct elf_relocation { u32 GetSymbol() const { return static_cast(rel_info >> 32u); } - u32 GetType() const { return static_cast(rel_info & 0xffffffff); } + u32 GetType() const { return static_cast(rel_info & 0xffffffff); } u64 rel_offset; u64 rel_info; s64 rel_addend; }; -constexpr u32 R_X86_64_64 = 1; // Direct 64 bit -constexpr u32 R_X86_64_JUMP_SLOT = 7; // Create PLT entry -constexpr u32 R_X86_64_RELATIVE = 8; // Adjust by program base +constexpr u32 R_X86_64_64 = 1; // Direct 64 bit +constexpr u32 R_X86_64_GLOB_DAT = 6; +constexpr u32 R_X86_64_JUMP_SLOT = 7; // Create PLT entry +constexpr u32 R_X86_64_RELATIVE = 8; // Adjust by program base +constexpr u32 R_X86_64_DTPMOD64 = 16; namespace Core::Loader { @@ -457,30 +428,20 @@ class Elf { Elf() = default; virtual ~Elf(); - void Open(const std::string & file_name); + void Open(const std::string& file_name); bool isSelfFile() const; bool isElfFile() const; void DebugDump(); - [[nodiscard]] self_header GetSElfHeader() const { - return m_self; - } + [[nodiscard]] self_header GetSElfHeader() const { return m_self; } - [[nodiscard]] elf_header GetElfHeader() const { - return m_elf_header; - } + [[nodiscard]] elf_header GetElfHeader() const { return m_elf_header; } - [[nodiscard]] std::span GetProgramHeader() const { - return m_elf_phdr; - } + [[nodiscard]] std::span GetProgramHeader() const { return m_elf_phdr; } - [[nodiscard]] std::span GetSegmentHeader() const { - return m_self_segments; - } + [[nodiscard]] std::span GetSegmentHeader() const { return m_self_segments; } - [[nodiscard]] u64 GetElfEntry() const { - return m_elf_header.e_entry; - } + [[nodiscard]] u64 GetElfEntry() const { return m_elf_header.e_entry; } std::string SElfHeaderStr(); std::string SELFSegHeader(u16 no); @@ -505,4 +466,4 @@ class Elf { elf_program_id_header m_self_id_header{}; }; -} // namespace Core::Loader +} // namespace Core::Loader diff --git a/src/core/virtual_memory.cpp b/src/core/virtual_memory.cpp index 1aed5514..f730aff4 100644 --- a/src/core/virtual_memory.cpp +++ b/src/core/virtual_memory.cpp @@ -1,6 +1,7 @@ -#include "common/log.h" #include "core/virtual_memory.h" +#include "common/log.h" + #ifdef _WIN64 #include #else @@ -107,8 +108,7 @@ bool memory_patch(u64 vaddr, u64 value) { memory_protect(vaddr, 8, old_mode, nullptr); // if mode is executable flush it so insure that cpu finds it - if ((old_mode == MemoryMode::Execute || old_mode == MemoryMode::ExecuteRead || old_mode == MemoryMode::ExecuteWrite || - old_mode == MemoryMode::ExecuteReadWrite)) { + if (containsExecuteMode(old_mode)) { memory_flush(vaddr, 8); } diff --git a/src/core/virtual_memory.h b/src/core/virtual_memory.h index 6b255301..ef83a900 100644 --- a/src/core/virtual_memory.h +++ b/src/core/virtual_memory.h @@ -25,4 +25,14 @@ bool memory_protect(u64 address, u64 size, MemoryMode mode, MemoryMode* old_mode bool memory_flush(u64 address, u64 size); bool memory_patch(u64 vaddr, u64 value); +inline bool containsExecuteMode(MemoryMode mode) { + switch (mode) { + case MemoryMode::Execute: return true; + case MemoryMode::ExecuteRead: return true; + case MemoryMode::ExecuteWrite: return true; + case MemoryMode::ExecuteReadWrite: return true; + default: return false; + } +} + } // namespace VirtualMemory \ No newline at end of file