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 060b88181aa733d7d2592155a5fffe3509119e1a..31954d37b32b05cd146d5b3e16bdae6285de7252 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/mm.h
+++ b/lunaix-os/includes/lunaix/mm/mm.h
@@ -1,55 +1,45 @@
 #ifndef __LUNAIX_MM_H
 #define __LUNAIX_MM_H
 
 #ifndef __LUNAIX_MM_H
 #define __LUNAIX_MM_H
 

-#include <lunaix/ds/llist.h>
-#include <lunaix/ds/mutex.h>
+#include <lunaix/types.h>

 
 

-typedef struct
-{
-    void* start;
-    void* brk;
-    void* max_addr;
-    mutex_t lock;
-} heap_context_t;
+#include <usr/lunaix/mann_flags.h>

 
 /**
  * @brief 私有区域，该区域中的页无法进行任何形式的共享。
  *
  */
 
 /**
  * @brief 私有区域，该区域中的页无法进行任何形式的共享。
  *
  */

-#define REGION_PRIVATE 0x0
+#define REGION_PRIVATE MAP_EXCLUSIVE

 
 /**
  * @brief
  * 读共享区域，该区域中的页可以被两个进程之间读共享，但任何写操作须应用Copy-On-Write
 
 /**
  * @brief
  * 读共享区域，该区域中的页可以被两个进程之间读共享，但任何写操作须应用Copy-On-Write

+ * 等价于 POSIX 的 MAP_PRIVATE

  *
  */
  *
  */

-#define REGION_RSHARED 0x1
+#define REGION_RSHARED MAP_PRIVATE

 
 /**
  * @brief
  * 写共享区域，该区域中的页可以被两个进程之间读共享，任何的写操作无需执行Copy-On-Write
 
 /**
  * @brief
  * 写共享区域，该区域中的页可以被两个进程之间读共享，任何的写操作无需执行Copy-On-Write

- *
+ * 等价于 POSIX 的 MAP_SHARED

  */
  */

-#define REGION_WSHARED 0x2
+#define REGION_WSHARED MAP_SHARED

 
 #define REGION_PERM_MASK 0x1c
 
 #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_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;
-    unsigned long start;
-    unsigned long end;
-    unsigned int 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 */
 
 #endif /* __LUNAIX_MM_H */