Changeset fc14438 in mainline

Timestamp:

2010-07-01T18:33:34Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

64bbf13

Parents:

49ace23 (diff), fe7abd0 (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 progress from lp:~jakub/helenos/ia64-revival.

Files:

• boot/arch/ia64/src/asm.S (modified) (1 diff)
• kernel/arch/ia64/src/start.S (modified) (2 diffs)
• uspace/lib/c/arch/ia64/src/entry.s (modified) (1 diff)
• uspace/lib/c/arch/ia64/src/thread_entry.s (modified) (1 diff)

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
@@ -157 +166 @@
         loadrs
         
-        # Initialize memory stack to some sane value
-        movl r12 = stack0 ;;
-        add r12 = -16, r12  /* allocate a scratch area on the stack */
+        #
+        # Initialize memory stack to some sane value and allocate a scratch are
+        # on it.
+        #
+        movl sp = stack0 ;;
+        add sp = -16, sp
         
         # Initialize gp (Global Pointer) register
+        movl gp = kernel_image_start
+        
+        #       
+        # Initialize bootinfo on BSP.
+        #
         movl r20 = (VRN_KERNEL << VRN_SHIFT) ;;
-        or r20 = r20, r1 ;;
-        movl r1 = kernel_image_start
-        
-        /*
-         * Initialize bootinfo on BSP.
-         */
+        or r20 = r20, r2 ;;
         addl r21 = @gprel(bootinfo), gp ;;
         st8 [r21] = r20

uspace/lib/c/arch/ia64/src/entry.s

@@ -39 +39 @@
 __entry:
         alloc loc0 = ar.pfs, 0, 1, 2, 0
-        movl r1 = _gp
+        movl gp = _gp
 
         # Pass PCB pointer as the first argument to __main

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

@@ -37 +37 @@
         alloc loc0 = ar.pfs, 0, 1, 1, 0
 
-        movl r1 = _gp
+        movl gp = _gp
         
         #