Browse Source
Elf: Renamed modules to be consistent with new loader naming, fixed tabs -> spaces.
pull/15/merge
Elf: Renamed modules to be consistent with new loader naming, fixed tabs -> spaces.
pull/15/merge
bunnei
12 years ago
8 changed files with 342 additions and 372 deletions
-
5src/core/CMakeLists.txt
-
5src/core/core.vcxproj
-
15src/core/core.vcxproj.filters
-
190src/core/loader/elf.cpp
-
232src/core/loader/elf.h
-
190src/core/loader/elf_reader.cpp
-
75src/core/loader/elf_reader.h
-
2src/core/loader/loader.cpp
@ -0,0 +1,190 @@ |
|||
// Copyright 2013 Dolphin Emulator Project
|
|||
// Licensed under GPLv2
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include <string>
|
|||
|
|||
#include "common/common.h"
|
|||
|
|||
#include "common/symbols.h"
|
|||
#include "core/mem_map.h"
|
|||
#include "core/loader/elf.h"
|
|||
|
|||
//void bswap(Elf32_Word &w) {w = Common::swap32(w);}
|
|||
//void bswap(Elf32_Half &w) {w = Common::swap16(w);}
|
|||
|
|||
#define bswap(w) w // Dirty bswap disable for now... 3DS is little endian, anyway
|
|||
|
|||
static void byteswapHeader(Elf32_Ehdr &ELF_H) |
|||
{ |
|||
bswap(ELF_H.e_type); |
|||
bswap(ELF_H.e_machine); |
|||
bswap(ELF_H.e_ehsize); |
|||
bswap(ELF_H.e_phentsize); |
|||
bswap(ELF_H.e_phnum); |
|||
bswap(ELF_H.e_shentsize); |
|||
bswap(ELF_H.e_shnum); |
|||
bswap(ELF_H.e_shstrndx); |
|||
bswap(ELF_H.e_version); |
|||
bswap(ELF_H.e_entry); |
|||
bswap(ELF_H.e_phoff); |
|||
bswap(ELF_H.e_shoff); |
|||
bswap(ELF_H.e_flags); |
|||
} |
|||
|
|||
static void byteswapSegment(Elf32_Phdr &sec) |
|||
{ |
|||
bswap(sec.p_align); |
|||
bswap(sec.p_filesz); |
|||
bswap(sec.p_flags); |
|||
bswap(sec.p_memsz); |
|||
bswap(sec.p_offset); |
|||
bswap(sec.p_paddr); |
|||
bswap(sec.p_vaddr); |
|||
bswap(sec.p_type); |
|||
} |
|||
|
|||
static void byteswapSection(Elf32_Shdr &sec) |
|||
{ |
|||
bswap(sec.sh_addr); |
|||
bswap(sec.sh_addralign); |
|||
bswap(sec.sh_entsize); |
|||
bswap(sec.sh_flags); |
|||
bswap(sec.sh_info); |
|||
bswap(sec.sh_link); |
|||
bswap(sec.sh_name); |
|||
bswap(sec.sh_offset); |
|||
bswap(sec.sh_size); |
|||
bswap(sec.sh_type); |
|||
} |
|||
|
|||
ElfReader::ElfReader(void *ptr) |
|||
{ |
|||
base = (char*)ptr; |
|||
base32 = (u32 *)ptr; |
|||
header = (Elf32_Ehdr*)ptr; |
|||
byteswapHeader(*header); |
|||
|
|||
segments = (Elf32_Phdr *)(base + header->e_phoff); |
|||
sections = (Elf32_Shdr *)(base + header->e_shoff); |
|||
|
|||
entryPoint = header->e_entry; |
|||
|
|||
LoadSymbols(); |
|||
} |
|||
|
|||
const char *ElfReader::GetSectionName(int section) const |
|||
{ |
|||
if (sections[section].sh_type == SHT_NULL) |
|||
return nullptr; |
|||
|
|||
int nameOffset = sections[section].sh_name; |
|||
char *ptr = (char*)GetSectionDataPtr(header->e_shstrndx); |
|||
|
|||
if (ptr) |
|||
return ptr + nameOffset; |
|||
else |
|||
return nullptr; |
|||
} |
|||
|
|||
bool ElfReader::LoadInto(u32 vaddr) |
|||
{ |
|||
DEBUG_LOG(MASTER_LOG, "String section: %i", header->e_shstrndx); |
|||
|
|||
// Should we relocate?
|
|||
bRelocate = (header->e_type != ET_EXEC); |
|||
|
|||
if (bRelocate) |
|||
{ |
|||
DEBUG_LOG(MASTER_LOG, "Relocatable module"); |
|||
entryPoint += vaddr; |
|||
} |
|||
else |
|||
{ |
|||
DEBUG_LOG(MASTER_LOG, "Prerelocated executable"); |
|||
} |
|||
|
|||
INFO_LOG(MASTER_LOG, "%i segments:", header->e_phnum); |
|||
|
|||
// First pass : Get the bits into RAM
|
|||
u32 segmentVAddr[32]; |
|||
|
|||
u32 baseAddress = bRelocate ? vaddr : 0; |
|||
|
|||
for (int i = 0; i < header->e_phnum; i++) |
|||
{ |
|||
Elf32_Phdr *p = segments + i; |
|||
|
|||
INFO_LOG(MASTER_LOG, "Type: %i Vaddr: %08x Filesz: %i Memsz: %i ", p->p_type, p->p_vaddr, p->p_filesz, p->p_memsz); |
|||
|
|||
if (p->p_type == PT_LOAD) |
|||
{ |
|||
segmentVAddr[i] = baseAddress + p->p_vaddr; |
|||
u32 writeAddr = segmentVAddr[i]; |
|||
|
|||
const u8 *src = GetSegmentPtr(i); |
|||
u8 *dst = Memory::GetPointer(writeAddr); |
|||
u32 srcSize = p->p_filesz; |
|||
u32 dstSize = p->p_memsz; |
|||
u32 *s = (u32*)src; |
|||
u32 *d = (u32*)dst; |
|||
for (int j = 0; j < (int)(srcSize + 3) / 4; j++) |
|||
{ |
|||
*d++ = /*_byteswap_ulong*/(*s++); |
|||
} |
|||
if (srcSize < dstSize) |
|||
{ |
|||
//memset(dst + srcSize, 0, dstSize-srcSize); //zero out bss
|
|||
} |
|||
INFO_LOG(MASTER_LOG, "Loadable Segment Copied to %08x, size %08x", writeAddr, p->p_memsz); |
|||
} |
|||
} |
|||
|
|||
|
|||
INFO_LOG(MASTER_LOG, "Done loading."); |
|||
return true; |
|||
} |
|||
|
|||
SectionID ElfReader::GetSectionByName(const char *name, int firstSection) const |
|||
{ |
|||
for (int i = firstSection; i < header->e_shnum; i++) |
|||
{ |
|||
const char *secname = GetSectionName(i); |
|||
|
|||
if (secname != nullptr && strcmp(name, secname) == 0) |
|||
return i; |
|||
} |
|||
return -1; |
|||
} |
|||
|
|||
bool ElfReader::LoadSymbols() |
|||
{ |
|||
bool hasSymbols = false; |
|||
SectionID sec = GetSectionByName(".symtab"); |
|||
if (sec != -1) |
|||
{ |
|||
int stringSection = sections[sec].sh_link; |
|||
const char *stringBase = (const char *)GetSectionDataPtr(stringSection); |
|||
|
|||
//We have a symbol table!
|
|||
Elf32_Sym *symtab = (Elf32_Sym *)(GetSectionDataPtr(sec)); |
|||
int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym); |
|||
for (int sym = 0; sym < numSymbols; sym++) |
|||
{ |
|||
int size = symtab[sym].st_size; |
|||
if (size == 0) |
|||
continue; |
|||
|
|||
// int bind = symtab[sym].st_info >> 4;
|
|||
int type = symtab[sym].st_info & 0xF; |
|||
|
|||
const char *name = stringBase + symtab[sym].st_name; |
|||
|
|||
Symbols::Add(symtab[sym].st_value, name, size, type); |
|||
|
|||
hasSymbols = true; |
|||
} |
|||
} |
|||
|
|||
return hasSymbols; |
|||
} |
|||
@ -1,190 +0,0 @@ |
|||
// Copyright 2013 Dolphin Emulator Project
|
|||
// Licensed under GPLv2
|
|||
// Refer to the license.txt file included.
|
|||
|
|||
#include <string>
|
|||
|
|||
#include "common/common.h"
|
|||
|
|||
#include "common/symbols.h"
|
|||
#include "core/mem_map.h"
|
|||
#include "core/loader/elf_reader.h"
|
|||
|
|||
//void bswap(Elf32_Word &w) {w = Common::swap32(w);}
|
|||
//void bswap(Elf32_Half &w) {w = Common::swap16(w);}
|
|||
|
|||
#define bswap(w) w // Dirty bswap disable for now... 3DS is little endian, anyway
|
|||
|
|||
static void byteswapHeader(Elf32_Ehdr &ELF_H) |
|||
{ |
|||
bswap(ELF_H.e_type); |
|||
bswap(ELF_H.e_machine); |
|||
bswap(ELF_H.e_ehsize); |
|||
bswap(ELF_H.e_phentsize); |
|||
bswap(ELF_H.e_phnum); |
|||
bswap(ELF_H.e_shentsize); |
|||
bswap(ELF_H.e_shnum); |
|||
bswap(ELF_H.e_shstrndx); |
|||
bswap(ELF_H.e_version); |
|||
bswap(ELF_H.e_entry); |
|||
bswap(ELF_H.e_phoff); |
|||
bswap(ELF_H.e_shoff); |
|||
bswap(ELF_H.e_flags); |
|||
} |
|||
|
|||
static void byteswapSegment(Elf32_Phdr &sec) |
|||
{ |
|||
bswap(sec.p_align); |
|||
bswap(sec.p_filesz); |
|||
bswap(sec.p_flags); |
|||
bswap(sec.p_memsz); |
|||
bswap(sec.p_offset); |
|||
bswap(sec.p_paddr); |
|||
bswap(sec.p_vaddr); |
|||
bswap(sec.p_type); |
|||
} |
|||
|
|||
static void byteswapSection(Elf32_Shdr &sec) |
|||
{ |
|||
bswap(sec.sh_addr); |
|||
bswap(sec.sh_addralign); |
|||
bswap(sec.sh_entsize); |
|||
bswap(sec.sh_flags); |
|||
bswap(sec.sh_info); |
|||
bswap(sec.sh_link); |
|||
bswap(sec.sh_name); |
|||
bswap(sec.sh_offset); |
|||
bswap(sec.sh_size); |
|||
bswap(sec.sh_type); |
|||
} |
|||
|
|||
ElfReader::ElfReader(void *ptr) |
|||
{ |
|||
base = (char*)ptr; |
|||
base32 = (u32 *)ptr; |
|||
header = (Elf32_Ehdr*)ptr; |
|||
byteswapHeader(*header); |
|||
|
|||
segments = (Elf32_Phdr *)(base + header->e_phoff); |
|||
sections = (Elf32_Shdr *)(base + header->e_shoff); |
|||
|
|||
entryPoint = header->e_entry; |
|||
|
|||
LoadSymbols(); |
|||
} |
|||
|
|||
const char *ElfReader::GetSectionName(int section) const |
|||
{ |
|||
if (sections[section].sh_type == SHT_NULL) |
|||
return nullptr; |
|||
|
|||
int nameOffset = sections[section].sh_name; |
|||
char *ptr = (char*)GetSectionDataPtr(header->e_shstrndx); |
|||
|
|||
if (ptr) |
|||
return ptr + nameOffset; |
|||
else |
|||
return nullptr; |
|||
} |
|||
|
|||
bool ElfReader::LoadInto(u32 vaddr) |
|||
{ |
|||
DEBUG_LOG(MASTER_LOG,"String section: %i", header->e_shstrndx); |
|||
|
|||
// Should we relocate?
|
|||
bRelocate = (header->e_type != ET_EXEC); |
|||
|
|||
if (bRelocate) |
|||
{ |
|||
DEBUG_LOG(MASTER_LOG,"Relocatable module"); |
|||
entryPoint += vaddr; |
|||
} |
|||
else |
|||
{ |
|||
DEBUG_LOG(MASTER_LOG,"Prerelocated executable"); |
|||
} |
|||
|
|||
INFO_LOG(MASTER_LOG,"%i segments:", header->e_phnum); |
|||
|
|||
// First pass : Get the bits into RAM
|
|||
u32 segmentVAddr[32]; |
|||
|
|||
u32 baseAddress = bRelocate?vaddr:0; |
|||
|
|||
for (int i = 0; i < header->e_phnum; i++) |
|||
{ |
|||
Elf32_Phdr *p = segments + i; |
|||
|
|||
INFO_LOG(MASTER_LOG, "Type: %i Vaddr: %08x Filesz: %i Memsz: %i ", p->p_type, p->p_vaddr, p->p_filesz, p->p_memsz); |
|||
|
|||
if (p->p_type == PT_LOAD) |
|||
{ |
|||
segmentVAddr[i] = baseAddress + p->p_vaddr; |
|||
u32 writeAddr = segmentVAddr[i]; |
|||
|
|||
const u8 *src = GetSegmentPtr(i); |
|||
u8 *dst = Memory::GetPointer(writeAddr); |
|||
u32 srcSize = p->p_filesz; |
|||
u32 dstSize = p->p_memsz; |
|||
u32 *s = (u32*)src; |
|||
u32 *d = (u32*)dst; |
|||
for (int j = 0; j < (int)(srcSize + 3) / 4; j++) |
|||
{ |
|||
*d++ = /*_byteswap_ulong*/(*s++); |
|||
} |
|||
if (srcSize < dstSize) |
|||
{ |
|||
//memset(dst + srcSize, 0, dstSize-srcSize); //zero out bss
|
|||
} |
|||
INFO_LOG(MASTER_LOG,"Loadable Segment Copied to %08x, size %08x", writeAddr, p->p_memsz); |
|||
} |
|||
} |
|||
|
|||
|
|||
INFO_LOG(MASTER_LOG,"Done loading."); |
|||
return true; |
|||
} |
|||
|
|||
SectionID ElfReader::GetSectionByName(const char *name, int firstSection) const |
|||
{ |
|||
for (int i = firstSection; i < header->e_shnum; i++) |
|||
{ |
|||
const char *secname = GetSectionName(i); |
|||
|
|||
if (secname != nullptr && strcmp(name, secname) == 0) |
|||
return i; |
|||
} |
|||
return -1; |
|||
} |
|||
|
|||
bool ElfReader::LoadSymbols() |
|||
{ |
|||
bool hasSymbols = false; |
|||
SectionID sec = GetSectionByName(".symtab"); |
|||
if (sec != -1) |
|||
{ |
|||
int stringSection = sections[sec].sh_link; |
|||
const char *stringBase = (const char *)GetSectionDataPtr(stringSection); |
|||
|
|||
//We have a symbol table!
|
|||
Elf32_Sym *symtab = (Elf32_Sym *)(GetSectionDataPtr(sec)); |
|||
int numSymbols = sections[sec].sh_size / sizeof(Elf32_Sym); |
|||
for (int sym = 0; sym < numSymbols; sym++) |
|||
{ |
|||
int size = symtab[sym].st_size; |
|||
if (size == 0) |
|||
continue; |
|||
|
|||
// int bind = symtab[sym].st_info >> 4;
|
|||
int type = symtab[sym].st_info & 0xF; |
|||
|
|||
const char *name = stringBase + symtab[sym].st_name; |
|||
|
|||
Symbols::Add(symtab[sym].st_value, name, size, type); |
|||
|
|||
hasSymbols = true; |
|||
} |
|||
} |
|||
|
|||
return hasSymbols; |
|||
} |
|||
@ -1,75 +0,0 @@ |
|||
// Copyright 2013 Dolphin Emulator Project |
|||
// Licensed under GPLv2 |
|||
// Refer to the license.txt file included. |
|||
|
|||
#pragma once |
|||
|
|||
#include "core/loader/elf_types.h" |
|||
|
|||
enum KnownElfTypes |
|||
{ |
|||
KNOWNELF_PSP = 0, |
|||
KNOWNELF_DS = 1, |
|||
KNOWNELF_GBA = 2, |
|||
KNOWNELF_GC = 3, |
|||
}; |
|||
|
|||
typedef int SectionID; |
|||
|
|||
class ElfReader |
|||
{ |
|||
private: |
|||
char *base; |
|||
u32 *base32; |
|||
|
|||
Elf32_Ehdr *header; |
|||
Elf32_Phdr *segments; |
|||
Elf32_Shdr *sections; |
|||
|
|||
u32 *sectionAddrs; |
|||
bool bRelocate; |
|||
u32 entryPoint; |
|||
|
|||
public: |
|||
ElfReader(void *ptr); |
|||
~ElfReader() { } |
|||
|
|||
u32 Read32(int off) const { return base32[off>>2]; } |
|||
|
|||
// Quick accessors |
|||
ElfType GetType() const { return (ElfType)(header->e_type); } |
|||
ElfMachine GetMachine() const { return (ElfMachine)(header->e_machine); } |
|||
u32 GetEntryPoint() const { return entryPoint; } |
|||
u32 GetFlags() const { return (u32)(header->e_flags); } |
|||
bool LoadInto(u32 vaddr); |
|||
bool LoadSymbols(); |
|||
|
|||
int GetNumSegments() const { return (int)(header->e_phnum); } |
|||
int GetNumSections() const { return (int)(header->e_shnum); } |
|||
const u8 *GetPtr(int offset) const { return (u8*)base + offset; } |
|||
const char *GetSectionName(int section) const; |
|||
const u8 *GetSectionDataPtr(int section) const |
|||
{ |
|||
if (section < 0 || section >= header->e_shnum) |
|||
return nullptr; |
|||
if (sections[section].sh_type != SHT_NOBITS) |
|||
return GetPtr(sections[section].sh_offset); |
|||
else |
|||
return nullptr; |
|||
} |
|||
bool IsCodeSection(int section) const |
|||
{ |
|||
return sections[section].sh_type == SHT_PROGBITS; |
|||
} |
|||
const u8 *GetSegmentPtr(int segment) |
|||
{ |
|||
return GetPtr(segments[segment].p_offset); |
|||
} |
|||
u32 GetSectionAddr(SectionID section) const { return sectionAddrs[section]; } |
|||
int GetSectionSize(SectionID section) const { return sections[section].sh_size; } |
|||
SectionID GetSectionByName(const char *name, int firstSection = 0) const; //-1 for not found |
|||
|
|||
bool DidRelocate() { |
|||
return bRelocate; |
|||
} |
|||
}; |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue