Changeset ecbd287d in mainline

Timestamp:

2010-05-22T09:24:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eb239dc

Parents:

7c8e1e1 (diff), 7f1d897 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge sparc64 kernel stack tracing improvements.

Files:

• kernel/arch/sparc64/src/sun4u/start.S (modified) (4 diffs)
• kernel/arch/sparc64/src/sun4v/start.S (modified) (7 diffs)
• uspace/lib/c/arch/sparc64/src/thread_entry.s (modified) (1 diff)

kernel/arch/sparc64/src/sun4u/start.S

@@ -293 +293 @@
          * Call arch_pre_main(bootinfo)
          */
+        call arch_pre_main
         mov %o1, %o0
-        call arch_pre_main
-        nop
-        
+        
+        /*
+         * Create the first stack frame.
+         */
+        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        flushw
+        add %g0, -STACK_BIAS, %fp
+
         call main_bsp
         nop
@@ -303 +309 @@
 
 0:
-        ba %xcc, 0b
-        nop
+        ba,a %xcc, 0b
 
 
@@ -354 +359 @@
         ldx [%g1], %o6
 
+        /*
+         * Create the first stack frame.
+         */
+        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        flushw
+        add %g0, -STACK_BIAS, %fp
+
         call main_ap
         nop
@@ -361 +373 @@
         
 0:
-        ba %xcc, 0b
-        nop
+        ba,a %xcc, 0b
 
 

kernel/arch/sparc64/src/sun4v/start.S

@@ -155 +155 @@
         mov 0, %o5
         ta 0xff
-        nop
 
         /*
@@ -250 +249 @@
          * Call arch_pre_main(bootinfo)
          */
+        call arch_pre_main
         or %l1, %g0, %o0
-        call arch_pre_main
-        nop
         
+        /*
+         * Create the first stack frame.
+         */
+        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        flushw
+        add %g0, -STACK_BIAS, %fp
+
         call main_bsp
         nop
@@ -260 +265 @@
 
 0:
-        ba %xcc, 0b
-        nop
+        ba,a %xcc, 0b
 
 1:
@@ -273 +277 @@
          */
 
-        mov     1, %o0                  ! MMU enable flag
-        set     mmu_enabled, %o1
-        mov     MMU_ENABLE, %o5 ! MMU enable HV call
-        ta      0x80            ! call HV
+        mov 1, %o0              ! MMU enable flag
+        set mmu_enabled, %o1
+        mov MMU_ENABLE, %o5     ! MMU enable HV call
+        ta 0x80                 ! call HV
 
         mmu_enabled:
@@ -289 +293 @@
         ldx [%g1], %o6
 
+        /*
+         * Create the first stack frame.
+         */
+        save %sp, -(STACK_WINDWO_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        flushw
+        add %g0, -STACK_BIAS, %fp
+
         call main_ap
         nop
@@ -295 +306 @@
         /* Not reached. */
 0:
-        ba %xcc, 0b
-        nop
+        ba,a %xcc, 0b
 
 .align 8
@@ -314 +324 @@
 before_ap_boots:
         setx 0x80400000, %g0, %o0
-        ba %xcc, kernel_image_start
-        nop
+        ba,a %xcc, kernel_image_start
 
 .section K_DATA_START, "aw", @progbits

uspace/lib/c/arch/sparc64/src/thread_entry.s

@@ -38 +38 @@
         # Create the first stack frame.
         #
+        save %sp, -176, %sp
+        flushw
+        add %g0, -0x7ff, %fp
 
-        #save %sp, -176, %sp
-        #flushw
-        #add %g0, -0x7ff, %fp
+        #
+        # Propagate the input arguments to the new window.
+        #
+        mov %i0, %o0
 
         sethi %hi(_gp), %l7