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

Sprucing up some of alloy.

Browse Source
This commit is contained in:
Ben Vanik
2014-07-13 21:15:37 -07:00
parent 48425da8ff
commit 9437d0b564
40 changed files with 246 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/xenia/cpu/xex_module.h
View File

@@ -10,6 +10,8 @@
#ifndef XENIA_CPU_XEX_MODULE_H_
#define XENIA_CPU_XEX_MODULE_H_
#include <string>
#include <alloy/runtime/module.h>
#include <xenia/core.h>
#include <xenia/kernel/util/xex2.h>
@@ -28,11 +30,11 @@ public:
xe_xex2_ref xex() const { return xex_; }
int Load(const char* name, const char* path, xe_xex2_ref xex);
int Load(const std::string& name, const std::string& path, xe_xex2_ref xex);
virtual const char* name() const { return name_; }
const std::string& name() const override { return name_; }
virtual bool ContainsAddress(uint64_t address);
bool ContainsAddress(uint64_t address) override;
private:
int SetupImports(xe_xex2_ref xex);
@@ -41,13 +43,13 @@ private:
private:
XenonRuntime* runtime_;
char* name_;
char* path_;
xe_xex2_ref xex_;
std::string name_;
std::string path_;
xe_xex2_ref xex_;
uint64_t base_address_;
uint64_t low_address_;
uint64_t high_address_;
uint64_t base_address_;
uint64_t low_address_;
uint64_t high_address_;
};