Changeset a9d4d2c in mainline for kernel/arch/ia64/src/asm.S

Timestamp:

2008-08-10T17:36:39Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2ab1023

Parents:

da349da0

Message:

Fix ia64 memcpy() broken in the last change.

File:

• kernel/arch/ia64/src/asm.S (modified) (6 diffs)

kernel/arch/ia64/src/asm.S

@@ -52 +52 @@
         adds r14 = 7, in1
         mov r2 = ar.lc
-        mov r8 = in0 ;;
+        mov r8 = in0
         and r14 = -8, r14 ;;
         cmp.ne p6, p7 = r14, in1
@@ -64 +64 @@
 (p6)    mov ar.lc = r14
 1:
-        add r14 = r16, r8
+        add r14 = r16, in1 
         add r15 = r16, in0
         adds r17 = 1, r17 ;;
@@ -73 +73 @@
 2:
         mov ar.lc = r2
-
         mov ar.pfs = loc0
         br.ret.sptk.many rp
@@ -91 +90 @@
         shladd r14 = r16, 3, r0
         adds r16 = 1, r17 ;;
-        add r15 = r8, r14
+        add r15 = in1, r14
         add r14 = in0, r14
         mov r17 = r16 ;;
@@ -105 +104 @@
         add in0 = r14, in0
         adds r15 = -1, r15
-        add r17 = r14, r8
+        add r17 = r14, in1 
 (p6)    br.cond.dpnt 2b ;;
         mov ar.lc = r15
@@ -117 +116 @@
         br.cloop.sptk.few 6b ;;
         mov ar.lc = r2
-
         mov ar.pfs = loc0
         br.ret.sptk.many rp