Drop dependency on old-style xex2 headers

src/xenia/kernel/objects/xuser_module.h

@@ -13,15 +13,12 @@
 #include <string>
 
 #include "xenia/cpu/export_resolver.h"
+#include "xenia/cpu/xex_module.h"
 #include "xenia/kernel/objects/xmodule.h"
-#include "xenia/kernel/util/xex2.h"
+#include "xenia/kernel/util/xex2_info.h"
 #include "xenia/xbox.h"
 
 namespace xe {
-namespace cpu {
-class XexModule;
-}  // namespace cpu
-
 namespace kernel {
 
 class XUserModule : public XModule {
@@ -29,11 +26,15 @@ class XUserModule : public XModule {
   XUserModule(KernelState* kernel_state, const char* path);
   ~XUserModule() override;
 
-  const xe_xex2_header_t* xex_header();
   const xe::cpu::XexModule* xex_module() const {
     return reinterpret_cast<xe::cpu::XexModule*>(processor_module_);
   }
 
+  const xex2_header* xex_header() const { return xex_module()->xex_header(); }
+
+  uint32_t entry_point() const { return entry_point_; }
+  uint32_t stack_size() const { return stack_size_; }
+
   X_STATUS LoadFromFile(std::string path);
   X_STATUS LoadFromMemory(const void* addr, const size_t length);
 
@@ -42,6 +43,8 @@ class XUserModule : public XModule {
   X_STATUS GetSection(const char* name, uint32_t* out_section_data,
                       uint32_t* out_section_size) override;
 
+  X_STATUS GetOptHeader(xe_xex2_header_keys key, void** out_ptr);
+
   X_STATUS GetOptHeader(xe_xex2_header_keys key,
                         uint32_t* out_header_guest_ptr);
   static X_STATUS GetOptHeader(uint8_t* membase, const xex2_header* header,
@@ -53,8 +56,10 @@ class XUserModule : public XModule {
   void Dump();
 
  private:
-  xe_xex2_ref xex_;
   uint32_t guest_xex_header_;
+
+  uint32_t entry_point_;
+  uint32_t stack_size_;
 };
 
 }  // namespace kernel