Changeset 19a1800 in mainline for uspace/lib/c/generic/as.c

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with the current development

File:

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

uspace/lib/c/generic/as.c

@@ -35 +35 @@
 #include <as.h>
 #include <libc.h>
+#include <errno.h>
 #include <unistd.h>
 #include <align.h>
@@ -40 +41 @@
 #include <bitops.h>
 #include <malloc.h>
-
-/** Last position allocated by as_get_mappable_page */
-static uintptr_t last_allocated = 0;
+#include "private/libc.h"
 
 /** Create address space area.
@@ -103 +102 @@
 }
 
-/** Return pointer to some unmapped area, where fits new as_area
+/** Return pointer to unmapped address space area
  *
  * @param size Requested size of the allocation.
  *
- * @return pointer to the beginning
+ * @return Pointer to the beginning of unmapped address space area.
  *
  */
 void *as_get_mappable_page(size_t size)
 {
-        if (size == 0)
-                return NULL;
+        return (void *) __SYSCALL2(SYS_AS_GET_UNMAPPED_AREA,
+            (sysarg_t) __entry, (sysarg_t) size);
+}
+
+/** Find mapping to physical address.
+ *
+ * @param address Virtual address in question (virtual).
+ * @param[out] frame Frame address (physical).
+ * @return Error code.
+ * @retval EOK No error, @p frame holds the translation.
+ * @retval ENOENT Mapping not found.
+ */
+int as_get_physical_mapping(void *address, uintptr_t *frame)
+{
+        uintptr_t tmp_frame;
+        uintptr_t virt = (uintptr_t) address;
         
-        size_t sz = 1 << (fnzb(size - 1) + 1);
-        if (last_allocated == 0)
-                last_allocated = get_max_heap_addr();
+        int rc = (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING,
+            (sysarg_t) virt, (sysarg_t) &tmp_frame);
+        if (rc != EOK) {
+                return rc;
+        }
         
-        /*
-         * Make sure we allocate from naturally aligned address.
-         */
-        uintptr_t res = ALIGN_UP(last_allocated, sz);
-        last_allocated = res + ALIGN_UP(size, PAGE_SIZE);
+        if (frame != NULL) {
+                *frame = tmp_frame;
+        }
         
-        return ((void *) res);
+        return EOK;
 }