Changeset 666773c in mainline for kernel/arch/ia64/src/start.S

Timestamp:

2008-12-31T15:33:29Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9805cde

Parents:

d8c0dc5

Message:

Humanitarian facelift for ia64.

File:

• kernel/arch/ia64/src/start.S (modified) (16 diffs)

kernel/arch/ia64/src/start.S

@@ -33 +33 @@
 
 #define RR_MASK (0xFFFFFFFF00000002)
-#define RID_SHIFT 8
-#define PS_SHIFT 2
-
-#define KERNEL_TRANSLATION_I  0x0010000000000661
-#define KERNEL_TRANSLATION_D  0x0010000000000661
-#define KERNEL_TRANSLATION_VIO 0x0010000000000671
-#define KERNEL_TRANSLATION_IO 0x00100FFFFC000671 
-#define KERNEL_TRANSLATION_FW 0x00100000F0000671 
-
-
+#define RID_SHIFT       8
+#define PS_SHIFT        2
+
+#define KERNEL_TRANSLATION_I    0x0010000000000661
+#define KERNEL_TRANSLATION_D    0x0010000000000661
+#define KERNEL_TRANSLATION_VIO  0x0010000000000671
+#define KERNEL_TRANSLATION_IO   0x00100FFFFC000671 
+#define KERNEL_TRANSLATION_FW   0x00100000F0000671 
 
 .section K_TEXT_START, "ax"
@@ -52 +50 @@
         .auto
 
-#identifi self(CPU) in OS structures by ID / EID
-        mov r9=cr64
-        mov r10=1
-        movl r12=0xffffffff
-        movl r8=cpu_by_id_eid_list
-        and r8=r8,r12
-        shr r9=r9,16
-        add r8=r8,r9
-        st1 [r8]=r10
-
-
+        # Identify self(CPU) in OS structures by ID / EID
+
+        mov r9 = cr64
+        mov r10 = 1
+        movl r12 = 0xffffffff
+        movl r8 = cpu_by_id_eid_list
+        and r8 = r8, r12
+        shr r9 = r9, 16
+        add r8 = r8, r9
+        st1 [r8] = r10
 
         mov psr.l = r0
@@ -70 +67 @@
         # Fill TR.i and TR.d using Region Register #VRN_KERNEL
 
-
         movl r8 = (VRN_KERNEL << VRN_SHIFT)
         mov r9 = rr[r8]
-
 
         movl r10 = (RR_MASK)
@@ -80 +75 @@
         or  r9 = r10, r9
 
-
         mov rr[r8] = r9
 
-
-
         movl r8 = (VRN_KERNEL << VRN_SHIFT)
         mov cr.ifa = r8
 
-        
         mov r11 = cr.itir ;;
         movl r10 = (KERNEL_PAGE_WIDTH << PS_SHIFT);;
-        or r10 =r10 , r11  ;;
+        or r10 = r10, r11 ;;
         mov cr.itir = r10;;
 
-        
         movl r10 = (KERNEL_TRANSLATION_I)
         itr.i itr[r0] = r10
-
-        
         movl r10 = (KERNEL_TRANSLATION_D)
         itr.d dtr[r0] = r10
 
-
         movl r7 = 1
         movl r8 = (VRN_KERNEL << VRN_SHIFT) | VIO_OFFSET
@@ -109 +96 @@
         itr.d dtr[r7] = r10
 
-
         mov r11 = cr.itir ;;
         movl r10 = ~0xfc;;
-        and r10 =r10 , r11  ;;
+        and r10 = r10, r11 ;;
         movl r11 = (IO_PAGE_WIDTH << PS_SHIFT);;
-        or r10 =r10 , r11  ;;
+        or r10 = r10, r11 ;;
         mov cr.itir = r10;;
-
 
         movl r7 = 2
@@ -124 +109 @@
         itr.d dtr[r7] = r10
 
-
-#setup mapping for fimware arrea (also SAPIC)
+        # Setup mapping for fimware arrea (also SAPIC)
+
         mov r11 = cr.itir ;;
         movl r10 = ~0xfc;;
-        and r10 =r10 , r11  ;;
+        and r10 = r10, r11 ;;
         movl r11 = (FW_PAGE_WIDTH << PS_SHIFT);;
