Allow new-style export registration.

This commit is contained in:
Ben Vanik
2015-05-31 17:54:44 -07:00
parent 08770a4ec0
commit ce3359389b
10 changed files with 69 additions and 35 deletions

View File

@@ -33,21 +33,35 @@ XamModule::XamModule(Emulator* emulator, KernelState* kernel_state)
xam::RegisterVoiceExports(export_resolver_, kernel_state_);
}
std::vector<xe::cpu::Export*> xam_exports;
xe::cpu::Export* RegisterExport_xam(xe::cpu::Export* export) {
if (xam_exports.size() <= export->ordinal) {
xam_exports.resize(xe::round_up(export->ordinal, 256));
}
xam_exports[export->ordinal] = export;
return export;
}
void XamModule::RegisterExportTable(xe::cpu::ExportResolver* export_resolver) {
assert_not_null(export_resolver);
if (!export_resolver) {
return;
}
// Build the export table used for resolution.
#include "xenia/kernel/util/export_table_pre.inc"
static xe::cpu::Export xam_export_table[] = {
#include "xenia/kernel/xam_table.inc"
};
#include "xenia/kernel/util/export_table_post.inc"
export_resolver->RegisterTable("xam.xex", xam_export_table,
xe::countof(xam_export_table));
for (size_t i = 0; i < xe::countof(xam_export_table); ++i) {
auto& export = xam_export_table[i];
if (xam_exports.size() <= export.ordinal) {
xam_exports.resize(xe::round_up(export.ordinal, 256));
}
if (!xam_exports[export.ordinal]) {
xam_exports[export.ordinal] = &export;
}
}
export_resolver->RegisterTable("xam.xex", &xam_exports);
}
XamModule::~XamModule() {}