Changeset ecbd287d in mainline for kernel/arch/sparc64/src/sun4u/start.S

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.

File:

• kernel/arch/sparc64/src/sun4u/start.S (modified) (4 diffs)

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