From c886669d561f3b6b2413c9dd06ce7288b16d4a52 Mon Sep 17 00:00:00 2001 From: apio Date: Sat, 19 Nov 2022 22:27:59 +0100 Subject: [PATCH] Break down operations to make protect_kernel_sections() more readable --- kernel/src/memory/MemoryManager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/src/memory/MemoryManager.cpp b/kernel/src/memory/MemoryManager.cpp index 57222223..335c3d54 100644 --- a/kernel/src/memory/MemoryManager.cpp +++ b/kernel/src/memory/MemoryManager.cpp @@ -43,10 +43,12 @@ namespace MemoryManager { Result protect_kernel_sections() { - u64 rodata_pages = get_blocks_from_size((u64)(end_of_kernel_rodata - start_of_kernel_rodata), ARCH_PAGE_SIZE); + const u64 rodata_size = (u64)(end_of_kernel_rodata - start_of_kernel_rodata); + const u64 rodata_pages = get_blocks_from_size(rodata_size, ARCH_PAGE_SIZE); TRY(remap((u64)start_of_kernel_rodata, rodata_pages, MMU::NoExecute)); - u64 data_pages = get_blocks_from_size((u64)(end_of_kernel_data - start_of_kernel_data), ARCH_PAGE_SIZE); + const u64 data_size = (u64)(end_of_kernel_data - start_of_kernel_data); + const u64 data_pages = get_blocks_from_size(data_size, ARCH_PAGE_SIZE); TRY(remap((u64)start_of_kernel_data, data_pages, MMU::NoExecute | MMU::ReadWrite)); return {};