fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Kernel] Enable XEX1 loading

Browse Source
This commit is contained in:
aerosoul
2019-10-28 13:59:30 -05:00
committed by Rick Gibbed
parent 03d5455a2f
commit bc8b629092
4 changed files with 75 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/user_module.cc
View File

@@ -135,7 +135,7 @@ X_STATUS UserModule::LoadFromMemory(const void* addr, const size_t length) {
auto processor = kernel_state()->processor();
auto magic = xe::load_and_swap<uint32_t>(addr);
if (magic == 'XEX2') {
if (magic == 'XEX2' || magic == 'XEX1') {
module_format_ = kModuleFormatXex;
} else if (magic == 0x7F454C46 /* 0x7F 'ELF' */) {
module_format_ = kModuleFormatElf;

17
src/xenia/kernel/util/xex2_info.h
View File

@@ -544,6 +544,23 @@ struct xex2_security_info {
xex2_page_descriptor page_descriptors[1]; // 0x184
};
struct xex1_security_info {
xe::be<uint32_t> header_size;
xe::be<uint32_t> image_size;
char rsa_signature[0x100];
char image_digest[0x14];
char import_table_digest[0x14];
xe::be<uint32_t> load_address;
char aes_key[0x10];
char xgd2_media_id[0x10];
xe::be<uint32_t> region;
xe::be<uint32_t> image_flags;
xe::be<uint32_t> export_table;
xe::be<uint32_t> allowed_media_types;
xe::be<uint32_t> page_descriptor_count;
xex2_page_descriptor page_descriptors[1];
};
struct xex2_export_table {
xe::be<uint32_t> magic[3]; // 0x0
xe::be<uint32_t> modulenumber[2]; // 0xC