ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing module loading.

This commit is contained in:
Ben Vanik 2015-08-29 19:35:43 -07:00
parent b7203c2989
commit 3508cce5b3
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/xenia/kernel/objects/xuser_module.cc
View File

@ -46,16 +46,8 @@ X_STATUS XUserModule::LoadFromFile(std::string path) {
return result; return result;
} }
ModuleFormat fmt;
auto magic = *(xe::be<uint32_t>*)mmap->data();
if (magic == 'XEX2') {
fmt = kModuleFormatXex;
} else if (magic == 0x7F454C46 /* 0x7F 'ELF' */) {
fmt = kModuleFormatElf;
}
// Load the module. // Load the module.
result = LoadFromMemory(mmap->data(), mmap->size(), fmt); result = LoadFromMemory(mmap->data(), mmap->size());
} else { } else {
std::vector<uint8_t> buffer(fs_entry->size()); std::vector<uint8_t> buffer(fs_entry->size());
@ -75,27 +67,27 @@ X_STATUS XUserModule::LoadFromFile(std::string path) {
return result; return result;
} }
ModuleFormat fmt;
uint32_t magic = *(uint32_t*)buffer.data();
if (magic == 'XEX2') {
fmt = kModuleFormatXex;
} else if (magic == 0x7F454C46 /* 0x7F 'ELF' */) {
fmt = kModuleFormatElf;
}
// Load the module. // Load the module.
result = LoadFromMemory(buffer.data(), bytes_read, fmt); result = LoadFromMemory(buffer.data(), bytes_read);
} }
return result; return result;
} }
X_STATUS XUserModule::LoadFromMemory(const void* addr, const size_t length, X_STATUS XUserModule::LoadFromMemory(const void* addr, const size_t length) {
ModuleFormat module_format) {
auto processor = kernel_state()->processor(); auto processor = kernel_state()->processor();
module_format_ = module_format;
if (module_format == kModuleFormatXex) { auto magic = xe::load_and_swap<uint32_t>(addr);
if (magic == 'XEX2') {
module_format_ = kModuleFormatXex;
} else if (magic == 0x7F454C46 /* 0x7F 'ELF' */) {
module_format_ = kModuleFormatElf;
} else {
XELOGE("Unknown module magic: %.8X", magic);
return X_STATUS_NOT_IMPLEMENTED;
}
if (module_format_ == kModuleFormatXex) {
// Prepare the module for execution. // Prepare the module for execution.
// Runtime takes ownership. // Runtime takes ownership.
auto xex_module = auto xex_module =
@ -127,7 +119,7 @@ X_STATUS XUserModule::LoadFromMemory(const void* addr, const size_t length,
this->xex_module()->GetOptHeader(XEX_HEADER_DEFAULT_STACK_SIZE, this->xex_module()->GetOptHeader(XEX_HEADER_DEFAULT_STACK_SIZE,
&stack_size_); &stack_size_);
dll_module_ = !!(header->module_flags & XEX_MODULE_DLL_MODULE); dll_module_ = !!(header->module_flags & XEX_MODULE_DLL_MODULE);
} else if (module_format == kModuleFormatElf) { } else if (module_format_ == kModuleFormatElf) {
auto elf_module = auto elf_module =
std::make_unique<cpu::ElfModule>(processor, kernel_state()); std::make_unique<cpu::ElfModule>(processor, kernel_state());
if (!elf_module->Load(name_, path_, addr, length)) { if (!elf_module->Load(name_, path_, addr, length)) {

3
src/xenia/kernel/objects/xuser_module.h
View File

@ -54,8 +54,7 @@ class XUserModule : public XModule {
uint32_t stack_size() const { return stack_size_; } uint32_t stack_size() const { return stack_size_; }
X_STATUS LoadFromFile(std::string path); X_STATUS LoadFromFile(std::string path);
X_STATUS LoadFromMemory(const void* addr, const size_t length, X_STATUS LoadFromMemory(const void* addr, const size_t length);
ModuleFormat module_type);
X_STATUS Unload(); X_STATUS Unload();
uint32_t GetProcAddressByOrdinal(uint16_t ordinal) override; uint32_t GetProcAddressByOrdinal(uint16_t ordinal) override;