Changeset 127c957b in mainline

Timestamp:

2006-05-27T20:02:27Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00b595b

Parents:

0ee077ee

Message:

Make address space backend data a union.

Location:

generic

Files:

• include/elf.h (modified) (1 diff)
• include/mm/as.h (modified) (2 diffs)
• src/ddi/ddi.c (modified) (1 diff)
• src/lib/elf.c (modified) (1 diff)
• src/mm/backend_anon.c (modified) (1 diff)
• src/mm/backend_elf.c (modified) (2 diffs)
• src/mm/backend_phys.c (modified) (1 diff)

generic/include/elf.h

@@ -32 +32 @@
 #include <arch/elf.h>
 #include <arch/types.h>
-#include <mm/as.h>
+#include <typedefs.h>
 
 /**

generic/include/mm/as.h

@@ -47 +47 @@
 #include <adt/list.h>
 #include <adt/btree.h>
+#include <elf.h>
 
 /** Defined to be true if user address space and kernel address space shadow each other. */
@@ -119 +120 @@
 
 /** Backend data stored in address space area. */
-typedef struct backend_data {
-        __native d1;
-        __native d2;
+typedef union {
+        struct {        /**< elf_backend members */
+                elf_header_t *elf;
+                elf_segment_header_t *segment;
+        };
+        struct {        /**< phys_backend members */
+                __address base;
+                count_t frames;
+        };
 } mem_backend_data_t;
 

generic/src/ddi/ddi.c

@@ -66 +66 @@
         task_t *t;
         int flags;
-        mem_backend_data_t backend_data = { .d1 = (__native) pf, .d2 = (__native) pages };
+        mem_backend_data_t backend_data;
+
+        backend_data.base = pf;
+        backend_data.frames = pages;
         
         /*

generic/src/lib/elf.c

@@ -163 +163 @@
         as_area_t *a;
         int flags = 0;
-        mem_backend_data_t backend_data = { .d1 = (__native) elf, .d2 = (__native) entry };
+        mem_backend_data_t backend_data;
+        
+        backend_data.elf = elf;
+        backend_data.segment = entry;
 
         if (entry->p_align > 1) {

generic/src/mm/backend_anon.c

@@ -52 +52 @@
 static void anon_share(as_area_t *area);
 
-/*
- * Anonymous memory backend.
- */
 mem_backend_t anon_backend = {
         .page_fault = anon_page_fault,

generic/src/mm/backend_elf.c

@@ -65 +65 @@
 int elf_page_fault(as_area_t *area, __address addr, pf_access_t access)
 {
-        elf_header_t *elf = (elf_header_t *) area->backend_data.d1;
-        elf_segment_header_t *entry = (elf_segment_header_t *) area->backend_data.d2;
+        elf_header_t *elf = area->backend_data.elf;
+        elf_segment_header_t *entry = area->backend_data.segment;
         __address base, frame;
         index_t i;
@@ -133 +133 @@
 void elf_frame_free(as_area_t *area, __address page, __address frame)
 {
-        elf_header_t *elf = (elf_header_t *) area->backend_data.d1;
-        elf_segment_header_t *entry = (elf_segment_header_t *) area->backend_data.d2;
+        elf_header_t *elf = area->backend_data.elf;
+        elf_segment_header_t *entry = area->backend_data.segment;
         __address base;
         index_t i;

generic/src/mm/backend_phys.c

@@ -64 +64 @@
 int phys_page_fault(as_area_t *area, __address addr, pf_access_t access)
 {
-        __address base = (__address) area->backend_data.d1;
-        count_t frames = (count_t) area->backend_data.d2;
+        __address base = area->backend_data.base;
+        count_t frames = area->backend_data.frames;
 
         if (!as_area_check_access(area, access))