Support to multi-threading and pthread interface (POSIX.1-2008) (#23)

[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 5890f6181e677c95a81d768f7b2acbff1ae2eb29..31954d37b32b05cd146d5b3e16bdae6285de7252 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/mm.h
+++ b/lunaix-os/includes/lunaix/mm/mm.h
@@ -1,40 +1,30 @@
 #ifndef __LUNAIX_MM_H
 #define __LUNAIX_MM_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
-{
-    void* start;
-    void* brk;
-    void* max_addr;
-    mutex_t lock;
-} heap_context_t;
+#include <usr/lunaix/mann_flags.h>
 
 /**
  * @brief 私有区域，该区域中的页无法进行任何形式的共享。
  *
  */
-#define REGION_PRIVATE MAP_PRIVATE
+#define REGION_PRIVATE MAP_EXCLUSIVE
 
 /**
  * @brief
  * 读共享区域，该区域中的页可以被两个进程之间读共享，但任何写操作须应用Copy-On-Write
+ * 等价于 POSIX 的 MAP_PRIVATE
  *
  */
-#define REGION_RSHARED MAP_RSHARED
+#define REGION_RSHARED MAP_PRIVATE
 
 /**
  * @brief
  * 写共享区域，该区域中的页可以被两个进程之间读共享，任何的写操作无需执行Copy-On-Write
- *
+ * 等价于 POSIX 的 MAP_SHARED
  */
-#define REGION_WSHARED MAP_WSHARED
+#define REGION_WSHARED MAP_SHARED
 
 #define REGION_PERM_MASK 0x1c
 #define REGION_MODE_MASK 0x3
@@ -44,20 +34,12 @@ typedef struct
 #define REGION_EXEC PROT_EXEC
 #define REGION_ANON MAP_ANON
 #define REGION_RW REGION_READ | REGION_WRITE
+#define REGION_KERNEL (1 << 31)
 
-#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; // must be first field!
-    struct v_file* mfile;
-    u32_t offset;
-    ptr_t start;
-    ptr_t end;
-    u32_t attr;
-};
+#define REGION_TYPE_CODE (1 << 16)
+#define REGION_TYPE_GENERAL (2 << 16)
+#define REGION_TYPE_HEAP (3 << 16)
+#define REGION_TYPE_STACK (4 << 16)
+#define REGION_TYPE_VARS (5 << 16)
 
 #endif /* __LUNAIX_MM_H */