Real modules and threads (mostly).
Need events/waiting to get proper launch thread behavior.
This commit is contained in:
@@ -25,22 +25,13 @@ Runtime::Runtime(xe_pal_ref pal, shared_ptr<cpu::Processor> processor,
|
||||
XEIGNORE(xestrcpy(command_line_, XECOUNT(command_line_), command_line));
|
||||
export_resolver_ = shared_ptr<ExportResolver>(new ExportResolver());
|
||||
|
||||
kernel_modules_.push_back(
|
||||
new xboxkrnl::XboxkrnlModule(pal_, memory_, export_resolver_));
|
||||
kernel_modules_.push_back(
|
||||
new xam::XamModule(pal_, memory_, export_resolver_));
|
||||
xboxkrnl_ = auto_ptr<xboxkrnl::XboxkrnlModule>(
|
||||
new xboxkrnl::XboxkrnlModule(this));
|
||||
xam_ = auto_ptr<xam::XamModule>(
|
||||
new xam::XamModule(this));
|
||||
}
|
||||
|
||||
Runtime::~Runtime() {
|
||||
for (std::map<const xechar_t*, UserModule*>::iterator it =
|
||||
user_modules_.begin(); it != user_modules_.end(); ++it) {
|
||||
delete it->second;
|
||||
}
|
||||
for (std::vector<KernelModule*>::iterator it = kernel_modules_.begin();
|
||||
it != kernel_modules_.end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
|
||||
xe_memory_release(memory_);
|
||||
xe_pal_release(pal_);
|
||||
}
|
||||
@@ -65,117 +56,6 @@ const xechar_t* Runtime::command_line() {
|
||||
return command_line_;
|
||||
}
|
||||
|
||||
int Runtime::LoadBinaryModule(const xechar_t* path, uint32_t start_address) {
|
||||
const xechar_t* name = xestrrchr(path, '/') + 1;
|
||||
|
||||
// TODO(benvanik): map file from filesystem
|
||||
xe_mmap_ref mmap = xe_mmap_open(pal_, kXEFileModeRead, path, 0, 0);
|
||||
if (!mmap) {
|
||||
return NULL;
|
||||
}
|
||||
void* addr = xe_mmap_get_addr(mmap);
|
||||
size_t length = xe_mmap_get_length(mmap);
|
||||
|
||||
int result_code = 1;
|
||||
|
||||
XEEXPECTZERO(xe_copy_memory(xe_memory_addr(memory_, start_address),
|
||||
xe_memory_get_length(memory_),
|
||||
addr, length));
|
||||
|
||||
// Prepare the module.
|
||||
char name_a[2048];
|
||||
XEEXPECTTRUE(xestrnarrow(name_a, XECOUNT(name_a), name));
|
||||
char path_a[2048];
|
||||
XEEXPECTTRUE(xestrnarrow(path_a, XECOUNT(path_a), path));
|
||||
XEEXPECTZERO(processor_->PrepareModule(
|
||||
name_a, path_a, start_address, start_address + length,
|
||||
export_resolver_));
|
||||
|
||||
result_code = 0;
|
||||
XECLEANUP:
|
||||
xe_mmap_release(mmap);
|
||||
return result_code;
|
||||
}
|
||||
|
||||
int Runtime::LoadModule(const xechar_t* path) {
|
||||
if (GetModule(path)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// TODO(benvanik): map file from filesystem
|
||||
xe_mmap_ref mmap = xe_mmap_open(pal_, kXEFileModeRead, path, 0, 0);
|
||||
if (!mmap) {
|
||||
return NULL;
|
||||
}
|
||||
void* addr = xe_mmap_get_addr(mmap);
|
||||
size_t length = xe_mmap_get_length(mmap);
|
||||
|
||||
UserModule* module = new UserModule(memory_);
|
||||
int result_code = module->Load(addr, length, path);
|
||||
|
||||
// TODO(benvanik): retain memory somehow? is it needed?
|
||||
xe_mmap_release(mmap);
|
||||
|
||||
if (result_code) {
|
||||
delete module;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Prepare the module.
|
||||
XEEXPECTZERO(processor_->PrepareModule(module, export_resolver_));
|
||||
|
||||
// Stash in modules list (takes reference).
|
||||
user_modules_.insert(std::pair<const xechar_t*, UserModule*>(path, module));
|
||||
|
||||
return 0;
|
||||
|
||||
XECLEANUP:
|
||||
delete module;
|
||||
return 1;
|
||||
}
|
||||
|
||||
void Runtime::LaunchModule(UserModule* user_module) {
|
||||
const xe_xex2_header_t *xex_header = user_module->xex_header();
|
||||
|
||||
// TODO(benvanik): set as main module/etc
|
||||
// xekXexExecutableModuleHandle = xe_module_get_handle(module);
|
||||
|
||||
// Setup the heap (and TLS?).
|
||||
// xex_header->exe_heap_size;
|
||||
|
||||
// Launch thread.
|
||||
// XHANDLE thread_handle;
|
||||
// XDWORD thread_id;
|
||||
// XBOOL result = xekExCreateThread(&thread_handle, xex_header->exe_stack_size, &thread_id, NULL, (void*)xex_header->exe_entry_point, NULL, 0);
|
||||
|
||||
// Wait until thread completes.
|
||||
// XLARGE_INTEGER timeout = XINFINITE;
|
||||
// xekNtWaitForSingleObjectEx(thread_handle, TRUE, &timeout);
|
||||
|
||||
// Simulate a thread.
|
||||
uint32_t stack_size = xex_header->exe_stack_size;
|
||||
if (stack_size < 16 * 1024 * 1024) {
|
||||
stack_size = 16 * 1024 * 1024;
|
||||
}
|
||||
ThreadState* thread_state = processor_->AllocThread(
|
||||
0x80000000, stack_size);
|
||||
|
||||
// Execute test.
|
||||
processor_->Execute(thread_state, xex_header->exe_entry_point);
|
||||
|
||||
processor_->DeallocThread(thread_state);
|
||||
}
|
||||
|
||||
UserModule* Runtime::GetModule(const xechar_t* path) {
|
||||
std::map<const xechar_t*, UserModule*>::iterator it =
|
||||
user_modules_.find(path);
|
||||
if (it != user_modules_.end()) {
|
||||
return it->second;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void Runtime::UnloadModule(UserModule* user_module) {
|
||||
// TODO(benvanik): unload module
|
||||
XEASSERTALWAYS();
|
||||
int Runtime::LaunchModule(const xechar_t* path) {
|
||||
return xboxkrnl_->LaunchModule(path);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user