VERY experimental Nintendo Switch 2 emulator
C++
kernel/k_memory_block: Ensure members are always initialized
Lioncash0435142f585a
diff --git a/src/core/hle/kernel/k_memory_block.h b/src/core/hle/kernel/k_memory_block.hindex 3b6e7baffb..87ca655920 100644--- a/src/core/hle/kernel/k_memory_block.h+++ b/src/core/hle/kernel/k_memory_block.h@@ -280,18 +280,19 @@ struct KMemoryInfo {class KMemoryBlock : public Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock> {private:- u16 m_device_disable_merge_left_count;- u16 m_device_disable_merge_right_count;- VAddr m_address;- size_t m_num_pages;- KMemoryState m_memory_state;- u16 m_ipc_lock_count;- u16 m_device_use_count;- u16 m_ipc_disable_merge_count;- KMemoryPermission m_permission;- KMemoryPermission m_original_permission;- KMemoryAttribute m_attribute;- KMemoryBlockDisableMergeAttribute m_disable_merge_attribute;+ u16 m_device_disable_merge_left_count{};+ u16 m_device_disable_merge_right_count{};+ VAddr m_address{};+ size_t m_num_pages{};+ KMemoryState m_memory_state{KMemoryState::None};+ u16 m_ipc_lock_count{};+ u16 m_device_use_count{};+ u16 m_ipc_disable_merge_count{};+ KMemoryPermission m_permission{KMemoryPermission::None};+ KMemoryPermission m_original_permission{KMemoryPermission::None};+ KMemoryAttribute m_attribute{KMemoryAttribute::None};+ KMemoryBlockDisableMergeAttribute m_disable_merge_attribute{+ KMemoryBlockDisableMergeAttribute::None};public:static constexpr int Compare(const KMemoryBlock& lhs, const KMemoryBlock& rhs) {@@ -367,12 +368,8 @@ public:constexpr KMemoryBlock(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p,KMemoryAttribute attr)- : Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock>(),- m_device_disable_merge_left_count(), m_device_disable_merge_right_count(),- m_address(addr), m_num_pages(np), m_memory_state(ms), m_ipc_lock_count(0),- m_device_use_count(0), m_ipc_disable_merge_count(), m_permission(p),- m_original_permission(KMemoryPermission::None), m_attribute(attr),- m_disable_merge_attribute() {}+ : Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock>(), m_address(addr), m_num_pages(np),+ m_memory_state(ms), m_permission(p), m_attribute(attr) {}constexpr void Initialize(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p,KMemoryAttribute attr) {diff --git a/src/core/hle/kernel/k_memory_block_manager.h b/src/core/hle/kernel/k_memory_block_manager.hindex 9b5873883d..d382722a6a 100644--- a/src/core/hle/kernel/k_memory_block_manager.h+++ b/src/core/hle/kernel/k_memory_block_manager.h@@ -3,6 +3,7 @@#pragma once+#include <array>#include <functional>#include "common/common_funcs.h"@@ -17,9 +18,9 @@ public:static constexpr size_t MaxBlocks = 2;private:- KMemoryBlock* m_blocks[MaxBlocks];- size_t m_index;- KMemoryBlockSlabManager* m_slab_manager;+ std::array<KMemoryBlock*, MaxBlocks> m_blocks{};+ size_t m_index{MaxBlocks};+ KMemoryBlockSlabManager* m_slab_manager{};private:Result Initialize(size_t num_blocks) {@@ -41,7 +42,7 @@ private:public:KMemoryBlockManagerUpdateAllocator(Result* out_result, KMemoryBlockSlabManager* sm,size_t num_blocks = MaxBlocks)- : m_blocks(), m_index(MaxBlocks), m_slab_manager(sm) {+ : m_slab_manager(sm) {*out_result = this->Initialize(num_blocks);}