From 4d1f0e77f229d4f14203f97f380b821e7bea8816 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Tue, 26 Mar 2024 19:05:34 +0200 Subject: [PATCH] Kernel: Fix physical address size for x86_32 Having 32 bit address space does not mean physical address space is also only 32 bits... --- kernel/include/kernel/FS/TmpFS/Definitions.h | 7 ++++--- kernel/include/kernel/Memory/Types.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/include/kernel/FS/TmpFS/Definitions.h b/kernel/include/kernel/FS/TmpFS/Definitions.h index e2e50772..1b57c0d6 100644 --- a/kernel/include/kernel/FS/TmpFS/Definitions.h +++ b/kernel/include/kernel/FS/TmpFS/Definitions.h @@ -29,12 +29,13 @@ namespace Kernel BAN::Array block; static constexpr size_t direct_block_count = 2; #elif ARCH(i686) - // 14x direct blocks + uint32_t __padding; + // 5x direct blocks // 1x singly indirect // 1x doubly indirect // 1x triply indirect - BAN::Array block; - static constexpr size_t direct_block_count = 14; + BAN::Array block; + static constexpr size_t direct_block_count = 5; #else #error #endif diff --git a/kernel/include/kernel/Memory/Types.h b/kernel/include/kernel/Memory/Types.h index 4911b70d..364635fb 100644 --- a/kernel/include/kernel/Memory/Types.h +++ b/kernel/include/kernel/Memory/Types.h @@ -21,6 +21,6 @@ namespace Kernel { using vaddr_t = uintptr_t; - using paddr_t = uintptr_t; + using paddr_t = uint64_t; }