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

diff --git a/lunaix-os/includes/lunaix/mm/mm.h b/lunaix-os/includes/lunaix/mm/mm.h
index 2ea1ac2..5890f61 100644
--- a/lunaix-os/includes/lunaix/mm/mm.h
+++ b/lunaix-os/includes/lunaix/mm/mm.h
@@ -3,8 +3,12 @@
 
 #include <lunaix/ds/llist.h>
 #include <lunaix/ds/mutex.h>
+#include <lunaix/fs.h>
+#include <lunaix/types.h>
 
-typedef struct 
+#include <usr/sys/mann_flags.h>
+
+typedef struct
 {
     void* start;
     void* brk;
@@ -14,31 +18,46 @@ typedef struct
 
 /**
  * @brief 私有区域，该区域中的页无法进行任何形式的共享。
- * 
+ *
  */
-#define REGION_PRIVATE      0x0
+#define REGION_PRIVATE MAP_PRIVATE
 
 /**
- * @brief 读共享区域，该区域中的页可以被两个进程之间读共享，但任何写操作须应用Copy-On-Write
- * 
+ * @brief
+ * 读共享区域，该区域中的页可以被两个进程之间读共享，但任何写操作须应用Copy-On-Write
+ *
  */
-#define REGION_RSHARED      0x1
+#define REGION_RSHARED MAP_RSHARED
 
 /**
- * @brief 写共享区域，该区域中的页可以被两个进程之间读共享，任何的写操作无需执行Copy-On-Write
- * 
+ * @brief
+ * 写共享区域，该区域中的页可以被两个进程之间读共享，任何的写操作无需执行Copy-On-Write
+ *
  */
-#define REGION_WSHARED      0x2
+#define REGION_WSHARED MAP_WSHARED
+
+#define REGION_PERM_MASK 0x1c
+#define REGION_MODE_MASK 0x3
 
-#define REGION_TYPE_CODE    (0)
-#define REGION_TYPE_DATA    (1 << 2)
+#define REGION_READ PROT_READ
+#define REGION_WRITE PROT_WRITE
+#define REGION_EXEC PROT_EXEC
+#define REGION_ANON MAP_ANON
+#define REGION_RW REGION_READ | REGION_WRITE
+
+#define REGION_TYPE_CODE (1 << 16);
+#define REGION_TYPE_GENERAL (2 << 16);
+#define REGION_TYPE_HEAP (3 << 16);
+#define REGION_TYPE_STACK (4 << 16);
 
 struct mm_region
 {
-    struct llist_header* head;
-    void* start;
-    void* end;
-    unsigned int attr;
+    struct llist_header head; // must be first field!
+    struct v_file* mfile;
+    u32_t offset;
+    ptr_t start;
+    ptr_t end;
+    u32_t attr;
 };
 
 #endif /* __LUNAIX_MM_H */