Changeset 77147d6 in mainline for generic/src/main/kinit.c

Timestamp:

2006-01-15T21:16:06Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5d2ab23

Parents:

44c259c

Message:

interface change: as_area_load_mapping → as_area_set_mapping (set single page mapping)
map init directly from the physical frames it is loaded in

File:

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

generic/src/main/kinit.c

@@ -72 +72 @@
         as_t *as;
         as_area_t *a;
-        __address frame;
-        index_t pfn[1];
+        index_t frame, frames;
+        index_t pfn;
         task_t *u;
 
@@ -134 +134 @@
         if ((t = thread_create(kconsole, "kconsole", TASK, 0)))
                 thread_ready(t);
-        else panic("thread_create/kconsole\n");
+        else
+                panic("thread_create/kconsole\n");
 
         interrupts_enable();
@@ -142 +143 @@
                  * Create the first user task.
                  */
+                
+                if (KA2PA(config.init_addr) % FRAME_SIZE)
+                        panic("config.init_addr is not frame aligned");
+                
                 as = as_create(NULL);
                 if (!as)
@@ -154 +159 @@
                 /*
                  * Create the text as_area and copy the userspace code there.
-                 */     
-                a = as_area_create(as, AS_AREA_TEXT, 1, UTEXT_ADDRESS);
+                 */
+                
+                frame = KA2PA(config.init_addr) / FRAME_SIZE;
+                frames = config.init_size / FRAME_SIZE;
+                if (config.init_size % FRAME_SIZE > 0)
+                        frames++;
+                
+                a = as_area_create(as, AS_AREA_TEXT, frames, UTEXT_ADDRESS);
                 if (!a)
                         panic("as_area_create: text\n");
                 
-                // FIXME: Better way to initialize static code/data
-                frame = frame_alloc(0, ONE_FRAME, NULL);
-                memcpy((void *) PA2KA(frame), (void *) config.init_addr, config.init_size < PAGE_SIZE ? config.init_size : PAGE_SIZE);
-                
-                pfn[0] = frame / FRAME_SIZE;
-                as_area_load_mapping(a, pfn);
+                for (pfn = 0; pfn < frames; pfn++)
+                        as_area_set_mapping(a, pfn, frame + pfn);
         
                 /*