Changeset f2c3fed in mainline

Timestamp:

2016-08-28T11:56:37Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

75b139f

Parents:

6aeca0d

Message:

Move AS_AREA_ANY, AS_MAP_FAILED and AS_AREA_UNPAGED to abi/

This way the macros can be also used in the kernel.

Files:

• abi/include/abi/mm/as.h (modified) (1 diff)
• kernel/generic/src/mm/as.c (modified) (4 diffs)
• uspace/lib/c/include/as.h (modified) (1 diff)

abi/include/abi/mm/as.h

@@ -44 +44 @@
 #define AS_AREA_LATE_RESERVE 0x20
 
+#define AS_AREA_ANY    ((void *) -1)
+#define AS_MAP_FAILED  ((void *) -1)
+
+#define AS_AREA_UNPAGED -1
+
 /** Address space area info exported to uspace. */
 typedef struct {

kernel/generic/src/mm/as.c

@@ -574 +574 @@
  * @param backend_data NULL or a pointer to custom backend data.
  * @param base         Starting virtual address of the area.
- *                     If set to -1, a suitable mappable area is found.
- * @param bound        Lowest address bound if base is set to -1.
+ *                     If set to AS_AREA_ANY, a suitable mappable area is
+ *                     found.
+ * @param bound        Lowest address bound if base is set to AS_AREA_ANY.
  *                     Otherwise ignored.
  *
@@ -585 +586 @@
     mem_backend_data_t *backend_data, uintptr_t *base, uintptr_t bound)
 {
-        if ((*base != (uintptr_t) -1) && !IS_ALIGNED(*base, PAGE_SIZE))
+        if ((*base != (uintptr_t) AS_AREA_ANY) && !IS_ALIGNED(*base, PAGE_SIZE))
                 return NULL;
         
@@ -601 +602 @@
         mutex_lock(&as->lock);
         
-        if (*base == (uintptr_t) -1) {
+        if (*base == (uintptr_t) AS_AREA_ANY) {
                 *base = as_get_unmapped_area(as, bound, size, guarded);
                 if (*base == (uintptr_t) -1) {
@@ -2188 +2189 @@
             AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, bound);
         if (area == NULL)
-                return (sysarg_t) -1;
+                return (sysarg_t) AS_MAP_FAILED;
         
         return (sysarg_t) virt;

uspace/lib/c/include/as.h

@@ -41 +41 @@
 #include <libarch/config.h>
 
-#define AS_AREA_ANY    ((void *) -1)
-#define AS_MAP_FAILED  ((void *) -1)
-
-#define AS_AREA_UNPAGED -1
-
 static inline size_t SIZE2PAGES(size_t size)
 {