diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 2efca27c2..c14d2d2f3 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -68,8 +68,6 @@ struct KernelCore::Impl { | |||
| 68 | 68 | ||
| 69 | global_object_list_container = std::make_unique<KAutoObjectWithListContainer>(kernel); | 69 | global_object_list_container = std::make_unique<KAutoObjectWithListContainer>(kernel); |
| 70 | global_scheduler_context = std::make_unique<Kernel::GlobalSchedulerContext>(kernel); | 70 | global_scheduler_context = std::make_unique<Kernel::GlobalSchedulerContext>(kernel); |
| 71 | global_handle_table = std::make_unique<Kernel::KHandleTable>(kernel); | ||
| 72 | global_handle_table->Initialize(KHandleTable::MaxTableSize); | ||
| 73 | 71 | ||
| 74 | is_phantom_mode_for_singlecore = false; | 72 | is_phantom_mode_for_singlecore = false; |
| 75 | 73 | ||
| @@ -121,9 +119,6 @@ struct KernelCore::Impl { | |||
| 121 | next_user_process_id = KProcess::ProcessIdMin; | 119 | next_user_process_id = KProcess::ProcessIdMin; |
| 122 | next_thread_id = 1; | 120 | next_thread_id = 1; |
| 123 | 121 | ||
| 124 | global_handle_table->Finalize(); | ||
| 125 | global_handle_table.reset(); | ||
| 126 | |||
| 127 | preemption_event = nullptr; | 122 | preemption_event = nullptr; |
| 128 | 123 | ||
| 129 | // Cleanup persistent kernel objects | 124 | // Cleanup persistent kernel objects |
| @@ -787,10 +782,6 @@ struct KernelCore::Impl { | |||
| 787 | 782 | ||
| 788 | std::shared_ptr<Core::Timing::EventType> preemption_event; | 783 | std::shared_ptr<Core::Timing::EventType> preemption_event; |
| 789 | 784 | ||
| 790 | // This is the kernel's handle table or supervisor handle table which | ||
| 791 | // stores all the objects in place. | ||
| 792 | std::unique_ptr<KHandleTable> global_handle_table; | ||
| 793 | |||
| 794 | std::unique_ptr<KAutoObjectWithListContainer> global_object_list_container; | 785 | std::unique_ptr<KAutoObjectWithListContainer> global_object_list_container; |
| 795 | 786 | ||
| 796 | std::unique_ptr<KObjectNameGlobalData> object_name_global_data; | 787 | std::unique_ptr<KObjectNameGlobalData> object_name_global_data; |
| @@ -877,10 +868,6 @@ KResourceLimit* KernelCore::GetSystemResourceLimit() { | |||
| 877 | return impl->system_resource_limit; | 868 | return impl->system_resource_limit; |
| 878 | } | 869 | } |
| 879 | 870 | ||
| 880 | KScopedAutoObject<KThread> KernelCore::RetrieveThreadFromGlobalHandleTable(Handle handle) const { | ||
| 881 | return impl->global_handle_table->GetObject<KThread>(handle); | ||
| 882 | } | ||
| 883 | |||
| 884 | void KernelCore::AppendNewProcess(KProcess* process) { | 871 | void KernelCore::AppendNewProcess(KProcess* process) { |
| 885 | impl->process_list.push_back(process); | 872 | impl->process_list.push_back(process); |
| 886 | } | 873 | } |
| @@ -1017,14 +1004,6 @@ u64 KernelCore::CreateNewUserProcessID() { | |||
| 1017 | return impl->next_user_process_id++; | 1004 | return impl->next_user_process_id++; |
| 1018 | } | 1005 | } |
| 1019 | 1006 | ||
| 1020 | KHandleTable& KernelCore::GlobalHandleTable() { | ||
| 1021 | return *impl->global_handle_table; | ||
| 1022 | } | ||
| 1023 | |||
| 1024 | const KHandleTable& KernelCore::GlobalHandleTable() const { | ||
| 1025 | return *impl->global_handle_table; | ||
| 1026 | } | ||
| 1027 | |||
| 1028 | void KernelCore::RegisterCoreThread(std::size_t core_id) { | 1007 | void KernelCore::RegisterCoreThread(std::size_t core_id) { |
| 1029 | impl->RegisterCoreThread(core_id); | 1008 | impl->RegisterCoreThread(core_id); |
| 1030 | } | 1009 | } |