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

Shuffling kernel util types to util/.

Browse Source
This commit is contained in:
Ben Vanik
2015-09-06 13:45:52 -07:00
parent 068b2056ca
commit 8588fbc6cf
9 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/kernel/kernel_state.cc
View File

@@ -61,8 +61,6 @@ KernelState::KernelState(Emulator* emulator)
content_root = xe::to_absolute_path(content_root);
content_manager_ = std::make_unique<ContentManager>(this, content_root);
object_table_ = new ObjectTable();
assert_null(shared_kernel_state_);
shared_kernel_state_ = this;
@@ -98,7 +96,7 @@ KernelState::~KernelState() {
kernel_modules_.clear();
// Delete all objects.
delete object_table_;
object_table_.Reset();
// Shutdown apps.
app_manager_.reset();
@@ -372,7 +370,7 @@ void KernelState::TerminateTitle(bool from_guest_thread) {
X_STATUS status = user_modules_[i]->Unload();
assert_true(XSUCCEEDED(status));
object_table_->RemoveHandle(user_modules_[i]->handle());
object_table_.RemoveHandle(user_modules_[i]->handle());
}
user_modules_.clear();