refactor: rewrite kernel's make script

[lunaix-os.git] / 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 9330274f2cf144e85e90d3e06666d0024a9ee299..9afb2ed1c9abc63e7f418955dd3729b95c83aa1a 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/page.h
+++ b/lunaix-os/includes/lunaix/mm/page.h
@@ -13,6 +13,7 @@
 #define V2P(vaddr) ((ptr_t)(vaddr)-KERNEL_MM_BASE)
 
 #define PG_ALIGN(addr) ((ptr_t)(addr)&0xFFFFF000UL)
 #define V2P(vaddr) ((ptr_t)(vaddr)-KERNEL_MM_BASE)
 
 #define PG_ALIGN(addr) ((ptr_t)(addr)&0xFFFFF000UL)

+#define PG_MOD(addr) ((ptr_t)(addr) & ~PG_SIZE)

 #define PG_ALIGNED(addr) (!((ptr_t)(addr)&0x00000FFFUL))
 
 #define L1_INDEX(vaddr) (u32_t)(((ptr_t)(vaddr)&0xFFC00000UL) >> 22)
 #define PG_ALIGNED(addr) (!((ptr_t)(addr)&0x00000FFFUL))
 
 #define L1_INDEX(vaddr) (u32_t)(((ptr_t)(vaddr)&0xFFC00000UL) >> 22)


@@ -85,7 +86,7 @@ typedef struct
     // 物理页地址（如果不存在映射，则为0）
     ptr_t pa;
     // 映射的flags
     // 物理页地址（如果不存在映射，则为0）
     ptr_t pa;
     // 映射的flags

-    uint16_t flags;
+    u16_t flags;

     // PTE地址
     x86_pte_t* pte;
 } v_mapping;
     // PTE地址
     x86_pte_t* pte;
 } v_mapping;


@@ -93,19 +94,22 @@ typedef struct
 typedef struct
 {
     x86_pte_t entry[PG_MAX_ENTRIES];
 typedef struct
 {
     x86_pte_t entry[PG_MAX_ENTRIES];

-} __attribute__((packed)) x86_page_table;
+} __attribute__((packed, aligned(4))) x86_page_table;

 
 extern void __pg_mount_point;
 
 /* 四个页挂载点，两个页目录挂载点： 用于临时创建&编辑页表 */
 #define PG_MOUNT_RANGE(l1_index) (701 <= l1_index && l1_index <= 703)
 
 extern void __pg_mount_point;
 
 /* 四个页挂载点，两个页目录挂载点： 用于临时创建&编辑页表 */
 #define PG_MOUNT_RANGE(l1_index) (701 <= l1_index && l1_index <= 703)

-#define VMS_MOUNT_1 (KERNEL_MM_BASE + MEM_4MB)
+#define VMS_MOUNT_1 (KERNEL_MM_BASE + KSIZE)

 #define PG_MOUNT_BASE (VMS_MOUNT_1 + MEM_4MB)
 #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 PG_MOUNT_BASE (VMS_MOUNT_1 + MEM_4MB)
 #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 VMS_SELF L2_BASE_VADDR
 
 #define CURPROC_PTE(vpn)                                                       \
 #define VMS_SELF L2_BASE_VADDR
 
 #define CURPROC_PTE(vpn)                                                       \