Changeset ef67bab in mainline for generic/src/main

Timestamp:

2006-02-01T00:02:16Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

071a8ae6

Parents:

fc1e4f6

Message:

Memory management work.
Remove the last (i.e. 'root') argument from page_mapping_insert() and page_mapping_find().
Page table address is now extracted from the first (i.e. 'as') argument.
Add a lot of infrastructure to make the above possible.
sparc64 is now broken, most likely because of insufficient identity mapping of physical memory.

Location:

generic/src/main

Files:

• kinit.c (modified) (4 diffs)
• main.c (modified) (4 diffs)

generic/src/main/kinit.c

@@ -148 +148 @@
                         panic("config.init_addr is not frame aligned");
                 
-                as = as_create(NULL, 0);
+                as = as_create(0);
                 if (!as)
                         panic("as_create\n");
@@ -159 +159 @@
                 
                 /*
-                 * Create the text as_area and copy the userspace code there.
+                 * Create the text as_area and initialize its mapping.
                  */
                 
@@ -170 +170 @@
                 if (!a)
                         panic("as_area_create: text\n");
-                
+
+                for (i = 0; i < frames; i++)
+                        as_set_mapping(as, UTEXT_ADDRESS + i * PAGE_SIZE, frame + i * FRAME_SIZE);
+
                 /*
                  * Create the data as_area.
@@ -178 +181 @@
                         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);
         }

generic/src/main/main.c

@@ -139 +139 @@
 void main_bsp_separated_stack(void) 
 {
-        as_t *as;
         task_t *k;
         thread_t *t;
@@ -152 +151 @@
         kconsole_init();
 
-        /* Exception handler initialization, before architecture
+        /*
+         * Exception handler initialization, before architecture
          * starts adding its own handlers
          */
@@ -163 +163 @@
         early_heap_init(config.heap_addr, config.heap_size + config.heap_delta);
         frame_init();
+        as_init();
         page_init();
         tlb_init();
@@ -190 +191 @@
 
         /*
-         * Create kernel address space.
-         */
-        as = as_create(GET_PTL0_ADDRESS(), FLAG_AS_KERNEL);
-        if (!as)
-                panic("can't create kernel address space\n");
-
-        /*
          * Create kernel task.
          */
-        k = task_create(as);
+        k = task_create(AS_KERNEL);
         if (!k)
                 panic("can't create kernel task\n");