From 283d8e8f51c814448802bf34e77bd11f35187137 Mon Sep 17 00:00:00 2001 From: James Mintram Date: Mon, 4 Apr 2022 22:17:02 +0100 Subject: [PATCH] Kernel: Add VERIFY_NOT_REACHED to aarch64 locking functions --- Kernel/Arch/aarch64/ScopedCritical.cpp | 12 ++++++++++-- Kernel/Arch/aarch64/Spinlock.h | 10 ++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Kernel/Arch/aarch64/ScopedCritical.cpp b/Kernel/Arch/aarch64/ScopedCritical.cpp index eb64fa2377..0a65704f24 100644 --- a/Kernel/Arch/aarch64/ScopedCritical.cpp +++ b/Kernel/Arch/aarch64/ScopedCritical.cpp @@ -15,15 +15,23 @@ ScopedCritical::~ScopedCritical() = default; ScopedCritical::ScopedCritical(ScopedCritical&& /*from*/) { + VERIFY_NOT_REACHED(); } ScopedCritical& ScopedCritical::operator=(ScopedCritical&& /*from*/) { + VERIFY_NOT_REACHED(); return *this; } -void ScopedCritical::leave() { } +void ScopedCritical::leave() +{ + VERIFY_NOT_REACHED(); +} -void ScopedCritical::enter() { } +void ScopedCritical::enter() +{ + VERIFY_NOT_REACHED(); +} } diff --git a/Kernel/Arch/aarch64/Spinlock.h b/Kernel/Arch/aarch64/Spinlock.h index 5dd711b0d5..ac763a55fc 100644 --- a/Kernel/Arch/aarch64/Spinlock.h +++ b/Kernel/Arch/aarch64/Spinlock.h @@ -24,20 +24,24 @@ public: ALWAYS_INLINE u32 lock() { + VERIFY_NOT_REACHED(); return 0; } ALWAYS_INLINE void unlock(u32 /*prev_flags*/) { + VERIFY_NOT_REACHED(); } [[nodiscard]] ALWAYS_INLINE bool is_locked() const { + VERIFY_NOT_REACHED(); return false; } ALWAYS_INLINE void initialize() { + VERIFY_NOT_REACHED(); } }; @@ -49,29 +53,35 @@ public: RecursiveSpinlock(LockRank rank = LockRank::None) { (void)rank; + VERIFY_NOT_REACHED(); } ALWAYS_INLINE u32 lock() { + VERIFY_NOT_REACHED(); return 0; } ALWAYS_INLINE void unlock(u32 /*prev_flags*/) { + VERIFY_NOT_REACHED(); } [[nodiscard]] ALWAYS_INLINE bool is_locked() const { + VERIFY_NOT_REACHED(); return false; } [[nodiscard]] ALWAYS_INLINE bool is_locked_by_current_processor() const { + VERIFY_NOT_REACHED(); return false; } ALWAYS_INLINE void initialize() { + VERIFY_NOT_REACHED(); } };