Changeset 6a3c9a7 in mainline for generic/src/main/kinit.c

Timestamp:

2006-01-30T23:44:00Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fc1e4f6

Parents:

a60c748

Message:

Remove address space area mapping array.
The information is to be stored directly in page tables.
This is to better support 64-bit systems which can have
fairly large address space areas.

File:

• generic/src/main/kinit.c (modified) (4 diffs)

generic/src/main/kinit.c

@@ -72 +72 @@
         as_t *as;
         as_area_t *a;
-        index_t frame, frames;
-        index_t pfn;
+        __address frame;
+        count_t frames;
+        int i;
         task_t *u;
 
@@ -161 +162 @@
                  */
                 
-                frame = KA2PA(config.init_addr) / FRAME_SIZE;
+                frame = KA2PA(config.init_addr);
                 frames = config.init_size / FRAME_SIZE;
                 if (config.init_size % FRAME_SIZE > 0)
@@ -170 +171 @@
                         panic("as_area_create: text\n");
                 
-                for (pfn = 0; pfn < frames; pfn++)
-                        as_area_set_mapping(a, pfn, frame + pfn);
-        
                 /*
                  * Create the data as_area.
@@ -179 +177 @@
                 if (!a)
                         panic("as_area_create: stack\n");
+
+                /*
+                 * Initialize text area mapping.
+                 */
+                for (i = 0; i < frames; i++)
+                        as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE);
+
         
                 thread_ready(t);