X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/48b4a227035048fdebcd32532deb7a857c6199ac..86a9cfeadbbe180abf6c8bd8c64c86957fdacfeb:/lunaix-os/includes/lunaix/mm/page.h

diff --git a/lunaix-os/includes/lunaix/mm/page.h b/lunaix-os/includes/lunaix/mm/page.h
index a6b3162..35a1b47 100644
--- a/lunaix-os/includes/lunaix/mm/page.h
+++ b/lunaix-os/includes/lunaix/mm/page.h
@@ -33,18 +33,18 @@
 #define PG_PRESENT              (0x1)
 #define PG_WRITE                (0x1 << 1)
 #define PG_ALLOW_USER           (0x1 << 2)
-#define PG_WRITE_THROUGHT       (1 << 3)
+#define PG_WRITE_THROUGH       (1 << 3)
 #define PG_DISABLE_CACHE        (1 << 4)
 #define PG_PDE_4MB              (1 << 7)
 
-#define NEW_L1_ENTRY(flags, pt_addr)     (PG_ALIGN(pt_addr) | ((flags) & 0xfff))
+#define NEW_L1_ENTRY(flags, pt_addr)     (PG_ALIGN(pt_addr) | (((flags) | PG_WRITE_THROUGH) & 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))
 
-#define PG_ENTRY_FLAGS(entry)   (entry & 0xFFFU)
-#define PG_ENTRY_ADDR(entry)   (entry & ~0xFFFU)
+#define PG_ENTRY_FLAGS(entry)   ((entry) & 0xFFFU)
+#define PG_ENTRY_ADDR(entry)   ((entry) & ~0xFFFU)
 
 #define HAS_FLAGS(entry, flags)             ((PG_ENTRY_FLAGS(entry) & (flags)) == flags)
 #define CONTAINS_FLAGS(entry, flags)        (PG_ENTRY_FLAGS(entry) & (flags))
@@ -55,7 +55,7 @@
 #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
+#define T_SELF_REF_PERM        PG_PREM_RW | PG_DISABLE_CACHE | PG_WRITE_THROUGH
 
 
 // 页目录的虚拟基地址，可以用来访问到各个PDE
@@ -95,11 +95,18 @@ typedef struct
 
 extern void __pg_mount_point;
 
-/* 三个页挂载点： 用于临时创建&编辑页表 */
+/* 四个页挂载点，两个页目录挂载点： 用于临时创建&编辑页表 */
 
-#define PG_MOUNT_1  (&__pg_mount_point)
-#define PG_MOUNT_2  (&__pg_mount_point + 0x1000)
-#define PG_MOUNT_3  (&__pg_mount_point + 0x2000)
+#define PD_MOUNT_1          0xAFC00000
+#define PD_MOUNT_2          0xAF800000
+#define PG_MOUNT_BASE       0xAF7FF000
+#define PG_MOUNT_1          (PG_MOUNT_BASE)
+#define PG_MOUNT_2          (PG_MOUNT_BASE - 0x1000)
+#define PG_MOUNT_3          (PG_MOUNT_BASE - 0x2000)
+#define PG_MOUNT_4          (PG_MOUNT_BASE - 0x3000)
+#define PD_REFERENCED       L2_BASE_VADDR
 
+#define CURPROC_PTE(vpn)     (&((x86_page_table*)(PD_MOUNT_1 | (((vpn) & 0xffc00) << 2)))->entry[(vpn) & 0x3ff])
+#define PTE_MOUNTED(mnt, vpn)     (((x86_page_table*)((mnt) | (((vpn) & 0xffc00) << 2)))->entry[(vpn) & 0x3ff])
 
 #endif /* __LUNAIX_PAGE_H */