From 56ce363ac5841f77f051055c2465cbb9218738a2 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Fri, 15 Aug 2014 22:31:44 -0700
Subject: [PATCH] Removing export impl.

---
 src/xenia/export_resolver.cc       | 5 +----
 src/xenia/export_resolver.h        | 7 +------
 src/xenia/kernel/util/shim_utils.h | 3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/xenia/export_resolver.cc b/src/xenia/export_resolver.cc
index 8d37240e3..c311819b8 100644
--- a/src/xenia/export_resolver.cc
+++ b/src/xenia/export_resolver.cc
@@ -32,7 +32,6 @@ void ExportResolver::RegisterTable(
     exports[n].variable_ptr = 0;
     exports[n].function_data.shim_data = NULL;
     exports[n].function_data.shim = NULL;
-    exports[n].function_data.impl = NULL;
   }
 }
 
@@ -93,12 +92,10 @@ void ExportResolver::SetVariableMapping(const char* library_name,
 
 void ExportResolver::SetFunctionMapping(
     const char* library_name, const uint32_t ordinal,
-    void* shim_data, xe_kernel_export_shim_fn shim,
-    xe_kernel_export_impl_fn impl) {
+    void* shim_data, xe_kernel_export_shim_fn shim) {
   KernelExport* kernel_export = GetExportByOrdinal(library_name, ordinal);
   assert_not_null(kernel_export);
   kernel_export->is_implemented = true;
   kernel_export->function_data.shim_data = shim_data;
   kernel_export->function_data.shim = shim;
-  kernel_export->function_data.impl = impl;
 }
diff --git a/src/xenia/export_resolver.h b/src/xenia/export_resolver.h
index 487e8bd9c..50d328209 100644
--- a/src/xenia/export_resolver.h
+++ b/src/xenia/export_resolver.h
@@ -21,7 +21,6 @@ typedef struct xe_ppc_state xe_ppc_state_t;
 namespace xe {
 
 
-typedef void (*xe_kernel_export_impl_fn)();
 typedef void (*xe_kernel_export_shim_fn)(xe_ppc_state_t*, void*);
 
 class KernelExport {
@@ -52,9 +51,6 @@ public:
       // This is called directly from generated code.
       // It should parse args, do fixups, and call the impl.
       xe_kernel_export_shim_fn shim;
-
-      // Real function implementation.
-      xe_kernel_export_impl_fn impl;
     } function_data;
   };
 };
@@ -79,8 +75,7 @@ public:
   void SetVariableMapping(const char* library_name, const uint32_t ordinal,
                           uint32_t value);
   void SetFunctionMapping(const char* library_name, const uint32_t ordinal,
-                          void* shim_data, xe_kernel_export_shim_fn shim,
-                          xe_kernel_export_impl_fn impl);
+                          void* shim_data, xe_kernel_export_shim_fn shim);
 
 private:
   class ExportTable {
diff --git a/src/xenia/kernel/util/shim_utils.h b/src/xenia/kernel/util/shim_utils.h
index 7dfd948ff..ef44874ea 100644
--- a/src/xenia/kernel/util/shim_utils.h
+++ b/src/xenia/kernel/util/shim_utils.h
@@ -28,8 +28,7 @@ using PPCContext = alloy::frontend::ppc::PPCContext;
   export_resolver->SetFunctionMapping( \
       library_name, ordinals::##export_name, \
       shim_data, \
-      (xe_kernel_export_shim_fn)export_name##_shim, \
-      nullptr);
+      (xe_kernel_export_shim_fn)export_name##_shim);
 
 #define SHIM_MEM_BASE         ppc_state->membase
 #define SHIM_MEM_ADDR(a)      (a ? (ppc_state->membase + a) : nullptr)