From dea4cc9a00cd98f2749e9b658589a03addc6143b Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Sat, 28 Dec 2019 16:46:08 +0100 Subject: clean-up memory.h --- memory.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'memory.h') diff --git a/memory.h b/memory.h index d369694..e4493e2 100644 --- a/memory.h +++ b/memory.h @@ -1,9 +1,14 @@ #ifndef MEMORY_H #define MEMORY_H -#include "paging.h" +#define POWER_OF_2(EXP) (((uint32_t) 1) << EXP) -#define SECTION_SIZE (((uint32_t) 1) << 20) +#define ALIGN_POWER_OF_2(ADDR, EXP) \ + (((ADDR - 1) & ~(POWER_OF_2(EXP) - 1)) + POWER_OF_2(EXP)) + +#define SECTION_SIZE POWER_OF_2(20) + +#define ALIGN_SECTION(ADDR) ALIGN_POWER_OF_2(ADDR, 20) #define INTERRUPT_VECTOR_TABLE_START ((uint32_t) 0x0) @@ -13,26 +18,23 @@ extern const char __end; extern const char __start; -#define KERNEL_START ((uint32_t) &__start) +#define KERNEL_START ((uint32_t) &__start) // this is 0x8000 #define KERNEL_END ((uint32_t) &__end) // first 2^14 aligned address after the kernel -#define TRANSLATION_TABLE_BASE \ - (((KERNEL_END - (uint32_t) 1) & ~((uint32_t) 0x3fff)) \ - + (uint32_t) 0x4000) +#define TRANSLATION_TABLE_BASE ALIGN_POWER_OF_2(KERNEL_END, 14) #define TRANSLATION_TABLE_END \ (TRANSLATION_TABLE_BASE + (uint32_t) (4096 * 4)) -#define PRIVILEGED_MEMORY_END \ - (((TRANSLATION_TABLE_END - (uint32_t) 1) & ~((uint32_t) 0xfffff)) \ - + SECTION_SIZE) +#define PRIVILEGED_MEMORY_END ALIGN_SECTION(TRANSLATION_TABLE_END) #define UNPRIVILEGED_MEMORY_START PRIVILEGED_MEMORY_END + #define UNPRIVILEGED_MEMORY_END \ (UNPRIVILEGED_MEMORY_START + SECTION_SIZE) -#define PL0_SECTION_NUMBER ((uint32_t) 0b101010101010) +#define PL0_SECTION_NUMBER ((uint32_t) 0b101010101010) #define VIRTUAL_PL0_MEMORY_START (PL0_SECTION_NUMBER << 20) -- cgit v1.2.3