feat: shell and signal demo as loadable user executable

[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 5e31e519165791067bcbb9a19f984b8200f1dfba..24ced3cc9dcce584558e48e74c463c985242f49b 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/mm.h
+++ b/lunaix-os/includes/lunaix/mm/mm.h
@@ -6,15 +6,7 @@
 #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 <sys/mann_flags.h>
 
 /**
  * @brief 私有区域，该区域中的页无法进行任何形式的共享。
@@ -46,19 +38,54 @@ typedef struct
 #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);
+#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)
+
+struct proc_mm;
 
 struct mm_region
 {
     struct llist_header head; // must be first field!
+    struct proc_mm* proc_vms;
+
+    // file mapped to this region
     struct v_file* mfile;
-    u32_t offset;
+    // mapped file offset
+    off_t foff;
+    // mapped file length
+    u32_t flen;
+
     ptr_t start;
     ptr_t end;
     u32_t attr;
+
+    void** index; // fast reference, to accelerate access to this very region.
+
+    void* data;
+    // when a region is copied
+    void (*region_copied)(struct mm_region*);
+    // when a region is unmapped
+    void (*destruct_region)(struct mm_region*);
+};
+
+static inline void
+mm_index(void** index, struct mm_region* target)
+{
+    *index = (void*)target;
+    target->index = index;
+}
+
+typedef struct llist_header vm_regions_t;
+
+struct proc_mm
+{
+    vm_regions_t regions;
+    struct mm_region* heap;
+    struct mm_region* stack;
+    pid_t pid;
 };
 
 #endif /* __LUNAIX_MM_H */