diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-04 05:22:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-04 05:22:21 -0400 |
| commit | a29889a5369d2604c2053bcd051519a2445d8a70 (patch) | |
| tree | b17e8258894d079b4168994d9438ba7d6e7d1523 /arch/avr32/lib/memcpy.S | |
| parent | e7a088f935180b90cfe6ab0aaae8a556f46885fe (diff) | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/avr32/lib/memcpy.S')
| -rw-r--r-- | arch/avr32/lib/memcpy.S | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/avr32/lib/memcpy.S b/arch/avr32/lib/memcpy.S index 0abb26142b64..c2ca49d705af 100644 --- a/arch/avr32/lib/memcpy.S +++ b/arch/avr32/lib/memcpy.S | |||
| @@ -24,8 +24,8 @@ memcpy: | |||
| 24 | brne 1f | 24 | brne 1f |
| 25 | 25 | ||
| 26 | /* At this point, "from" is word-aligned */ | 26 | /* At this point, "from" is word-aligned */ |
| 27 | 2: sub r10, 4 | 27 | 2: mov r9, r12 |
| 28 | mov r9, r12 | 28 | 5: sub r10, 4 |
| 29 | brlt 4f | 29 | brlt 4f |
| 30 | 30 | ||
| 31 | 3: ld.w r8, r11++ | 31 | 3: ld.w r8, r11++ |
| @@ -49,6 +49,7 @@ memcpy: | |||
| 49 | 49 | ||
| 50 | /* Handle unaligned "from" pointer */ | 50 | /* Handle unaligned "from" pointer */ |
| 51 | 1: sub r10, 4 | 51 | 1: sub r10, 4 |
| 52 | movlt r9, r12 | ||
| 52 | brlt 4b | 53 | brlt 4b |
| 53 | add r10, r9 | 54 | add r10, r9 |
| 54 | lsl r9, 2 | 55 | lsl r9, 2 |
| @@ -59,4 +60,13 @@ memcpy: | |||
| 59 | st.b r12++, r8 | 60 | st.b r12++, r8 |
| 60 | ld.ub r8, r11++ | 61 | ld.ub r8, r11++ |
| 61 | st.b r12++, r8 | 62 | st.b r12++, r8 |
| 62 | rjmp 2b | 63 | mov r8, r12 |
| 64 | add pc, pc, r9 | ||
| 65 | sub r8, 1 | ||
| 66 | nop | ||
| 67 | sub r8, 1 | ||
| 68 | nop | ||
| 69 | sub r8, 1 | ||
| 70 | nop | ||
| 71 | mov r9, r8 | ||
| 72 | rjmp 5b | ||