ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre-sizing export tables.

This commit is contained in:
Ben Vanik 2015-06-03 22:40:23 -07:00
parent 5c41a8f0f9
commit bba530f628
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/kernel/xam_module.cc
View File

@ -35,12 +35,10 @@ XamModule::XamModule(Emulator* emulator, KernelState* kernel_state)
xam::RegisterVoiceExports(export_resolver_, kernel_state_); xam::RegisterVoiceExports(export_resolver_, kernel_state_);
} }
std::vector<xe::cpu::Export*> xam_exports; std::vector<xe::cpu::Export*> xam_exports(4096);
xe::cpu::Export* RegisterExport_xam(xe::cpu::Export* export) { xe::cpu::Export* RegisterExport_xam(xe::cpu::Export* export) {
if (xam_exports.size() <= export->ordinal) { assert_true(export->ordinal < xam_exports.size());
xam_exports.resize(xe::round_up(export->ordinal, 256));
}
xam_exports[export->ordinal] = export; xam_exports[export->ordinal] = export;
return export; return export;
} }
@ -56,9 +54,7 @@ void XamModule::RegisterExportTable(xe::cpu::ExportResolver* export_resolver) {
#include "xenia/kernel/util/export_table_post.inc" #include "xenia/kernel/util/export_table_post.inc"
for (size_t i = 0; i < xe::countof(xam_export_table); ++i) { for (size_t i = 0; i < xe::countof(xam_export_table); ++i) {
auto& export = xam_export_table[i]; auto& export = xam_export_table[i];
if (xam_exports.size() <= export.ordinal) { assert_true(export.ordinal < xam_exports.size());
xam_exports.resize(xe::round_up(export.ordinal, 256));
}
if (!xam_exports[export.ordinal]) { if (!xam_exports[export.ordinal]) {
xam_exports[export.ordinal] = &export; xam_exports[export.ordinal] = &export;
} }

10
src/xenia/kernel/xboxkrnl_module.cc
View File

@ -150,12 +150,10 @@ XboxkrnlModule::XboxkrnlModule(Emulator* emulator, KernelState* kernel_state)
WT_EXECUTEINTIMERTHREAD); WT_EXECUTEINTIMERTHREAD);
} }
std::vector<xe::cpu::Export*> xboxkrnl_exports; std::vector<xe::cpu::Export*> xboxkrnl_exports(4096);
xe::cpu::Export* RegisterExport_xboxkrnl(xe::cpu::Export* export) { xe::cpu::Export* RegisterExport_xboxkrnl(xe::cpu::Export* export) {
if (xboxkrnl_exports.size() <= export->ordinal) { assert_true(export->ordinal < xboxkrnl_exports.size());
xboxkrnl_exports.resize(xe::round_up(export->ordinal, 256));
}
xboxkrnl_exports[export->ordinal] = export; xboxkrnl_exports[export->ordinal] = export;
return export; return export;
} }
@ -172,9 +170,7 @@ void XboxkrnlModule::RegisterExportTable(
#include "xenia/kernel/util/export_table_post.inc" #include "xenia/kernel/util/export_table_post.inc"
for (size_t i = 0; i < xe::countof(xboxkrnl_export_table); ++i) { for (size_t i = 0; i < xe::countof(xboxkrnl_export_table); ++i) {
auto& export = xboxkrnl_export_table[i]; auto& export = xboxkrnl_export_table[i];
if (xboxkrnl_exports.size() <= export.ordinal) { assert_true(export.ordinal < xboxkrnl_exports.size());
xboxkrnl_exports.resize(xe::round_up(export.ordinal, 256));
}
if (!xboxkrnl_exports[export.ordinal]) { if (!xboxkrnl_exports[export.ordinal]) {
xboxkrnl_exports[export.ordinal] = &export; xboxkrnl_exports[export.ordinal] = &export;
} }