-        or r10 =r10 , r11  ;;
+        or r10 = r10, r11 ;;
         mov cr.itir = r10;;
-
 
         movl r7 = 3
@@ -140 +124 @@
         itr.d dtr[r7] = r10
 
-
-
-
-
-        # initialize PSR
+        # Initialize PSR
+
         movl r10 = (PSR_DT_MASK | PSR_RT_MASK | PSR_IT_MASK | PSR_IC_MASK)  /* Enable paging */
         mov r9 = psr
+
         or r10 = r10, r9
         mov cr.ipsr = r10
@@ -156 +138 @@
 
         .explicit
+
         /*
          * Return From Interupt is the only the way to fill upper half word of PSR.
@@ -161 +144 @@
         rfi;;
 
+
 .global paging_start
 paging_start:
@@ -168 +152 @@
          */
 
-        # switch to register bank 1
+        # Switch to register bank 1
         bsw.1
 
-#Am'I BSP or AP
-        movl r20=bsp_started;;
-        ld8 r20=[r20];;
-        cmp.eq p3,p2=r20,r0;;
-
+        # Am I BSP or AP?
+        movl r20 = bsp_started;;
+        ld8 r20 = [r20];;
+        cmp.eq p3, p2 = r20, r0;;
         
-        # initialize register stack
+        # Initialize register stack
         mov ar.rsc = r0
         movl r8 = (VRN_KERNEL << VRN_SHIFT) ;;
@@ -183 +166 @@
         loadrs
 
-        # initialize memory stack to some sane value
+        # Initialize memory stack to some sane value
         movl r12 = stack0 ;;
-        
         add r12 = -16, r12      /* allocate a scratch area on the stack */
 
-        # initialize gp (Global Pointer) register
+        # Initialize gp (Global Pointer) register
         movl r20 = (VRN_KERNEL << VRN_SHIFT);;
         or r20 = r20,r1;;
@@ -217 +199 @@
 (p2)    br.call.sptk.many b0 = b1
 
-#Mark that BSP is on
+        # Mark that BSP is on
         mov r20=1;;
         movl r21=bsp_started;;
         st8 [r21]=r20;;
 
-
         br.call.sptk.many b0 = arch_pre_main
 
@@ -229 +210 @@
         br.call.sptk.many b0 = b1
 
-
 0:
         br 0b
@@ -236 +216 @@
 kernel_image_ap_start:
         .auto
-#identifi self(CPU) in OS structures by ID / EID
-        mov r9=cr64
-        mov r10=1
-        movl r12=0xffffffff
-        movl r8=cpu_by_id_eid_list
-        and r8=r8,r12
-        shr r9=r9,16
-        add r8=r8,r9
-        st1 [r8]=r10
+
+        # Identify self(CPU) in OS structures by ID / EID
+
+        mov r9 = cr64
+        mov r10 = 1
+        movl r12 = 0xffffffff
+        movl r8 = cpu_by_id_eid_list
+        and r8 = r8, r12
+        shr r9 = r9, 16
+        add r8 = r8, r9
+        st1 [r8] = r10
         
-#wait for wakeup sychro signal (#3 in cpu_by_id_eid_list)
+        # Wait for wakeup synchro signal (#3 in cpu_by_id_eid_list)
 kernel_image_ap_start_loop:
-        movl r11=kernel_image_ap_start_loop
-        and r11=r11,r12
+        movl r11 = kernel_image_ap_start_loop
+        and r11 = r11, r12
         mov b1 = r11 
 
-        ld1 r20=[r8];;
-        movl r21=3;;
-        cmp.eq p2,p3=r20,r21;;
-(p3)br.call.sptk.many b0 = b1
-
-        movl r11=kernel_image_start
-        and r11=r11,r12
-    mov b1 = r11 
+        ld1 r20 = [r8];;
+        movl r21 = 3;;
+        cmp.eq p2, p3 = r20, r21;;
+(p3)    br.call.sptk.many b0 = b1
+
+        movl r11 = kernel_image_start
+        and r11 = r11, r12
+        mov b1 = r11 
         br.call.sptk.many b0 = b1
 
@@ -268 +250 @@
 .space 8
 
-
 .align 4096
 .global cpu_by_id_eid_list
@@ -274 +255 @@
 .space 65536
 
-