Changes in uspace/lib/c/generic/as.c [56273bb:63f8966] in mainline

File:

• uspace/lib/c/generic/as.c (modified) (5 diffs)

uspace/lib/c/generic/as.c

@@ -40 +40 @@
 #include <bitops.h>
 #include <malloc.h>
-#include "private/libc.h"
+
+/** Last position allocated by as_get_mappable_page */
+static uintptr_t last_allocated = 0;
 
 /** Create address space area.
@@ -51 +53 @@
  *
  */
-void *as_area_create(void *address, size_t size, unsigned int flags)
+void *as_area_create(void *address, size_t size, int flags)
 {
         return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t) address,
@@ -67 +69 @@
  *
  */
-int as_area_resize(void *address, size_t size, unsigned int flags)
+int as_area_resize(void *address, size_t size, int flags)
 {
         return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t) address,
@@ -95 +97 @@
  *
  */
-int as_area_change_flags(void *address, unsigned int flags)
+int as_area_change_flags(void *address, int flags)
 {
         return __SYSCALL2(SYS_AS_AREA_CHANGE_FLAGS, (sysarg_t) address,
@@ -101 +103 @@
 }
 
-/** Return pointer to unmapped address space area
+/** Return pointer to some unmapped area, where fits new as_area
  *
  * @param size Requested size of the allocation.
  *
- * @return Pointer to the beginning of unmapped address space area.
+ * @return pointer to the beginning
  *
  */
 void *as_get_mappable_page(size_t size)
 {
-        return (void *) __SYSCALL2(SYS_AS_GET_UNMAPPED_AREA,
-            (sysarg_t) __entry, (sysarg_t) size);
+        if (size == 0)
+                return NULL;
+        
+        size_t sz = 1 << (fnzb(size - 1) + 1);
+        if (last_allocated == 0)
+                last_allocated = get_max_heap_addr();
+        
+        /*
+         * Make sure we allocate from naturally aligned address.
+         */
+        uintptr_t res = ALIGN_UP(last_allocated, sz);
+        last_allocated = res + ALIGN_UP(size, PAGE_SIZE);
+        
+        return ((void *) res);
 }