Allow new-style export registration.

src/xenia/kernel/xam_module.cc

@@ -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() {}

src/xenia/kernel/xam_module.h

@@ -23,7 +23,6 @@ class XamModule : public XKernelModule {
   virtual ~XamModule();
 
   static void RegisterExportTable(xe::cpu::ExportResolver* export_resolver);
-  static void RegisterExport(xe::cpu::Export* export);
 
  private:
 };

src/xenia/kernel/xam_private.h

@@ -18,6 +18,8 @@ namespace kernel {
 
 class KernelState;
 
+xe::cpu::Export* RegisterExport_xam(xe::cpu::Export* export);
+
 namespace xam {
 // Registration functions, one per file.
 void RegisterContentExports(xe::cpu::ExportResolver* export_resolver,

src/xenia/kernel/xboxkrnl_module.cc

@@ -149,22 +149,36 @@ XboxkrnlModule::XboxkrnlModule(Emulator* emulator, KernelState* kernel_state)
       WT_EXECUTEINTIMERTHREAD);
 }
 
+std::vector<xe::cpu::Export*> xboxkrnl_exports;
+
+xe::cpu::Export* RegisterExport_xboxkrnl(xe::cpu::Export* export) {
+  if (xboxkrnl_exports.size() <= export->ordinal) {
+    xboxkrnl_exports.resize(xe::round_up(export->ordinal, 256));
+  }
+  xboxkrnl_exports[export->ordinal] = export;
+  return export;
+}
+
 void XboxkrnlModule::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 xboxkrnl_export_table[] = {
 #include "xenia/kernel/xboxkrnl_table.inc"
   };
 #include "xenia/kernel/util/export_table_post.inc"
-  export_resolver->RegisterTable("xboxkrnl.exe", xboxkrnl_export_table,
-                                 xe::countof(xboxkrnl_export_table));
+  for (size_t i = 0; i < xe::countof(xboxkrnl_export_table); ++i) {
+    auto& export = xboxkrnl_export_table[i];
+    if (xboxkrnl_exports.size() <= export.ordinal) {
+      xboxkrnl_exports.resize(xe::round_up(export.ordinal, 256));
+    }
+    if (!xboxkrnl_exports[export.ordinal]) {
+      xboxkrnl_exports[export.ordinal] = &export;
+    }
+  }
+  export_resolver->RegisterTable("xboxkrnl.exe", &xboxkrnl_exports);
 }
 
 XboxkrnlModule::~XboxkrnlModule() {

src/xenia/kernel/xboxkrnl_module.h

@@ -28,7 +28,6 @@ class XboxkrnlModule : public XKernelModule {
   virtual ~XboxkrnlModule();
 
   static void RegisterExportTable(xe::cpu::ExportResolver* export_resolver);
-  static void RegisterExport(xe::cpu::Export* export);
 
   int LaunchModule(const char* path);
 

src/xenia/kernel/xboxkrnl_private.h

@@ -17,6 +17,8 @@ namespace kernel {
 
 class KernelState;
 
+xe::cpu::Export* RegisterExport_xboxkrnl(xe::cpu::Export* export);
+
 namespace xboxkrnl {
 // Registration functions, one per file.
 void RegisterAudioExports(xe::cpu::ExportResolver* export_resolver,