X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/cd09c4b222e4ddf45a42522563ae2471a829d1c8..9406e904ddad5db2ba2dd550e21bbb224899fd79:/lunaix-os/includes/lunaix/mm/page.h?ds=sidebyside

diff --git a/lunaix-os/includes/lunaix/mm/page.h b/lunaix-os/includes/lunaix/mm/page.h
index c981839..4ea31bc 100644
--- a/lunaix-os/includes/lunaix/mm/page.h
+++ b/lunaix-os/includes/lunaix/mm/page.h
@@ -3,6 +3,10 @@
 #include <stdint.h>
 #include <lunaix/constants.h>
 
+#define PG_SIZE_BITS                12
+#define PG_SIZE                     (1 << PG_SIZE_BITS)
+#define PG_INDEX_BITS               10
+
 #define PG_MAX_ENTRIES              1024U
 #define PG_LAST_TABLE               PG_MAX_ENTRIES - 1
 #define PG_FIRST_TABLE              0
@@ -12,9 +16,9 @@
 
 #define PG_ALIGN(addr)      ((uintptr_t)(addr)   & 0xFFFFF000UL)
 
-#define PD_INDEX(vaddr)     (((uintptr_t)(vaddr) & 0xFFC00000UL) >> 22)
-#define PT_INDEX(vaddr)     (((uintptr_t)(vaddr) & 0x003FF000UL) >> 12)
-#define PG_OFFSET(vaddr)    ((uintptr_t)(vaddr)  & 0x00000FFFUL)
+#define L1_INDEX(vaddr)     (uint32_t)(((uintptr_t)(vaddr) & 0xFFC00000UL) >> 22)
+#define L2_INDEX(vaddr)     (uint32_t)(((uintptr_t)(vaddr) & 0x003FF000UL) >> 12)
+#define PG_OFFSET(vaddr)    (uint32_t)((uintptr_t)(vaddr)  & 0x00000FFFUL)
 
 #define GET_PT_ADDR(pde)    PG_ALIGN(pde)
 #define GET_PG_ADDR(pte)    PG_ALIGN(pte)
@@ -31,32 +35,49 @@
 #define PG_DISABLE_CACHE        (1 << 4)
 #define PG_PDE_4MB              (1 << 7)
 
-#define PDE(flags, pt_addr)     (PG_ALIGN(pt_addr) | ((flags) & 0xfff))
-#define PTE(flags, pg_addr)     (PG_ALIGN(pg_addr) | ((flags) & 0xfff))
+#define NEW_L1_ENTRY(flags, pt_addr)     (PG_ALIGN(pt_addr) | ((flags) & 0xfff))
+#define NEW_L2_ENTRY(flags, pg_addr)     (PG_ALIGN(pg_addr) | ((flags) & 0xfff))
 
 #define V_ADDR(pd, pt, offset)  ((pd) << 22 | (pt) << 12 | (offset))
 #define P_ADDR(ppn, offset)     ((ppn << 12) | (offset))
 
-// 用于对PD进行循环映射，因为我们可能需要对PD进行频繁操作，我们在这里禁用TLB缓存
+#define PG_ENTRY_FLAGS(entry)   (entry & 0xFFFU)
+#define PG_ENTRY_ADDR(entry)   (entry & ~0xFFFU)
+
 #define PG_PREM_R              PG_PRESENT
 #define PG_PREM_RW             PG_PRESENT | PG_WRITE
 #define PG_PREM_UR             PG_PRESENT | PG_ALLOW_USER
 #define PG_PREM_URW            PG_PRESENT | PG_WRITE | PG_ALLOW_USER
+
+// 用于对PD进行循环映射，因为我们可能需要对PD进行频繁操作，我们在这里禁用TLB缓存
 #define T_SELF_REF_PERM        PG_PREM_RW | PG_DISABLE_CACHE
 
 
 // 页目录的虚拟基地址，可以用来访问到各个PDE
-#define PTD_BASE_VADDR                0xFFFFF000U
+#define L1_BASE_VADDR                0xFFFFF000U
 
 // 页表的虚拟基地址，可以用来访问到各个PTE
-#define PT_BASE_VADDR                 0xFFC00000U
+#define L2_BASE_VADDR                 0xFFC00000U
 
 // 用来获取特定的页表的虚拟地址
-#define PT_VADDR(pd_offset)           (PT_BASE_VADDR | (pd_offset << 12))
+#define L2_VADDR(pd_offset)           (L2_BASE_VADDR | (pd_offset << 12))
 
-typedef unsigned int ptd_t;
-typedef unsigned int pt_t;
+typedef unsigned long ptd_t;
+typedef unsigned long pt_t;
 typedef unsigned int pt_attr;
 
+/**
+ * @brief 虚拟映射属性
+ * 
+ */
+typedef struct {
+    // 物理页码（如果不存在映射，则为0）
+    uint32_t pn;
+    // 物理页地址（如果不存在映射，则为0）
+    uintptr_t pa;
+    // 映射的flags
+    uint16_t flags;
+} v_mapping;
+
 
 #endif /* __LUNAIX_PAGE_H */