Changeset 7f1bfce in mainline

Timestamp:

2005-05-17T20:46:19Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6b96ab44

Parents:

87be9cfb

Message:

Add SP_DELTA macro for each architecture.
On IA-32, this macro represents two doublewords that must be on the stack when switching to a new stack.
On MIPS, there is no need to fix sp when switching to a new stack.
On IA-64, this macro is used to allocate the 16-byte scratch area.

IA-64 work.
Changes in start.S. More changes to come.
Define memcopy().

Janitorial fixes.
Add missing #include <panic.h> to rwlock4/test.c.
Remove wrong use of inline keyword from both declaration and definition of l_apic_id().

Files:

• arch/ia32/include/context.h (modified) (1 diff)
• arch/ia32/include/smp/apic.h (modified) (1 diff)
• arch/ia32/src/smp/apic.c (modified) (1 diff)
• arch/ia64/include/context.h (modified) (1 diff)
• arch/ia64/src/asm.S (modified) (1 diff)
• arch/ia64/src/start.S (modified) (1 diff)
• arch/mips/include/context.h (modified) (1 diff)
• src/main/main.c (modified) (2 diffs)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)
• test/synch/rwlock4/test.c (modified) (1 diff)

arch/ia32/include/context.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-
+#define SP_DELTA        8
 
 struct context {

arch/ia32/include/smp/apic.h

@@ -130 +130 @@
 extern void l_apic_debug(void);
 extern void l_apic_timer_interrupt(__u8 n, __u32 stack[]);
-extern inline __u8 l_apic_id(void);
+extern __u8 l_apic_id(void);
 
 extern __u32 io_apic_read(__u8 address);

arch/ia32/src/smp/apic.c

@@ -325 +325 @@
 }
 
-inline __u8 l_apic_id(void)
+__u8 l_apic_id(void)
 {
         return (l_apic[L_APIC_ID] >> L_APIC_IDShift)&L_APIC_IDMask;

arch/ia64/include/context.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+
+#define SP_DELTA        16
 
 struct context {

arch/ia64/src/asm.S

@@ -39 +39 @@
                 
         br _memcopy
+
+.global memcopy
+memcopy:
+        br _memcopy

arch/ia64/src/start.S

@@ -35 +35 @@
 stack0:
 kernel_image_start:
+        .auto
+        # initialize PSR
+        mov psr.l = r0
+        
         # initialize register stack
-        alloc r1 = ar.pfs, 0, 0, 0, 0   ;;
+        mov ar.rsc = r0
+        loadrs
 
+        .explicit
         # initialize memory stack to some sane value
-        movl r12=stack0
+        movl r12 = stack0       ;;
+        add r12 = - 16, r12     /* allocate a scratch area on the stack */
 
         # initialize gp (Global Pointer) register

arch/mips/include/context.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-
+#define SP_DELTA        0
 
 

src/main/main.c

@@ -95 +95 @@
 
         context_save(&ctx);
-        ctx.sp = config.base + config.kernel_size - 8;
+        ctx.sp = config.base + config.kernel_size - SP_DELTA;
         ctx.pc = FADDR(main_bsp_separated_stack);
         context_restore(&ctx);
@@ -193 +193 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-8];
+        CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-SP_DELTA];
         CPU->saved_context.pc = FADDR(main_ap_separated_stack);
         context_restore(&CPU->saved_context);

src/proc/scheduler.c

@@ -233 +233 @@
          */
         context_save(&CPU->saved_context);
-        CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-8];
+        CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-SP_DELTA];
         CPU->saved_context.pc = FADDR(scheduler_separated_stack);
         context_restore(&CPU->saved_context);

src/proc/thread.c

@@ -167 +167 @@
                 context_save(&t->saved_context);
                 t->saved_context.pc = FADDR(cushion);
-                t->saved_context.sp = (__address) &t->kstack[THREAD_STACK_SIZE-8];
+                t->saved_context.sp = (__address) &t->kstack[THREAD_STACK_SIZE-SP_DELTA];
 
                 pri = cpu_priority_high();

test/synch/rwlock4/test.c

@@ -34 +34 @@
 #include <arch/types.h>
 #include <arch/context.h>
+#include <panic.h>
 
 #include <synch/waitq.h>