From 103122ab4c2580910d0711b4a0b418edc0531e37 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 14 Feb 2020 18:22:55 -0800 Subject: [PATCH] kern: kern::arm64 -> kern::arch::arm64 --- .../arm64/init/kern_k_init_page_table.hpp | 2 +- .../mesosphere/arch/arm64/kern_cpu.hpp | 2 +- .../arch/arm64/kern_cpu_system_registers.hpp | 2 +- .../mesosphere/arch/arm64/kern_k_debug.hpp | 2 +- .../arch/arm64/kern_k_exception_context.hpp | 2 +- .../arch/arm64/kern_k_hardware_timer.hpp | 2 +- .../arm64/kern_k_interrupt_controller.hpp | 2 +- .../arch/arm64/kern_k_interrupt_manager.hpp | 2 +- .../arch/arm64/kern_k_interrupt_name.hpp | 2 +- .../arch/arm64/kern_k_page_table.hpp | 2 +- .../arch/arm64/kern_k_page_table_entry.hpp | 2 +- .../arch/arm64/kern_k_page_table_impl.hpp | 2 +- .../arch/arm64/kern_k_process_page_table.hpp | 2 +- .../arch/arm64/kern_k_spin_lock.hpp | 2 +- .../arm64/kern_k_supervisor_page_table.hpp | 2 +- .../arch/arm64/kern_k_thread_context.hpp | 2 +- .../arm64/kern_userspace_memory_access.hpp | 2 +- .../init/kern_init_page_table_select.hpp | 6 ++-- .../mesosphere/kern_k_exception_context.hpp | 2 +- .../include/mesosphere/kern_k_spin_lock.hpp | 6 ++-- .../mesosphere/kern_k_thread_context.hpp | 2 +- .../include/mesosphere/kern_kernel.hpp | 4 +-- .../include/mesosphere/kern_select_cpu.hpp | 2 +- .../include/mesosphere/kern_select_debug.hpp | 2 +- .../mesosphere/kern_select_hardware_timer.hpp | 2 +- .../kern_select_interrupt_controller.hpp | 2 +- .../kern_select_interrupt_manager.hpp | 2 +- .../mesosphere/kern_select_interrupt_name.hpp | 2 +- .../mesosphere/kern_select_page_table.hpp | 6 ++-- .../kern_select_page_table_impl.hpp | 2 +- libmesosphere/source/arch/arm64/kern_cpu.cpp | 2 +- .../source/arch/arm64/kern_cpu_asm.s | 20 ++++++------- .../arch/arm64/kern_exception_handlers.cpp | 2 +- .../arch/arm64/kern_k_hardware_timer.cpp | 2 +- .../arm64/kern_k_interrupt_controller.cpp | 2 +- .../arch/arm64/kern_k_interrupt_manager.cpp | 2 +- .../source/arch/arm64/kern_k_page_table.cpp | 2 +- .../arch/arm64/kern_k_page_table_impl.cpp | 2 +- .../arm64/kern_k_supervisor_page_table.cpp | 2 +- .../arch/arm64/kern_k_thread_context.cpp | 6 ++-- .../arch/arm64/svc/kern_svc_handlers_asm.s | 28 +++++++++---------- 41 files changed, 72 insertions(+), 72 deletions(-) diff --git a/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_page_table.hpp b/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_page_table.hpp index 330ce9c5..bfa6528c 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_page_table.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/init/kern_k_init_page_table.hpp @@ -20,7 +20,7 @@ #include #include -namespace ams::kern::arm64::init { +namespace ams::kern::arch::arm64::init { class KInitialPageTable { public: diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_cpu.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_cpu.hpp index 136f06f3..1ae915f1 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_cpu.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_cpu.hpp @@ -17,7 +17,7 @@ #include #include -namespace ams::kern::arm64::cpu { +namespace ams::kern::arch::arm64::cpu { #if defined(ATMOSPHERE_CPU_ARM_CORTEX_A57) || defined(ATMOSPHERE_CPU_ARM_CORTEX_A53) constexpr inline size_t InstructionCacheLineSize = 0x40; diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_cpu_system_registers.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_cpu_system_registers.hpp index cf7ca4b9..7912bea3 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_cpu_system_registers.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_cpu_system_registers.hpp @@ -16,7 +16,7 @@ #pragma once #include -namespace ams::kern::arm64::cpu { +namespace ams::kern::arch::arm64::cpu { #define MESOSPHERE_CPU_GET_SYSREG(name) \ ({ \ diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_debug.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_debug.hpp index fccf30c8..8bf3c8f6 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_debug.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_debug.hpp @@ -25,7 +25,7 @@ namespace ams::kern { } -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { class KDebug final : public KAutoObjectWithSlabHeapAndContainer { MESOSPHERE_AUTOOBJECT_TRAITS(KDebug, KSynchronizationObject); diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_exception_context.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_exception_context.hpp index 71474108..9d99e334 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_exception_context.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_exception_context.hpp @@ -16,7 +16,7 @@ #pragma once #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { struct KExceptionContext { u64 x[(30 - 0) + 1]; diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp index 9b9ee533..f69e5589 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_hardware_timer.hpp @@ -17,7 +17,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { namespace impl { diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_controller.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_controller.hpp index 14f054de..6467333d 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_controller.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_controller.hpp @@ -18,7 +18,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { struct GicDistributor { u32 ctlr; diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_manager.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_manager.hpp index 26e5cc70..c6c0d1d4 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_manager.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_manager.hpp @@ -20,7 +20,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { class KInterruptManager { NON_COPYABLE(KInterruptManager); diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_name.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_name.hpp index abadf78f..5902b11d 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_name.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_interrupt_name.hpp @@ -15,7 +15,7 @@ */ #pragma once -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { namespace interrupt_name { diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table.hpp index c0911554..fdf59b81 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table.hpp @@ -20,7 +20,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { class KPageTable : public KPageTableBase { NON_COPYABLE(KPageTable); diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_entry.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_entry.hpp index 74e7c7e1..5a4e88dc 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_entry.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_entry.hpp @@ -18,7 +18,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { constexpr size_t L1BlockSize = 1_GB; constexpr size_t L2BlockSize = 2_MB; diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_impl.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_impl.hpp index 6ed2e211..113c4777 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_impl.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table_impl.hpp @@ -20,7 +20,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { /* TODO: This seems worse than KInitialPageTable. Can we fulfill Nintendo's API using KInitialPageTable? */ /* KInitialPageTable is significantly nicer, but doesn't have KPageTableImpl's traversal semantics. */ diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_process_page_table.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_process_page_table.hpp index 78ca5372..54a2164a 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_process_page_table.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_process_page_table.hpp @@ -17,7 +17,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { class KProcessPageTable { diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_spin_lock.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_spin_lock.hpp index 303a3702..909d504b 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_spin_lock.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_spin_lock.hpp @@ -17,7 +17,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { class KNotAlignedSpinLock { private: diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_supervisor_page_table.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_supervisor_page_table.hpp index e79faf6c..c3306968 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_supervisor_page_table.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_supervisor_page_table.hpp @@ -18,7 +18,7 @@ #include #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { class KSupervisorPageTable { private: diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_k_thread_context.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_k_thread_context.hpp index c257879d..6d950d70 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_k_thread_context.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_k_thread_context.hpp @@ -23,7 +23,7 @@ namespace ams::kern { } -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { class KThreadContext { public: diff --git a/libmesosphere/include/mesosphere/arch/arm64/kern_userspace_memory_access.hpp b/libmesosphere/include/mesosphere/arch/arm64/kern_userspace_memory_access.hpp index 5bd1d8d3..20627eda 100644 --- a/libmesosphere/include/mesosphere/arch/arm64/kern_userspace_memory_access.hpp +++ b/libmesosphere/include/mesosphere/arch/arm64/kern_userspace_memory_access.hpp @@ -16,7 +16,7 @@ #pragma once #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { void UserspaceMemoryAccessFunctionAreaBegin(); diff --git a/libmesosphere/include/mesosphere/init/kern_init_page_table_select.hpp b/libmesosphere/include/mesosphere/init/kern_init_page_table_select.hpp index 7a22b33c..aa9cb5df 100644 --- a/libmesosphere/include/mesosphere/init/kern_init_page_table_select.hpp +++ b/libmesosphere/include/mesosphere/init/kern_init_page_table_select.hpp @@ -20,9 +20,9 @@ #include namespace ams::kern::init { - using ams::kern::arm64::PageTableEntry; - using ams::kern::arm64::init::KInitialPageTable; - using ams::kern::arm64::init::KInitialPageAllocator; + using ams::kern::arch::arm64::PageTableEntry; + using ams::kern::arch::arm64::init::KInitialPageTable; + using ams::kern::arch::arm64::init::KInitialPageAllocator; } #else #error "Unknown architecture for KInitialPageTable" diff --git a/libmesosphere/include/mesosphere/kern_k_exception_context.hpp b/libmesosphere/include/mesosphere/kern_k_exception_context.hpp index 3edace7d..aceefcd8 100644 --- a/libmesosphere/include/mesosphere/kern_k_exception_context.hpp +++ b/libmesosphere/include/mesosphere/kern_k_exception_context.hpp @@ -19,7 +19,7 @@ #include namespace ams::kern { - using ams::kern::arm64::KExceptionContext; + using ams::kern::arch::arm64::KExceptionContext; } #else #error "Unknown board for KExceptionContext" diff --git a/libmesosphere/include/mesosphere/kern_k_spin_lock.hpp b/libmesosphere/include/mesosphere/kern_k_spin_lock.hpp index 3dec44cd..ce8fcb3b 100644 --- a/libmesosphere/include/mesosphere/kern_k_spin_lock.hpp +++ b/libmesosphere/include/mesosphere/kern_k_spin_lock.hpp @@ -21,9 +21,9 @@ #include namespace ams::kern { - using ams::kern::arm64::KAlignedSpinLock; - using ams::kern::arm64::KNotAlignedSpinLock; - using ams::kern::arm64::KSpinLock; + using ams::kern::arch::arm64::KAlignedSpinLock; + using ams::kern::arch::arm64::KNotAlignedSpinLock; + using ams::kern::arch::arm64::KSpinLock; } #else diff --git a/libmesosphere/include/mesosphere/kern_k_thread_context.hpp b/libmesosphere/include/mesosphere/kern_k_thread_context.hpp index e6c695c1..a675d518 100644 --- a/libmesosphere/include/mesosphere/kern_k_thread_context.hpp +++ b/libmesosphere/include/mesosphere/kern_k_thread_context.hpp @@ -19,7 +19,7 @@ #include namespace ams::kern { - using ams::kern::arm64::KThreadContext; + using ams::kern::arch::arm64::KThreadContext; } #else #error "Unknown board for KThreadContext" diff --git a/libmesosphere/include/mesosphere/kern_kernel.hpp b/libmesosphere/include/mesosphere/kern_kernel.hpp index 8f12783c..29c5a0a2 100644 --- a/libmesosphere/include/mesosphere/kern_kernel.hpp +++ b/libmesosphere/include/mesosphere/kern_kernel.hpp @@ -39,10 +39,10 @@ namespace ams::kern { #if defined(ATMOSPHERE_ARCH_ARM64) - namespace arm64 { + namespace arch::arm64 { class KSupervisorPageTable; } - using ams::kern::arm64::KSupervisorPageTable; + using ams::kern::arch::arm64::KSupervisorPageTable; #else diff --git a/libmesosphere/include/mesosphere/kern_select_cpu.hpp b/libmesosphere/include/mesosphere/kern_select_cpu.hpp index aec84c58..276ed143 100644 --- a/libmesosphere/include/mesosphere/kern_select_cpu.hpp +++ b/libmesosphere/include/mesosphere/kern_select_cpu.hpp @@ -21,7 +21,7 @@ namespace ams::kern::cpu { - using namespace ams::kern::arm64::cpu; + using namespace ams::kern::arch::arm64::cpu; } diff --git a/libmesosphere/include/mesosphere/kern_select_debug.hpp b/libmesosphere/include/mesosphere/kern_select_debug.hpp index ba18f445..607c43db 100644 --- a/libmesosphere/include/mesosphere/kern_select_debug.hpp +++ b/libmesosphere/include/mesosphere/kern_select_debug.hpp @@ -20,7 +20,7 @@ #include namespace ams::kern { - using ams::kern::arm64::KDebug; + using ams::kern::arch::arm64::KDebug; } #else diff --git a/libmesosphere/include/mesosphere/kern_select_hardware_timer.hpp b/libmesosphere/include/mesosphere/kern_select_hardware_timer.hpp index bf5fedd7..e9c04cec 100644 --- a/libmesosphere/include/mesosphere/kern_select_hardware_timer.hpp +++ b/libmesosphere/include/mesosphere/kern_select_hardware_timer.hpp @@ -20,7 +20,7 @@ #include namespace ams::kern { - using ams::kern::arm64::KHardwareTimer; + using ams::kern::arch::arm64::KHardwareTimer; } #else diff --git a/libmesosphere/include/mesosphere/kern_select_interrupt_controller.hpp b/libmesosphere/include/mesosphere/kern_select_interrupt_controller.hpp index 4db18584..605fa3fc 100644 --- a/libmesosphere/include/mesosphere/kern_select_interrupt_controller.hpp +++ b/libmesosphere/include/mesosphere/kern_select_interrupt_controller.hpp @@ -21,7 +21,7 @@ #include namespace ams::kern { - using ams::kern::arm64::KInterruptController; + using ams::kern::arch::arm64::KInterruptController; } #else diff --git a/libmesosphere/include/mesosphere/kern_select_interrupt_manager.hpp b/libmesosphere/include/mesosphere/kern_select_interrupt_manager.hpp index 4eb85bdc..53790958 100644 --- a/libmesosphere/include/mesosphere/kern_select_interrupt_manager.hpp +++ b/libmesosphere/include/mesosphere/kern_select_interrupt_manager.hpp @@ -21,7 +21,7 @@ #include namespace ams::kern { - using ams::kern::arm64::KInterruptManager; + using ams::kern::arch::arm64::KInterruptManager; } #else diff --git a/libmesosphere/include/mesosphere/kern_select_interrupt_name.hpp b/libmesosphere/include/mesosphere/kern_select_interrupt_name.hpp index 45df006a..8be3a7b4 100644 --- a/libmesosphere/include/mesosphere/kern_select_interrupt_name.hpp +++ b/libmesosphere/include/mesosphere/kern_select_interrupt_name.hpp @@ -20,7 +20,7 @@ #include namespace ams::kern { - using namespace ams::kern::arm64::interrupt_name; + using namespace ams::kern::arch::arm64::interrupt_name; } #else diff --git a/libmesosphere/include/mesosphere/kern_select_page_table.hpp b/libmesosphere/include/mesosphere/kern_select_page_table.hpp index 694f32d1..28210ff3 100644 --- a/libmesosphere/include/mesosphere/kern_select_page_table.hpp +++ b/libmesosphere/include/mesosphere/kern_select_page_table.hpp @@ -22,9 +22,9 @@ #include #include namespace ams::kern { - using ams::kern::arm64::KPageTable; - using ams::kern::arm64::KSupervisorPageTable; - using ams::kern::arm64::KProcessPageTable; + using ams::kern::arch::arm64::KPageTable; + using ams::kern::arch::arm64::KSupervisorPageTable; + using ams::kern::arch::arm64::KProcessPageTable; } #else diff --git a/libmesosphere/include/mesosphere/kern_select_page_table_impl.hpp b/libmesosphere/include/mesosphere/kern_select_page_table_impl.hpp index 90f4c33e..4d6858b0 100644 --- a/libmesosphere/include/mesosphere/kern_select_page_table_impl.hpp +++ b/libmesosphere/include/mesosphere/kern_select_page_table_impl.hpp @@ -20,7 +20,7 @@ #include namespace ams::kern { - using ams::kern::arm64::KPageTableImpl; + using ams::kern::arch::arm64::KPageTableImpl; } #else diff --git a/libmesosphere/source/arch/arm64/kern_cpu.cpp b/libmesosphere/source/arch/arm64/kern_cpu.cpp index c2ddc5ed..25afa811 100644 --- a/libmesosphere/source/arch/arm64/kern_cpu.cpp +++ b/libmesosphere/source/arch/arm64/kern_cpu.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64::cpu { +namespace ams::kern::arch::arm64::cpu { /* Declare prototype to be implemented in asm. */ void SynchronizeAllCoresImpl(s32 *sync_var, s32 num_cores); diff --git a/libmesosphere/source/arch/arm64/kern_cpu_asm.s b/libmesosphere/source/arch/arm64/kern_cpu_asm.s index 4adb36b2..e3f2f8b4 100644 --- a/libmesosphere/source/arch/arm64/kern_cpu_asm.s +++ b/libmesosphere/source/arch/arm64/kern_cpu_asm.s @@ -14,11 +14,11 @@ * along with this program. If not, see . */ -/* ams::kern::arm64::cpu::SynchronizeAllCoresImpl(int *sync_var, int num_cores) */ -.section .text._ZN3ams4kern5arm643cpu23SynchronizeAllCoresImplEPii, "ax", %progbits -.global _ZN3ams4kern5arm643cpu23SynchronizeAllCoresImplEPii -.type _ZN3ams4kern5arm643cpu23SynchronizeAllCoresImplEPii, %function -_ZN3ams4kern5arm643cpu23SynchronizeAllCoresImplEPii: +/* ams::kern::arch::arm64::cpu::SynchronizeAllCoresImpl(int *sync_var, int num_cores) */ +.section .text._ZN3ams4kern4arch5arm643cpu23SynchronizeAllCoresImplEPii, "ax", %progbits +.global _ZN3ams4kern4arch5arm643cpu23SynchronizeAllCoresImplEPii +.type _ZN3ams4kern4arch5arm643cpu23SynchronizeAllCoresImplEPii, %function +_ZN3ams4kern4arch5arm643cpu23SynchronizeAllCoresImplEPii: /* Loop until the sync var is less than num cores. */ sevl 1: @@ -63,11 +63,11 @@ _ZN3ams4kern5arm643cpu23SynchronizeAllCoresImplEPii: ret -/* ams::kern::arm64::cpu::ClearPageToZero(void *) */ -.section .text._ZN3ams4kern5arm643cpu19ClearPageToZeroImplEPv, "ax", %progbits -.global _ZN3ams4kern5arm643cpu19ClearPageToZeroImplEPv -.type _ZN3ams4kern5arm643cpu19ClearPageToZeroImplEPv, %function -_ZN3ams4kern5arm643cpu19ClearPageToZeroImplEPv: +/* ams::kern::arch::arm64::cpu::ClearPageToZero(void *) */ +.section .text._ZN3ams4kern4arch5arm643cpu19ClearPageToZeroImplEPv, "ax", %progbits +.global _ZN3ams4kern4arch5arm643cpu19ClearPageToZeroImplEPv +.type _ZN3ams4kern4arch5arm643cpu19ClearPageToZeroImplEPv, %function +_ZN3ams4kern4arch5arm643cpu19ClearPageToZeroImplEPv: /* Efficiently clear the page using dc zva. */ dc zva, x0 add x8, x0, #0x040 diff --git a/libmesosphere/source/arch/arm64/kern_exception_handlers.cpp b/libmesosphere/source/arch/arm64/kern_exception_handlers.cpp index 0ae846a3..d284e398 100644 --- a/libmesosphere/source/arch/arm64/kern_exception_handlers.cpp +++ b/libmesosphere/source/arch/arm64/kern_exception_handlers.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { namespace { diff --git a/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp b/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp index 5b50195d..5a163075 100644 --- a/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp +++ b/libmesosphere/source/arch/arm64/kern_k_hardware_timer.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { namespace impl { diff --git a/libmesosphere/source/arch/arm64/kern_k_interrupt_controller.cpp b/libmesosphere/source/arch/arm64/kern_k_interrupt_controller.cpp index 244395ac..5cce0c31 100644 --- a/libmesosphere/source/arch/arm64/kern_k_interrupt_controller.cpp +++ b/libmesosphere/source/arch/arm64/kern_k_interrupt_controller.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { void KInterruptController::SetupInterruptLines(s32 core_id) const { const size_t ITLines = (core_id == 0) ? 32 * ((this->gicd->typer & 0x1F) + 1) : NumLocalInterrupts; diff --git a/libmesosphere/source/arch/arm64/kern_k_interrupt_manager.cpp b/libmesosphere/source/arch/arm64/kern_k_interrupt_manager.cpp index b9631e2c..3b866be8 100644 --- a/libmesosphere/source/arch/arm64/kern_k_interrupt_manager.cpp +++ b/libmesosphere/source/arch/arm64/kern_k_interrupt_manager.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { /* Instantiate static members in specific translation unit. */ KSpinLock KInterruptManager::s_lock; diff --git a/libmesosphere/source/arch/arm64/kern_k_page_table.cpp b/libmesosphere/source/arch/arm64/kern_k_page_table.cpp index 5add50a5..581daef3 100644 --- a/libmesosphere/source/arch/arm64/kern_k_page_table.cpp +++ b/libmesosphere/source/arch/arm64/kern_k_page_table.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { void KPageTable::Initialize(s32 core_id) { /* Nothing actually needed here. */ diff --git a/libmesosphere/source/arch/arm64/kern_k_page_table_impl.cpp b/libmesosphere/source/arch/arm64/kern_k_page_table_impl.cpp index f27562bc..a97266d3 100644 --- a/libmesosphere/source/arch/arm64/kern_k_page_table_impl.cpp +++ b/libmesosphere/source/arch/arm64/kern_k_page_table_impl.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { void KPageTableImpl::InitializeForKernel(void *tb, KVirtualAddress start, KVirtualAddress end) { this->table = static_cast(tb); diff --git a/libmesosphere/source/arch/arm64/kern_k_supervisor_page_table.cpp b/libmesosphere/source/arch/arm64/kern_k_supervisor_page_table.cpp index 60a27ea6..7539cb04 100644 --- a/libmesosphere/source/arch/arm64/kern_k_supervisor_page_table.cpp +++ b/libmesosphere/source/arch/arm64/kern_k_supervisor_page_table.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { void KSupervisorPageTable::Initialize(s32 core_id) { /* Get the identity mapping ttbr0. */ diff --git a/libmesosphere/source/arch/arm64/kern_k_thread_context.cpp b/libmesosphere/source/arch/arm64/kern_k_thread_context.cpp index 08bf9991..327a588a 100644 --- a/libmesosphere/source/arch/arm64/kern_k_thread_context.cpp +++ b/libmesosphere/source/arch/arm64/kern_k_thread_context.cpp @@ -15,7 +15,7 @@ */ #include -namespace ams::kern::arm64 { +namespace ams::kern::arch::arm64 { /* These are implemented elsewhere (asm). */ void UserModeThreadStarter(); @@ -96,7 +96,7 @@ namespace ams::kern::arm64 { /* Determine LR and SP. */ if (is_user) { /* Usermode thread. */ - this->lr = reinterpret_cast(::ams::kern::arm64::UserModeThreadStarter); + this->lr = reinterpret_cast(::ams::kern::arch::arm64::UserModeThreadStarter); this->sp = SetupStackForUserModeThreadStarter(u_pc, k_sp, u_sp, arg, is_64_bit); } else { /* Kernel thread. */ @@ -108,7 +108,7 @@ namespace ams::kern::arm64 { this->sp = GetInteger(k_sp); } else { /* Generic Kernel thread. */ - this->lr = reinterpret_cast(::ams::kern::arm64::SupervisorModeThreadStarter); + this->lr = reinterpret_cast(::ams::kern::arch::arm64::SupervisorModeThreadStarter); this->sp = SetupStackForSupervisorModeThreadStarter(u_pc, k_sp, arg); } } diff --git a/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s b/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s index dc037f36..b3106e0b 100644 --- a/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s +++ b/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s @@ -14,11 +14,11 @@ * along with this program. If not, see . */ -/* ams::kern::arm64::SvcHandler64() */ -.section .text._ZN3ams4kern5arm6412SvcHandler64Ev, "ax", %progbits -.global _ZN3ams4kern5arm6412SvcHandler64Ev -.type _ZN3ams4kern5arm6412SvcHandler64Ev, %function -_ZN3ams4kern5arm6412SvcHandler64Ev: +/* ams::kern::arch::arm64::SvcHandler64() */ +.section .text._ZN3ams4kern4arch5arm6412SvcHandler64Ev, "ax", %progbits +.global _ZN3ams4kern4arch5arm6412SvcHandler64Ev +.type _ZN3ams4kern4arch5arm6412SvcHandler64Ev, %function +_ZN3ams4kern4arch5arm6412SvcHandler64Ev: /* Create a KExceptionContext for the exception. */ sub sp, sp, #0x120 @@ -126,10 +126,10 @@ _ZN3ams4kern5arm6412SvcHandler64Ev: stp x26, x27, [sp, #(8 * 26)] stp x28, x29, [sp, #(8 * 28)] - /* Call ams::kern::arm64::HandleException(ams::kern::arm64::KExceptionContext *) */ + /* Call ams::kern::arch::arm64::HandleException(ams::kern::arch::arm64::KExceptionContext *) */ mrs x18, tpidr_el1 mov x0, sp - bl _ZN3ams4kern5arm6415HandleExceptionEPNS1_17KExceptionContextE + bl _ZN3ams4kern4arch5arm6415HandleExceptionEPNS2_17KExceptionContextE /* Restore registers. */ ldp x30, x8, [sp, #(8 * 30)] @@ -189,11 +189,11 @@ _ZN3ams4kern5arm6412SvcHandler64Ev: add sp, sp, #0x120 eret -/* ams::kern::arm64::SvcHandler32() */ -.section .text._ZN3ams4kern5arm6412SvcHandler32Ev, "ax", %progbits -.global _ZN3ams4kern5arm6412SvcHandler32Ev -.type _ZN3ams4kern5arm6412SvcHandler32Ev, %function -_ZN3ams4kern5arm6412SvcHandler32Ev: +/* ams::kern::arch::arm64::SvcHandler32() */ +.section .text._ZN3ams4kern4arch5arm6412SvcHandler32Ev, "ax", %progbits +.global _ZN3ams4kern4arch5arm6412SvcHandler32Ev +.type _ZN3ams4kern4arch5arm6412SvcHandler32Ev, %function +_ZN3ams4kern4arch5arm6412SvcHandler32Ev: /* Ensure that our registers are 32-bit. */ mov w0, w0 mov w1, w1 @@ -299,10 +299,10 @@ _ZN3ams4kern5arm6412SvcHandler32Ev: stp xzr, xzr, [sp, #(8 * 28)] stp xzr, xzr, [sp, #(8 * 30)] - /* Call ams::kern::arm64::HandleException(ams::kern::arm64::KExceptionContext *) */ + /* Call ams::kern::arch::arm64::HandleException(ams::kern::arch::arm64::KExceptionContext *) */ mrs x18, tpidr_el1 mov x0, sp - bl _ZN3ams4kern5arm6415HandleExceptionEPNS1_17KExceptionContextE + bl _ZN3ams4kern4arch5arm6415HandleExceptionEPNS2_17KExceptionContextE /* Restore registers. */ ldp x17, x20, [sp, #(8 * 32)]