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

Cleanup before kernel export refactor.

Browse Source
This commit is contained in:
Ben Vanik
2015-05-31 16:31:19 -07:00
parent fccab79a7a
commit 9c3d2b54fb
24 changed files with 2508 additions and 2502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/objects/xkernel_module.cc
View File

@@ -34,7 +34,7 @@ uint32_t XKernelModule::GetProcAddressByOrdinal(uint16_t ordinal) {
// Export (or its parent library) not found.
return 0;
}
if (export->type == cpu::KernelExport::ExportType::Variable) {
if (export->type == cpu::Export::Type::kVariable) {
if (export->variable_ptr) {
return export->variable_ptr;
} else {

12
src/xenia/kernel/objects/xuser_module.cc
View File

@@ -338,11 +338,11 @@ void XUserModule::Dump() {
const xe_xex2_import_info_t* info = &import_infos[m];
if (kernel_state_->IsKernelModule(library->name)) {
KernelExport* kernel_export =
auto kernel_export =
export_resolver->GetExportByOrdinal(library->name, info->ordinal);
if (kernel_export) {
known_count++;
if (kernel_export->is_implemented) {
if (kernel_export->is_implemented()) {
impl_count++;
} else {
unimpl_count++;
@@ -384,13 +384,13 @@ void XUserModule::Dump() {
const char* name = "UNKNOWN";
bool implemented = false;
KernelExport* kernel_export = nullptr;
Export* kernel_export = nullptr;
if (kernel_state_->IsKernelModule(library->name)) {
kernel_export =
export_resolver->GetExportByOrdinal(library->name, info->ordinal);
if (kernel_export) {
name = kernel_export->name;
implemented = kernel_export->is_implemented;
name = kernel_export->name.c_str();
implemented = kernel_export->is_implemented();
}
} else {
auto module = kernel_state_->GetModule(library->name);
@@ -399,7 +399,7 @@ void XUserModule::Dump() {
implemented = true;
}
}
if (kernel_export && kernel_export->type == KernelExport::Variable) {
if (kernel_export && kernel_export->type == Export::Type::kVariable) {
printf(" V %.8X %.3X (%3d) %s %s\n", info->value_address,
info->ordinal, info->ordinal, implemented ? " " : "!!", name);
} else if (info->thunk_address) {