diff options
Diffstat (limited to 'arch/riscv/include')
| -rw-r--r-- | arch/riscv/include/pages.h | 24 | ||||
| -rw-r--r-- | arch/riscv/include/vmap.h | 3 |
2 files changed, 14 insertions, 13 deletions
diff --git a/arch/riscv/include/pages.h b/arch/riscv/include/pages.h index 4ae2ab9..9e16c00 100644 --- a/arch/riscv/include/pages.h +++ b/arch/riscv/include/pages.h @@ -1,36 +1,40 @@ #ifndef APOS_RISCV_PAGES_H #define APOS_RISCV_PAGES_H -typedef char pagemask_t; -typedef char lockbit_t; +#include <apos/types.h> -struct kilopages { +typedef uint8_t pagemask_t; +typedef uint8_t lockbit_t; +/* assume riscv64 for now */ +typedef uint64_t pm_t; + +struct mm_kpages { pagemask_t page[64]; }; -struct megapages { +struct mm_mpages { lockbit_t lockbit[64]; pagemask_t empty[64]; pagemask_t full[64]; - struct kilopages kilo[512]; + struct mm_kpages kilo[512]; }; /* Sv39 */ -struct gigapages { +struct mm_gpages { lockbit_t lockbit[64]; pagemask_t empty[64]; pagemask_t full[64]; - struct megapages mega[512]; + struct mm_mpages mega[512]; }; -struct terapages { +struct mm_tpages { lockbit_t lockbit[64]; pagemask_t empty[64]; pagemask_t full[64]; - struct gigapages giga[512]; + struct mm_gpages giga[512]; }; -struct mm_pagearr_info { +struct mm_ptinfo { short tera_num; struct terapages *tera_top; diff --git a/arch/riscv/include/vmap.h b/arch/riscv/include/vmap.h index a1cf52f..aee3725 100644 --- a/arch/riscv/include/vmap.h +++ b/arch/riscv/include/vmap.h @@ -12,7 +12,4 @@ #define VM_A (1 << 6) #define VM_D (1 << 7) -#define VM_TOP (-1) -#define VM_KERN (VM_TOP - SZ_1G) - #endif /* APOS_RISCV_VMAP_H */ |