diff --git a/src/memory/Memory.cc b/src/memory/Memory.cc index f1aedbc..64ebfa1 100644 --- a/src/memory/Memory.cc +++ b/src/memory/Memory.cc @@ -59,7 +59,7 @@ MemoryManager::initializeGDT() namespace memory { -const usize pageSize = 4096; +const usize pageSize = 0x1000; const usize pageMask = pageSize - 1; } /* namespace memory */ diff --git a/src/memory/Memory.hh b/src/memory/Memory.hh index 44e81fd..4bf1e44 100644 --- a/src/memory/Memory.hh +++ b/src/memory/Memory.hh @@ -32,19 +32,22 @@ private: namespace memory { +/** Size of a single page in bytes. */ extern const usize pageSize; extern const usize pageMask; + /** Align to the nearest page boundary below `addr`. */ -inline u32 -pageAlignDown(u32 addr) +inline uptr +pageAlignDown(uptr addr) { return addr & ~pageMask; } + /** Align to the nearest page boundary above `addr`. */ -inline u32 -pageAlignUp(u32 addr) +inline uptr +pageAlignUp(uptr addr) { if (pageAlignDown(addr) == addr) { return addr;