VERY experimental Nintendo Switch 2 emulator
C++
kernel: remove gratitutous attribute usage
Liam3280ebac7ee3
diff --git a/src/core/hle/kernel/global_scheduler_context.h b/src/core/hle/kernel/global_scheduler_context.hindex b7fb8caecc..c48e8cd120 100644--- a/src/core/hle/kernel/global_scheduler_context.h+++ b/src/core/hle/kernel/global_scheduler_context.h@@ -44,7 +44,7 @@ public:/// Returns a list of all threads managed by the scheduler/// This is only safe to iterate while holding the scheduler lock- [[nodiscard]] const std::vector<KThread*>& GetThreadList() const {+ const std::vector<KThread*>& GetThreadList() const {return m_thread_list;}@@ -64,7 +64,7 @@ public:void RegisterDummyThreadForWakeup(KThread* thread);void WakeupWaitingDummyThreads();- [[nodiscard]] LockType& SchedulerLock() {+ LockType& SchedulerLock() {return m_scheduler_lock;}diff --git a/src/core/hle/kernel/k_code_memory.h b/src/core/hle/kernel/k_code_memory.hindex 5b260b3853..fa63c18df4 100644--- a/src/core/hle/kernel/k_code_memory.h+++ b/src/core/hle/kernel/k_code_memory.h@@ -42,7 +42,7 @@ public:bool IsInitialized() const override {return m_is_initialized;}- static void PostDestroy([[maybe_unused]] uintptr_t arg) {}+ static void PostDestroy(uintptr_t arg) {}KProcess* GetOwner() const override {return m_owner;diff --git a/src/core/hle/kernel/k_debug.h b/src/core/hle/kernel/k_debug.hindex e3a0689c82..9ffcf27d14 100644--- a/src/core/hle/kernel/k_debug.h+++ b/src/core/hle/kernel/k_debug.h@@ -14,7 +14,7 @@ class KDebug final : public KAutoObjectWithSlabHeapAndContainer<KDebug, KAutoObjpublic:explicit KDebug(KernelCore& kernel_) : KAutoObjectWithSlabHeapAndContainer{kernel_} {}- static void PostDestroy([[maybe_unused]] uintptr_t arg) {}+ static void PostDestroy(uintptr_t arg) {}};} // namespace Kerneldiff --git a/src/core/hle/kernel/k_memory_block.h b/src/core/hle/kernel/k_memory_block.hindex 87ca655920..e01929da61 100644--- a/src/core/hle/kernel/k_memory_block.h+++ b/src/core/hle/kernel/k_memory_block.h@@ -471,8 +471,8 @@ public:m_disable_merge_attribute & KMemoryBlockDisableMergeAttribute::AllRight);}- constexpr void UpdateDeviceDisableMergeStateForShareLeft(- [[maybe_unused]] KMemoryPermission new_perm, bool left, [[maybe_unused]] bool right) {+ constexpr void UpdateDeviceDisableMergeStateForShareLeft(KMemoryPermission new_perm, bool left,+ bool right) {// New permission/right aren't used.if (left) {m_disable_merge_attribute = static_cast<KMemoryBlockDisableMergeAttribute>(@@ -482,8 +482,8 @@ public:}}- constexpr void UpdateDeviceDisableMergeStateForShareRight(- [[maybe_unused]] KMemoryPermission new_perm, [[maybe_unused]] bool left, bool right) {+ constexpr void UpdateDeviceDisableMergeStateForShareRight(KMemoryPermission new_perm, bool left,+ bool right) {// New permission/left aren't used.if (right) {m_disable_merge_attribute = static_cast<KMemoryBlockDisableMergeAttribute>(@@ -499,8 +499,7 @@ public:this->UpdateDeviceDisableMergeStateForShareRight(new_perm, left, right);}- constexpr void ShareToDevice([[maybe_unused]] KMemoryPermission new_perm, bool left,- bool right) {+ constexpr void ShareToDevice(KMemoryPermission new_perm, bool left, bool right) {// New permission isn't used.// We must either be shared or have a zero lock count.@@ -516,8 +515,8 @@ public:this->UpdateDeviceDisableMergeStateForShare(new_perm, left, right);}- constexpr void UpdateDeviceDisableMergeStateForUnshareLeft(- [[maybe_unused]] KMemoryPermission new_perm, bool left, [[maybe_unused]] bool right) {+ constexpr void UpdateDeviceDisableMergeStateForUnshareLeft(KMemoryPermission new_perm,+ bool left, bool right) {// New permission/right aren't used.if (left) {@@ -536,8 +535,8 @@ public:}}- constexpr void UpdateDeviceDisableMergeStateForUnshareRight(- [[maybe_unused]] KMemoryPermission new_perm, [[maybe_unused]] bool left, bool right) {+ constexpr void UpdateDeviceDisableMergeStateForUnshareRight(KMemoryPermission new_perm,+ bool left, bool right) {// New permission/left aren't used.if (right) {@@ -556,8 +555,7 @@ public:this->UpdateDeviceDisableMergeStateForUnshareRight(new_perm, left, right);}- constexpr void UnshareToDevice([[maybe_unused]] KMemoryPermission new_perm, bool left,- bool right) {+ constexpr void UnshareToDevice(KMemoryPermission new_perm, bool left, bool right) {// New permission isn't used.// We must be shared.@@ -575,8 +573,7 @@ public:this->UpdateDeviceDisableMergeStateForUnshare(new_perm, left, right);}- constexpr void UnshareToDeviceRight([[maybe_unused]] KMemoryPermission new_perm, bool left,- bool right) {+ constexpr void UnshareToDeviceRight(KMemoryPermission new_perm, bool left, bool right) {// New permission isn't used.// We must be shared.@@ -594,7 +591,7 @@ public:this->UpdateDeviceDisableMergeStateForUnshareRight(new_perm, left, right);}- constexpr void LockForIpc(KMemoryPermission new_perm, bool left, [[maybe_unused]] bool right) {+ constexpr void LockForIpc(KMemoryPermission new_perm, bool left, bool right) {// We must either be locked or have a zero lock count.ASSERT((m_attribute & KMemoryAttribute::IpcLocked) == KMemoryAttribute::IpcLocked ||m_ipc_lock_count == 0);@@ -626,8 +623,7 @@ public:}}- constexpr void UnlockForIpc([[maybe_unused]] KMemoryPermission new_perm, bool left,- [[maybe_unused]] bool right) {+ constexpr void UnlockForIpc(KMemoryPermission new_perm, bool left, bool right) {// New permission isn't used.// We must be locked.diff --git a/src/core/hle/kernel/k_page_buffer.h b/src/core/hle/kernel/k_page_buffer.hindex cfedaae619..b7a3ccb4a3 100644--- a/src/core/hle/kernel/k_page_buffer.h+++ b/src/core/hle/kernel/k_page_buffer.h@@ -29,7 +29,7 @@ public:static KPageBuffer* FromPhysicalAddress(Core::System& system, PAddr phys_addr);private:- [[maybe_unused]] alignas(PageSize) std::array<u8, PageSize> m_buffer{};+ alignas(PageSize) std::array<u8, PageSize> m_buffer{};};static_assert(sizeof(KPageBuffer) == KPageBufferSlabHeap::BufferSize);diff --git a/src/core/hle/kernel/k_resource_limit.h b/src/core/hle/kernel/k_resource_limit.hindex 2573d1b7c2..bc4f48e157 100644--- a/src/core/hle/kernel/k_resource_limit.h+++ b/src/core/hle/kernel/k_resource_limit.h@@ -46,7 +46,7 @@ public:void Release(LimitableResource which, s64 value);void Release(LimitableResource which, s64 value, s64 hint);- static void PostDestroy([[maybe_unused]] uintptr_t arg) {}+ static void PostDestroy(uintptr_t arg) {}private:using ResourceArray = std::array<s64, static_cast<std::size_t>(LimitableResource::Count)>;diff --git a/src/core/hle/kernel/k_system_resource.cpp b/src/core/hle/kernel/k_system_resource.cppindex 4cc377a6c5..e6c8d589af 100644--- a/src/core/hle/kernel/k_system_resource.cpp+++ b/src/core/hle/kernel/k_system_resource.cpp@@ -5,9 +5,8 @@namespace Kernel {-Result KSecureSystemResource::Initialize([[maybe_unused]] size_t size,- [[maybe_unused]] KResourceLimit* resource_limit,- [[maybe_unused]] KMemoryManager::Pool pool) {+Result KSecureSystemResource::Initialize(size_t size, KResourceLimit* resource_limit,+ KMemoryManager::Pool pool) {// UnimplementedUNREACHABLE();}@@ -17,8 +16,8 @@ void KSecureSystemResource::Finalize() {UNREACHABLE();}-size_t KSecureSystemResource::CalculateRequiredSecureMemorySize(- [[maybe_unused]] size_t size, [[maybe_unused]] KMemoryManager::Pool pool) {+size_t KSecureSystemResource::CalculateRequiredSecureMemorySize(size_t size,+ KMemoryManager::Pool pool) {// UnimplementedUNREACHABLE();}diff --git a/src/core/hle/kernel/k_system_resource.h b/src/core/hle/kernel/k_system_resource.hindex 9a991f7259..aec058a95a 100644--- a/src/core/hle/kernel/k_system_resource.h+++ b/src/core/hle/kernel/k_system_resource.h@@ -99,7 +99,7 @@ public:bool IsInitialized() const {return m_is_initialized;}- static void PostDestroy([[maybe_unused]] uintptr_t arg) {}+ static void PostDestroy(uintptr_t arg) {}size_t CalculateRequiredSecureMemorySize() const {return CalculateRequiredSecureMemorySize(m_resource_size, m_resource_pool);