Changeset b6b576c in mainline for generic/src/main/main.c

Timestamp:

2006-03-16T11:34:51Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d764ddc

Parents:

8dfef11

Message:

support for more init tasks
(might break some archs yet)

File:

• generic/src/main/main.c (modified) (5 diffs)

generic/src/main/main.c

@@ -64 +64 @@
 
 config_t config;        /**< Global configuration structure. */
+init_t init = {0};  /**< Initial user-space tasks */
 
 context_t ctx;
@@ -75 +76 @@
 size_t hardcoded_ktext_size = 0;
 size_t hardcoded_kdata_size = 0;
-
-__address init_addr = 0;
-size_t init_size = 0;
 
 void main_bsp(void);
@@ -111 +109 @@
         config.base = hardcoded_load_address;
         config.memory_size = get_memory_size();
-        config.init_addr = init_addr;
-        config.init_size = init_size;
         
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size + hardcoded_kdata_size, PAGE_SIZE);
         stackaddr = config.base + config.kernel_size;
+        
         /* Avoid placing kernel on top of init */
-        if (overlaps(stackaddr,CONFIG_STACK_SIZE,
-                     config.init_addr, config.init_size)) {
-                
-                stackaddr = ALIGN_UP(config.init_addr+config.init_size,
-                                     CONFIG_STACK_SIZE);
-                config.init_size = ALIGN_UP(config.init_size,CONFIG_STACK_SIZE) + CONFIG_STACK_SIZE;
-        } else {
+        count_t i;
+        bool overlap = false;
+        for (i = 0; i < init.cnt; i++)
+                if (overlaps(stackaddr, CONFIG_STACK_SIZE, init.tasks[i].addr, init.tasks[i].size)) {
+                        stackaddr = ALIGN_UP(init.tasks[i].addr + init.tasks[i].size, CONFIG_STACK_SIZE);
+                        init.tasks[i].size = ALIGN_UP(init.tasks[i].size, CONFIG_STACK_SIZE) + CONFIG_STACK_SIZE;
+                        overlap = true;
+                }
+        
+        if (!overlap)
                 config.kernel_size += CONFIG_STACK_SIZE;
-        }
         
         context_save(&ctx);
@@ -152 +151 @@
          */
         kconsole_init();
-
+        
         /*
          * Exception handler initialization, before architecture
@@ -190 +189 @@
         thread_init();
         
-        if (config.init_size > 0)
-                printf("config.init_addr=%P, config.init_size=%d\n", config.init_addr, config.init_size);
+        count_t i;
+        for (i = 0; i < init.cnt; i++)
+                printf("init[%d].addr=%P, init[%d].size=%d\n", i, init.tasks[i].addr, i, init.tasks[i].size);
         
         ipc_init();