Changeset 393f631 in mainline for src

Timestamp:

2005-08-31T21:51:04Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

33ccb2c

Parents:

94f0ae4

Message:

many PPC stuff, platform dependent arch.h header files

Location:

src

Files:

• main/main.c (modified) (5 diffs)
• proc/thread.c (modified) (2 diffs)

src/main/main.c

@@ -54 +54 @@
 #include <synch/waitq.h>
 
+#include <arch/arch.h>
 #include <arch.h>
 #include <arch/faddr.h>
@@ -107 +108 @@
         config.cpu_count = 1;
         config.cpu_active = 1;
-
+        
         kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE;    
         heap_delta = PAGE_SIZE - ((hardcoded_load_address + kernel_size) % PAGE_SIZE);
         heap_delta = (heap_delta == PAGE_SIZE) ? 0 : heap_delta;
         kernel_size += heap_delta;
-
+        
         config.base = hardcoded_load_address;
         config.memory_size = get_memory_size();
         config.kernel_size = kernel_size + CONFIG_STACK_SIZE;
-
+        
         context_save(&ctx);
+        early_mapping(config.base + hardcoded_ktext_size + hardcoded_kdata_size + heap_delta, CONFIG_STACK_SIZE + CONFIG_HEAP_SIZE);
         context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + kernel_size, CONFIG_STACK_SIZE);
-        context_map_stack(config.base + kernel_size, CONFIG_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -158 +159 @@
         cpu_init();
         calibrate_delay_loop();
-
+        
         timeout_init();
         scheduler_init();
@@ -168 +169 @@
          */
         m = vm_create(GET_PTL0_ADDRESS());
-        if (!m) panic("can't create kernel vm address space\n");
+        if (!m)
+                panic("can't create kernel vm address space\n");
 
         /*
@@ -174 +176 @@
          */
         k = task_create(m);
-        if (!k) panic("can't create kernel task\n");
-
+        if (!k)
+                panic("can't create kernel task\n");
+                
         /*
          * Create the first thread.
          */
         t = thread_create(kinit, NULL, k, 0);
-        if (!t) panic("can't create kinit thread\n");
+        if (!t)
+                panic("can't create kinit thread\n");
         thread_ready(t);
 

src/proc/thread.c

@@ -186 +186 @@
                 spinlock_unlock(&tidlock);
                 cpu_priority_restore(pri);
-
+                
                 memsetb(frame_ks, THREAD_STACK_SIZE, 0);
                 link_initialize(&t->rq_link);
@@ -194 +194 @@
                 t->kstack = (__u8 *) frame_ks;
                 t->ustack = (__u8 *) frame_us;
-                
                 
                 context_save(&t->saved_context);