diff options
author | Lioncash <mathew1800@gmail.com> | 2020-11-04 01:54:53 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-11-04 02:22:05 +0100 |
commit | fc6db97a09e2de5eff10131ddcab9cf8fb2f736c (patch) | |
tree | 32a7b408286eb84360bcaff2961dbaa874f5a5d3 /src/core/hle/kernel/thread.cpp | |
parent | Merge pull request #4887 from lioncash/common-build (diff) | |
download | yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.gz yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.bz2 yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.lz yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.xz yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.tar.zst yuzu-fc6db97a09e2de5eff10131ddcab9cf8fb2f736c.zip |
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index d132aba34..da0cb26b6 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -13,7 +13,6 @@ #include "common/logging/log.h" #include "common/thread_queue_list.h" #include "core/arm/arm_interface.h" -#include "core/arm/unicorn/arm_unicorn.h" #include "core/core.h" #include "core/cpu_manager.h" #include "core/hardware_properties.h" @@ -217,8 +216,7 @@ ResultVal<std::shared_ptr<Thread>> Thread::Create(Core::System& system, ThreadTy } else { thread->tls_address = 0; } - // TODO(peachum): move to ScheduleThread() when scheduler is added so selected core is used - // to initialize the context + thread->arm_interface.reset(); if ((type_flags & THREADTYPE_HLE) == 0) { #ifdef ARCHITECTURE_x86_64 @@ -231,19 +229,10 @@ ResultVal<std::shared_ptr<Thread>> Thread::Create(Core::System& system, ThreadTy system, kernel.Interrupts(), kernel.IsMulticore(), kernel.GetExclusiveMonitor(), processor_id); } - #else - if (owner_process && !owner_process->Is64BitProcess()) { - thread->arm_interface = std::make_shared<Core::ARM_Unicorn>( - system, kernel.Interrupts(), kernel.IsMulticore(), ARM_Unicorn::Arch::AArch32, - processor_id); - } else { - thread->arm_interface = std::make_shared<Core::ARM_Unicorn>( - system, kernel.Interrupts(), kernel.IsMulticore(), ARM_Unicorn::Arch::AArch64, - processor_id); - } - LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); +#error Platform not supported yet. #endif + ResetThreadContext32(thread->context_32, static_cast<u32>(stack_top), static_cast<u32>(entry_point), static_cast<u32>(arg)); ResetThreadContext64(thread->context_64, stack_top, entry_point, arg); |