diff options
| author | bunnei <bunneidev@gmail.com> | 2022-11-10 17:11:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 17:11:27 -0800 |
| commit | d05b183f2118a5e2c919c35023549f30201bdd7c (patch) | |
| tree | 082cf6bb2e372c3233872b836fa96bdc0c25f279 /src/core/hle/kernel | |
| parent | 83eb9cf7dabc7685215b423ffae9a650fa9a3f50 (diff) | |
| parent | cbaf642ffe4b05f8796798ebdc5c6892605928cc (diff) | |
Merge pull request #9198 from liamwhite/arm64
Initial ARM64 support
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/physical_core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/physical_core.cpp b/src/core/hle/kernel/physical_core.cpp index d4375962f..3044922ac 100644 --- a/src/core/hle/kernel/physical_core.cpp +++ b/src/core/hle/kernel/physical_core.cpp @@ -12,7 +12,7 @@ namespace Kernel { PhysicalCore::PhysicalCore(std::size_t core_index_, Core::System& system_, KScheduler& scheduler_) : core_index{core_index_}, system{system_}, scheduler{scheduler_} { -#ifdef ARCHITECTURE_x86_64 +#if defined(ARCHITECTURE_x86_64) || defined(ARCHITECTURE_arm64) // TODO(bunnei): Initialization relies on a core being available. We may later replace this with // a 32-bit instance of Dynarmic. This should be abstracted out to a CPU manager. auto& kernel = system.Kernel(); @@ -26,7 +26,7 @@ PhysicalCore::PhysicalCore(std::size_t core_index_, Core::System& system_, KSche PhysicalCore::~PhysicalCore() = default; void PhysicalCore::Initialize([[maybe_unused]] bool is_64_bit) { -#ifdef ARCHITECTURE_x86_64 +#if defined(ARCHITECTURE_x86_64) || defined(ARCHITECTURE_arm64) auto& kernel = system.Kernel(); if (!is_64_bit) { // We already initialized a 64-bit core, replace with a 32-bit one. |