From b90e152c02aad225e83a3e6c1b80d1a0e396bb14 Mon Sep 17 00:00:00 2001 From: Ada Christine Date: Fri, 23 Apr 2021 01:12:23 +0000 Subject: less repetition, more flexibility with paging macros --- api/kernel/memory/paging.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'api/kernel/memory/paging.h') diff --git a/api/kernel/memory/paging.h b/api/kernel/memory/paging.h index d3dc541..3f16930 100644 --- a/api/kernel/memory/paging.h +++ b/api/kernel/memory/paging.h @@ -1,5 +1,6 @@ #pragma once +#include #define PAGE_MAP_LEVELS 4 #define PAGE_MAP_BITS 9 @@ -24,5 +25,9 @@ #define PAGE_TABLE_INDEX_MASK ((1 << PAGE_MAP_BITS) - 1) -#define page_table_index_bits(l) (PAGE_OFFSET_BITS + PAGE_MAP_BITS * (l - 1)) -#define page_table_index(v, l) (((uint64_t)v >> page_table_index_bits(l)) & PAGE_TABLE_INDEX_MASK) +#define pte_index_bits(l) (PAGE_OFFSET_BITS + PAGE_MAP_BITS * (l - 1)) +#define pte_index(v, l) (((uintptr_t)v >> pte_index_bits(l)) & PAGE_TABLE_INDEX_MASK) +#define page_size(l) (1 << pte_index_bits(l)) +#define page_address(a, l) (a & ~(page_size(l) - 1)) +#define page_offset(a, l) (a & (page_size(l) - 1)) +#define page_count(s, l) (((s + page_size(l) - 1) & ~(page_size(l) - 1)) / page_size(l)) -- cgit v1.3.1-1-g115d