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

Fixing undefined exports to error out right.

This commit is contained in:
Ben Vanik 2015-05-18 19:58:51 -07:00
parent 1c96941236
commit bb5466d7b2
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/xenia/cpu/xex_module.cc
View File

@ -175,9 +175,13 @@ bool XexModule::SetupLibraryImports(const xe_xex2_import_library_t* library) {
} else if (user_export_addr) { } else if (user_export_addr) {
xe::store_and_swap<uint32_t>(slot, user_export_addr); xe::store_and_swap<uint32_t>(slot, user_export_addr);
} else { } else {
// Nothing. // No module found.
XELOGE("kernel import not found: %.8X", info->value_address); XELOGE("kernel import not found: %s", name);
*slot = xe::byte_swap(0xF00DF00D); if (info->thunk_address) {
*slot = xe::byte_swap(info->thunk_address);
} else {
*slot = xe::byte_swap(0xF00DF00D);
}
} }
if (info->thunk_address) { if (info->thunk_address) {
@ -190,8 +194,20 @@ bool XexModule::SetupLibraryImports(const xe_xex2_import_library_t* library) {
info->ordinal); info->ordinal);
} }
// Kernel exports go up to the host shim functions if (user_export_addr) {
if (kernel_export) { // Rewrite PPC code to set r11 to the target address
// So we'll have:
// lis r11, user_export_addr
// ori r11, r11, user_export_addr
// mtspr CTR, r11
// bctr
uint16_t hi_addr = (user_export_addr >> 16) & 0xFFFF;
uint16_t low_addr = user_export_addr & 0xFFFF;
uint8_t* p = memory()->TranslateVirtual(info->thunk_address);
xe::store_and_swap<uint32_t>(p + 0x0, 0x3D600000 | hi_addr);
xe::store_and_swap<uint32_t>(p + 0x4, 0x616B0000 | low_addr);
} else {
// On load we have something like this in memory: // On load we have something like this in memory:
// li r3, 0 // li r3, 0
// li r4, 0x1F5 // li r4, 0x1F5
@ -229,19 +245,6 @@ bool XexModule::SetupLibraryImports(const xe_xex2_import_library_t* library) {
fn_info->set_name(name); fn_info->set_name(name);
fn_info->SetupExtern(handler, handler_data, NULL); fn_info->SetupExtern(handler, handler_data, NULL);
fn_info->set_status(SymbolInfo::STATUS_DECLARED); fn_info->set_status(SymbolInfo::STATUS_DECLARED);
} else if (user_export_addr) {
// Rewrite PPC code to set r11 to the target address
// So we'll have:
// lis r11, user_export_addr
// ori r11, r11, user_export_addr
// mtspr CTR, r11
// bctr
uint16_t hi_addr = (user_export_addr >> 16) & 0xFFFF;
uint16_t low_addr = user_export_addr & 0xFFFF;
uint8_t* p = memory()->TranslateVirtual(info->thunk_address);
xe::store_and_swap<uint32_t>(p + 0x0, 0x3D600000 | hi_addr);
xe::store_and_swap<uint32_t>(p + 0x4, 0x616B0000 | low_addr);
} }
} }
} }