Changeset c23502d in mainline

Timestamp:

2006-03-15T23:54:19Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2d5a54f3

Parents:

649799a

Message:

Support only anonymous address space areas.

Location:

generic

Files:

• include/mm/as.h (modified) (3 diffs)
• src/lib/elf.c (modified) (3 diffs)
• src/mm/as.c (modified) (4 diffs)
• src/proc/task.c (modified) (1 diff)

generic/include/mm/as.h

@@ -49 +49 @@
 #define FLAG_AS_KERNEL      (1 << 0)    /**< Kernel address space. */
 
-enum as_area_type {
-        AS_AREA_TEXT = 1, AS_AREA_DATA, AS_AREA_STACK 
-};
+/** Address space area flags. */
+#define AS_AREA_READ    1
+#define AS_AREA_WRITE   2
+#define AS_AREA_EXEC    4
 
 /** Address space area structure.
@@ -61 +62 @@
         SPINLOCK_DECLARE(lock);
         link_t link;
-        as_area_type_t type;
+        int flags;
         size_t size;            /**< Size of this area in multiples of PAGE_SIZE. */
         __address base;         /**< Base address of this area. */
@@ -104 +105 @@
 extern void as_init(void);
 extern as_t *as_create(int flags);
-extern as_area_t *as_area_create(as_t *as, as_area_type_t type, size_t size, __address base);
+extern as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base);
 extern __address as_remap(as_t *as, __address address, size_t size, int flags);
 extern void as_set_mapping(as_t *as, __address page, __address frame);

generic/src/lib/elf.c

@@ -156 +156 @@
 {
         as_area_t *a;
-        int i, type = 0;
+        int i, flags = 0;
         size_t segment_size;
         __u8 *segment;
@@ -172 +172 @@
                 return EE_MEMORY;
         
-        if (entry->p_flags & PF_X) {
-                type = AS_AREA_TEXT;
-        } else if (entry->p_flags & PF_W) {
-                type = AS_AREA_DATA;
-        } else {
-                return EE_UNSUPPORTED;
-        }
+        if (entry->p_flags & PF_X)
+                flags |= AS_AREA_EXEC;
+        if (entry->p_flags & PF_W)
+                flags |= AS_AREA_WRITE;
+        if (entry->p_flags & PF_R)
+                flags |= AS_AREA_READ;
 
         /*
@@ -195 +194 @@
                 segment = ((void *) elf) + entry->p_offset;
 
-        a = as_area_create(as, type, SIZE2FRAMES(entry->p_memsz), entry->p_vaddr);
+        a = as_area_create(as, flags, SIZE2FRAMES(entry->p_memsz), entry->p_vaddr);
         if (!a)
                 return EE_IRRECOVERABLE;

generic/src/mm/as.c

@@ -120 +120 @@
  *
  * @param as Target address space.
- * @param type Type of area.
+ * @param flags Flags of the area.
  * @param size Size of area in multiples of PAGE_SIZE.
  * @param base Base address of area.
@@ -126 +126 @@
  * @return Address space area on success or NULL on failure.
  */
-as_area_t *as_area_create(as_t *as, as_area_type_t type, size_t size, __address base)
+as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base)
 {
         ipl_t ipl;
@@ -146 +146 @@
         
         link_initialize(&a->link);                      
-        a->type = type;
+        a->flags = flags;
         a->size = size;
         a->base = base;
@@ -327 +327 @@
         int flags;
 
-        switch (a->type) {
-                case AS_AREA_TEXT:
-                        flags = PAGE_EXEC | PAGE_READ | PAGE_USER | PAGE_PRESENT | PAGE_CACHEABLE;
-                        break;
-                case AS_AREA_DATA:
-                case AS_AREA_STACK:
-                        flags = PAGE_READ | PAGE_WRITE | PAGE_USER | PAGE_PRESENT | PAGE_CACHEABLE;
-                        break;
-                default:
-                        panic("unexpected as_area_type_t %d", a->type);
-        }
+        flags = PAGE_USER | PAGE_PRESENT | PAGE_CACHEABLE;
+        
+        if (a->flags & AS_AREA_READ)
+                flags |= PAGE_READ;
+                
+        if (a->flags & AS_AREA_WRITE)
+                flags |= PAGE_WRITE;
+        
+        if (a->flags & AS_AREA_EXEC)
+                flags |= PAGE_EXEC;
         
         return flags;

generic/src/proc/task.c

@@ -123 +123 @@
          * Create the data as_area.
          */
-        a = as_area_create(as, AS_AREA_STACK, 1, USTACK_ADDRESS);
+        a = as_area_create(as, AS_AREA_READ | AS_AREA_WRITE, 1, USTACK_ADDRESS);
         
         thread_ready(t);