regression: mmap for fd

[lunaix-os.git] / 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 6585916e4136d48cb2c0afa96ac341c4babfb65f..5890f6181e677c95a81d768f7b2acbff1ae2eb29 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/mm.h
+++ b/lunaix-os/includes/lunaix/mm/mm.h
@@ -3,6 +3,10 @@
 
 #include <lunaix/ds/llist.h>
 #include <lunaix/ds/mutex.h>
 
 #include <lunaix/ds/llist.h>
 #include <lunaix/ds/mutex.h>

+#include <lunaix/fs.h>
+#include <lunaix/types.h>
+
+#include <usr/sys/mann_flags.h>

 
 typedef struct
 {
 
 typedef struct
 {


@@ -16,28 +20,29 @@ typedef struct
  * @brief 私有区域，该区域中的页无法进行任何形式的共享。
  *
  */
  * @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_PERM_MASK 0x1c
 #define REGION_MODE_MASK 0x3
 

-#define REGION_READ (1 << 2)
-#define REGION_WRITE (1 << 3)
-#define REGION_EXEC (1 << 4)
+#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_RW REGION_READ | REGION_WRITE
 
 #define REGION_TYPE_CODE (1 << 16);


@@ -47,10 +52,12 @@ typedef struct
 
 struct mm_region
 {
 
 struct mm_region
 {

-    struct llist_header head;
-    unsigned long start;
-    unsigned long 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 */
 };
 
 #endif /* __LUNAIX_MM_H */