am 76ef331c: am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling
Merge commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6' into eclair-mr2-plus-aosp * commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6': use local symbols in memset so it doesn't screw up profiling
This commit is contained in:
commit
581f43056b
|
@ -80,7 +80,7 @@ memset:
|
||||||
|
|
||||||
rsb r3, r0, #0
|
rsb r3, r0, #0
|
||||||
ands r3, r3, #0x1C
|
ands r3, r3, #0x1C
|
||||||
beq aligned32
|
beq 3f
|
||||||
cmp r3, r2
|
cmp r3, r2
|
||||||
andhi r3, r2, #0x1C
|
andhi r3, r2, #0x1C
|
||||||
sub r2, r2, r3
|
sub r2, r2, r3
|
||||||
|
@ -93,7 +93,7 @@ memset:
|
||||||
movs r3, r3, lsl #2
|
movs r3, r3, lsl #2
|
||||||
strcs r1, [r0], #4
|
strcs r1, [r0], #4
|
||||||
|
|
||||||
aligned32:
|
3:
|
||||||
subs r2, r2, #32
|
subs r2, r2, #32
|
||||||
mov r3, r1
|
mov r3, r1
|
||||||
bmi 2f
|
bmi 2f
|
||||||
|
|
Loading…
Reference in New Issue