Changeset fe7abd0 in mainline

Timestamp:

2010-06-22T21:36:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cefb126, fc14438

Parents:

1e3c2f1

Message:

Use r2 instead of gp to pass the bootinfo address. Group the code which belongs together and fix one RAW conflict.

Files:

• boot/arch/ia64/src/asm.S (modified) (1 diff)
• kernel/arch/ia64/src/start.S (modified) (2 diffs)

boot/arch/ia64/src/asm.S

@@ -113 +113 @@
 jump_to_kernel:
         alloc loc0 = ar.pfs, 1, 1, 0, 0
-        mov r1 = in0 ;;                 # Pass bootinfo address
+        mov r2 = in0 ;;                 # Pass bootinfo address
         movl r8 = KERNEL_ADDRESS;;
         mov b1 = r8 ;;

kernel/arch/ia64/src/start.S

@@ -47 +47 @@
 
 stack0:
+
+#
+# Kernel entry point.
+#
+# This is where we are passed control from the boot code.
+# Register contents:
+#
+#       r2      Address of the boot code's bootinfo structure.
+#
 kernel_image_start:
         .auto
@@ -165 +174 @@
         
         # Initialize gp (Global Pointer) register
-        movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
-        or r20 = r20, gp ;;
         movl gp = kernel_image_start
         
-        /*
-         * Initialize bootinfo on BSP.
-         */
+        #       
+        # Initialize bootinfo on BSP.
+        #
+        movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
+        or r20 = r20, r2 ;;
         addl r21 = @gprel(bootinfo), gp ;;
         st8 [r21] = r20