Changeset ac92b85 in mainline for boot/arch/ia64/src/pal_asm.S

Timestamp:

2012-02-25T08:19:18Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ccac91e

Parents:

f577058 (diff), 087768f (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 with mainline

File:

• boot/arch/ia64/src/pal_asm.S (modified) (3 diffs)

boot/arch/ia64/src/pal_asm.S

@@ -32 +32 @@
 
 pal_static_call:
-        alloc loc0 = ar.pfs, 7, 5, 0, 0
+        alloc loc0 = ar.pfs, 7, 6, 0, 0
+
+        mov loc1 = psr ;;
+        mov psr.l = r0 ;;
+        srlz.i
+        srlz.d
         
-        mov loc1 = gp
-        mov loc2 = rp
+        mov loc2 = gp
+        mov loc3 = rp
         
-        addl loc3 = @gprel(pal_proc), gp
-        
+        addl loc4 = @gprel(pal_proc), gp
+
         mov r28 = in0
         mov r29 = in1
@@ -44 +49 @@
         mov r31 = in3 ;;
         
-        ld8 loc3 = [loc3]
-        movl loc4 = 0f ;;
+        ld8 loc4 = [loc4]
+        movl loc5 = 0f ;;
 
-        mov b6 = loc3
-        mov rp = loc4 ;;
+        mov b6 = loc4
+        mov rp = loc5 ;;
         br.cond.sptk.many b6
 
 0:
+        mov psr.l = loc1 ;;
+        srlz.i
+        srlz.d
+
         cmp.ne p7,p0 = 0, in4
         cmp.ne p8,p0 = 0, in5
@@ -60 +69 @@
 (p9)    st8 [in6] = r11
         
-        mov gp = loc1
-        mov rp = loc2 ;;
+        mov gp = loc2
+        mov rp = loc3 ;;
         
         mov ar.pfs = loc0