Changes in kernel/generic/include/mm/as.h [fc47885:c0699467] in mainline

File:

• kernel/generic/include/mm/as.h (modified) (7 diffs)

kernel/generic/include/mm/as.h

@@ -36 +36 @@
 #define KERN_AS_H_
 
-#ifdef KERNEL
-        #include <typedefs.h>
-#else
-        #include <sys/types.h>
-#endif
-
-/** Address space area flags. */
-#define AS_AREA_READ       1
-#define AS_AREA_WRITE      2
-#define AS_AREA_EXEC       4
-#define AS_AREA_CACHEABLE  8
-
-/** Address space area info exported to userspace. */
-typedef struct {
-        /** Starting address */
-        uintptr_t start_addr;
-        
-        /** Area size */
-        size_t size;
-        
-        /** Area flags */
-        unsigned int flags;
-} as_area_info_t;
-
-#ifdef KERNEL
-
+#include <typedefs.h>
+#include <abi/mm/as.h>
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
 #include <arch/mm/asid.h>
+#include <arch/istate.h>
 #include <typedefs.h>
 #include <synch/spinlock.h>
@@ -84 +61 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#ifdef USTACK_ADDRESS_ARCH
+        #define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#else
+        #define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
+#endif
 
 /** Kernel address space. */
@@ -238 +219 @@
 /** Address space area backend structure. */
 typedef struct mem_backend {
+        bool (* create)(as_area_t *);
+        bool (* resize)(as_area_t *, size_t);
+        void (* share)(as_area_t *);
+        void (* destroy)(as_area_t *);
+
         int (* page_fault)(as_area_t *, uintptr_t, pf_access_t);
         void (* frame_free)(as_area_t *, uintptr_t, uintptr_t);
-        void (* share)(as_area_t *);
 } mem_backend_t;
 
@@ -246 +231 @@
 
 extern as_operations_t *as_operations;
-extern link_t inactive_as_with_asid_head;
+extern list_t inactive_as_with_asid_list;
 
 extern void as_init(void);
@@ -298 +283 @@
 extern mem_backend_t phys_backend;
 
-/**
- * This flags is passed when running the loader, otherwise elf_load()
- * would return with a EE_LOADER error code.
- *
- */
-#define ELD_F_NONE    0
-#define ELD_F_LOADER  1
-
-extern unsigned int elf_load(elf_header_t *, as_t *, unsigned int);
-
 /* Address space area related syscalls. */
 extern sysarg_t sys_as_area_create(uintptr_t, size_t, unsigned int);
@@ -313 +288 @@
 extern sysarg_t sys_as_area_change_flags(uintptr_t, unsigned int);
 extern sysarg_t sys_as_area_destroy(uintptr_t);
+extern sysarg_t sys_as_get_unmapped_area(uintptr_t, size_t);
 
 /* Introspection functions. */
@@ -318 +294 @@
 extern void as_print(as_t *);
 
-#endif /* KERNEL */
-
 #endif