Changeset b50b5af2 in mainline for boot/arch/sparc64/loader/boot.S

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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 mainline changes.

File:

• boot/arch/sparc64/loader/boot.S (modified) (5 diffs)

boot/arch/sparc64/loader/boot.S

@@ -31 +31 @@
 #include <register.h>
 
-#define INITIAL_STACK_SIZE      8192
+#define INITIAL_STACK_SIZE  8192
 
-#define NWINDOWS                8
+#define NWINDOWS  8
 
 .register %g2, #scratch
@@ -57 +57 @@
         .half 0
         .half 0
+
 .global silo_ramdisk_image
 silo_ramdisk_image:
         .word 0
+
 .global silo_ramdisk_size
 silo_ramdisk_size:
@@ -65 +67 @@
 
 .align 8
-1:      
+1:
         /*
          * Disable interrupts and disable address masking.
@@ -71 +73 @@
         wrpr %g0, PSTATE_PRIV_BIT, %pstate
         
-        wrpr %g0, NWINDOWS - 2, %cansave        ! set maximum saveable windows
-        wrpr %g0, 0, %canrestore                ! get rid of windows we will never need again
-        wrpr %g0, 0, %otherwin                  ! make sure the window state is consistent
-        wrpr %g0, NWINDOWS - 1, %cleanwin       ! prevent needless clean_window traps for kernel
-
+        wrpr %g0, NWINDOWS - 2, %cansave   ! set maximum saveable windows
+        wrpr %g0, 0, %canrestore           ! get rid of windows we will never need again
+        wrpr %g0, 0, %otherwin             ! make sure the window state is consistent
+        wrpr %g0, NWINDOWS - 1, %cleanwin  ! prevent needless clean_window traps for kernel
+        
         set initial_stack_top, %sp
         add %sp, -STACK_BIAS, %sp
-
+        
         set ofw_cif, %l0
- 
-        call ofw_init           ! initialize OpenFirmware
+        
+        call ofw_init   ! initialize OpenFirmware
         stx %o4, [%l0]
         
@@ -90 +92 @@
 initial_stack:
         .space INITIAL_STACK_SIZE
+
 initial_stack_top:
         .space STACK_WINDOW_SAVE_AREA_SIZE