octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/k_memory_block: Ensure members are always initialized

This commit is contained in:
Lioncash 2022-12-05 15:00:34 -05:00
parent dcca650599
commit c3fd211b43
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/hle/kernel/k_memory_block.h
View File

@ -280,18 +280,19 @@ struct KMemoryInfo {
class KMemoryBlock : public Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock> { class KMemoryBlock : public Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock> {
private: private:
u16 m_device_disable_merge_left_count; u16 m_device_disable_merge_left_count{};
u16 m_device_disable_merge_right_count; u16 m_device_disable_merge_right_count{};
VAddr m_address; VAddr m_address{};
size_t m_num_pages; size_t m_num_pages{};
KMemoryState m_memory_state; KMemoryState m_memory_state{KMemoryState::None};
u16 m_ipc_lock_count; u16 m_ipc_lock_count{};
u16 m_device_use_count; u16 m_device_use_count{};
u16 m_ipc_disable_merge_count; u16 m_ipc_disable_merge_count{};
KMemoryPermission m_permission; KMemoryPermission m_permission{KMemoryPermission::None};
KMemoryPermission m_original_permission; KMemoryPermission m_original_permission{KMemoryPermission::None};
KMemoryAttribute m_attribute; KMemoryAttribute m_attribute{KMemoryAttribute::None};
KMemoryBlockDisableMergeAttribute m_disable_merge_attribute; KMemoryBlockDisableMergeAttribute m_disable_merge_attribute{
KMemoryBlockDisableMergeAttribute::None};
public: public:
static constexpr int Compare(const KMemoryBlock& lhs, const KMemoryBlock& rhs) { 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, constexpr KMemoryBlock(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p,
KMemoryAttribute attr) KMemoryAttribute attr)
: Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock>(), : Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock>(), m_address(addr), m_num_pages(np),
m_device_disable_merge_left_count(), m_device_disable_merge_right_count(), m_memory_state(ms), m_permission(p), m_attribute(attr) {}
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() {}
constexpr void Initialize(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p, constexpr void Initialize(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p,
KMemoryAttribute attr) { KMemoryAttribute attr) {

9
src/core/hle/kernel/k_memory_block_manager.h
View File

@ -3,6 +3,7 @@
#pragma once #pragma once
#include <array>
#include <functional> #include <functional>
#include "common/common_funcs.h" #include "common/common_funcs.h"
@ -17,9 +18,9 @@ public:
static constexpr size_t MaxBlocks = 2; static constexpr size_t MaxBlocks = 2;
private: private:
KMemoryBlock* m_blocks[MaxBlocks]; std::array<KMemoryBlock*, MaxBlocks> m_blocks{};
size_t m_index; size_t m_index{MaxBlocks};
KMemoryBlockSlabManager* m_slab_manager; KMemoryBlockSlabManager* m_slab_manager{};
private: private:
Result Initialize(size_t num_blocks) { Result Initialize(size_t num_blocks) {
@ -41,7 +42,7 @@ private:
public: public:
KMemoryBlockManagerUpdateAllocator(Result* out_result, KMemoryBlockSlabManager* sm, KMemoryBlockManagerUpdateAllocator(Result* out_result, KMemoryBlockSlabManager* sm,
size_t num_blocks = MaxBlocks) size_t num_blocks = MaxBlocks)
: m_blocks(), m_index(MaxBlocks), m_slab_manager(sm) { : m_slab_manager(sm) {
*out_result = this->Initialize(num_blocks); *out_result = this->Initialize(num_blocks);
} }