Changeset b6d4566 in mainline for generic/src

Timestamp:

2006-03-27T16:56:51Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff75d34

Parents:

50fe620

Message:

CPU stacks must have two frames on ia64.
Make sure both thread stack frames are mapped in before_thread_runs_arch().
Take STACK_FRAMES into account during kernel memory layout initialization in main_bsp().

Location:

generic/src

Files:

• cpu/cpu.c (modified) (1 diff)
• main/main.c (modified) (2 diffs)
• proc/thread.c (modified) (1 diff)

generic/src/cpu/cpu.c

@@ -63 +63 @@
 
                 for (i=0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC)));
+                        cpus[i].stack = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(STACK_FRAMES, FRAME_KA | FRAME_PANIC)));
                         
                         cpus[i].id = i;

generic/src/main/main.c

@@ -93 +93 @@
 #endif
 
+#define CONFIG_STACK_SIZE       ((1<<STACK_FRAMES)*STACK_SIZE)
+
 /** Bootstrap CPU main kernel routine
  *
@@ -129 +131 @@
         
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), 
-                    stackaddr, CONFIG_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), stackaddr, THREAD_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */

generic/src/proc/thread.c

@@ -267 +267 @@
         
         /* Not needed, but good for debugging */
-        memsetb((__address)t->kstack, THREAD_STACK_SIZE, 0);
+        memsetb((__address)t->kstack, THREAD_STACK_SIZE * 1<<STACK_FRAMES, 0);
         
         ipl = interrupts_disable();