[makerom] Separated ELF processing from code segment construction. StackSize now read from exheader template.

makerom/elf.h

@@ -1,9 +1,9 @@
 #pragma once
 
-typedef enum
+typedef enum elf_errors
 {
 	NOT_ELF_FILE = -10,
-	NOT_ARM_ELF = -11,
+	NOT_CTR_ARM_ELF = -11,
 	NON_EXECUTABLE_ELF = -12,
 	ELF_SECTION_NOT_FOUND = -13,
 	NOT_FIND_TEXT_SEGMENT = -14,
@@ -13,35 +13,101 @@ typedef enum
 	ELF_SEGMENTS_NOT_FOUND = -18,
 } elf_errors;
 
-typedef struct
+typedef enum elf_section_type
 {
-	char *name;
-	u64 type;
-	u64 flags;
-	u8 *ptr;
-	u64 offsetInFile;
-	u64 size;
-	u64 address;
-	u64 alignment;
+	SHT_NULL,
+	SHT_PROGBITS,
+	SHT_SYMTAB,
+	SHT_STRTAB,
+	SHT_RELA,
+	SHT_HASH,
+	SHT_DYNAMIC,
+	SHT_NOTE,
+	SHT_NOBITS,
+	SHT_REL,
+	SHT_SHLIB,
+	SHT_DYNSYM,
+	SHT_UNKNOWN12,
+	SHT_UNKNOWN13,
+	SHT_INIT_ARRAY,
+	SHT_FINI_ARRAY,
+	SHT_PREINIT_ARRAY,
+	SHT_GROUP,
+	SHT_SYMTAB_SHNDX,
+	SHT_NUM,
+	SHT_ARM_EXIDX = 0x70000001,
+	SHT_ARM_PREEMPTMAP,
+	SHT_ARM_ATTRIBUTES,
+	SHT_ARM_DEBUGOVERLAY,
+	SHT_ARM_OVERLAYSECTION
+} elf_section_type;
+
+typedef enum elf_section_flag
+{
+	SHF_WRITE = 0x1,
+	SHF_ALLOC = 0x2,
+	SHF_EXECINSTR = 0x4,
+	SHF_MERGE = 0x10,
+	SHF_STRINGS = 0x20,
+	SHF_INFO_LINK = 0x40,
+	SHF_LINK_ORDER = 0x80,
+	SHF_OS_NONCONFORMING = 0x100,
+	SHF_GROUP = 0x200,
+	SHF_TLS = 0x400
+} elf_section_flag;
+
+typedef struct elf_section_entry
+{
+	const char *name;
+	u32 type;
+	u32 flags;
+	const u8 *ptr;
+	u32 offsetInFile;
+	u32 size;
+	u32 address;
+	u32 alignment;
 } elf_section_entry;
 
-typedef struct
+typedef enum elf_program_type
 {
-	u64 type;
-	u64 flags;
-	u8 *ptr;
-	u64 offsetInFile;
-	u64 sizeInFile;
-	u64 virtualAddress;
-	u64 physicalAddress;
-	u64 sizeInMemory;
-	u64 alignment;
+	PT_NULL,
+	PT_LOAD,
+	PT_DYNAMIC,
+	PT_INTERP,
+	PT_NOTE,
+	PT_SHLIB,
+	PT_PHDR,
+} elf_program_type;
+
+typedef enum elf_program_flag
+{
+	PF_X = 0x1,
+	PF_W = 0x2,
+	PF_R = 0x4,
+	PF_CTRSDK = 0x80000000,
+
+	PF_TEXT = (PF_R|PF_X),
+	PF_DATA = (PF_R|PF_W),
+	PF_RODATA = PF_R
+} elf_program_flag;
+
+typedef struct elf_program_entry
+{
+	u32 type;
+	u32 flags;
+	const u8 *ptr;
+	u32 offsetInFile;
+	u32 sizeInFile;
+	u32 virtualAddress;
+	u32 physicalAddress;
+	u32 sizeInMemory;
+	u32 alignment;
 } elf_program_entry;
 
-typedef struct
+typedef struct elf_segment
 {
-	char *name;
-	u64 vAddr;
+	const char *name;
+	u32 vAddr;
 
 	elf_program_entry *header;
 	u32 sectionNum;
@@ -49,25 +115,17 @@ typedef struct
 	elf_section_entry *sections;
 } elf_segment;
 
-typedef struct
+typedef struct elf_context
 {
-	u32 address;
-	u32 size;
-	u32 maxPageNum;
-	u8 *data;
-} code_segment;
+	const u8 *file;
 
-typedef struct
-{
 	u32 pageSize;
-	bool IsLittleEndian;
-	bool Is64bit;
 		
-	u64 programTableOffset;
+	u32 programTableOffset;
 	u16 programTableEntrySize;
 	u16 programTableEntryCount;
 	
-	u64 sectionTableOffset;
+	u32 sectionTableOffset;
 	u16 sectionTableEntrySize;
 	u16 sectionTableEntryCount;
 	
@@ -78,7 +136,12 @@ typedef struct
 
 	u16 activeSegments;
 	elf_segment *segments;
-
 } elf_context;
 
-int BuildExeFsCode(ncch_settings *ncchset);
+bool IsBss(elf_section_entry *section);
+bool IsData(elf_section_entry *section);
+bool IsRoData(elf_section_entry *section);
+bool IsText(elf_section_entry *section);
+
+int GetElfContext(elf_context *elf, const u8 *elfFile);
+void FreeElfContext(elf_context *elf);