Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TESTME][exp-tmp] Use non-GCC specific ASM syntax in libc #207

Open
wants to merge 1 commit into
base: experimental-tmp
Choose a base branch
from
Open

[TESTME][exp-tmp] Use non-GCC specific ASM syntax in libc #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions lib/libc/string/arch/arm/memcpy.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,25 +139,46 @@ FUNCTION(memcpy)
msr CPSR_f, r12 // move into NZCV fields in CPSR

// move as many bytes as necessary to get the dst aligned
ldrvsb r3, [r1], #1 // V set
ldrcsh r4, [r1], #2 // C set
ldreq r5, [r1], #4 // Z set
bvc v_unset1
ldr r3, [r1], #1 // V set

strvsb r3, [r0], #1
strcsh r4, [r0], #2
streq r5, [r0], #4
v_unset1:
bcc c_unset1
ldr r4, [r1], #2 // C set

ldmmiia r1!, {r3-r4} // N set
stmmiia r0!, {r3-r4}
c_unset1:
bne z_unset1
ldr r5, [r1], #4 // Z set

z_unset1:
bvc v_unset2
str r3, [r0], #1

v_unset2:
bcc c_unset2
str r4, [r0], #2

c_unset2:
bne z_unset2
str r5, [r0], #4

z_unset2:
bpl n_unset1
ldm r1!, {r3-r4} // N set

n_unset1:
bpl n_unset2
stm r0!, {r3-r4}

n_unset2:
// fix the remaining len
sub r2, r2, r12, lsr #28

// test to see what we should do now
cmp r2, #32
bhs .L_bigcopy
b .L_wordwise

// src and dest overlap 'forwards' or dst > src
.L_forwardoverlap:

Expand Down
10 changes: 8 additions & 2 deletions lib/libc/string/arch/arm/memset.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,14 @@ FUNCTION(memset)
msr CPSR_f, r3 // move into NZCV fields in CPSR

// move as many bytes as necessary to get the dst aligned
strvsb r1, [r0], #1 // V set
strcsh r1, [r0], #2 // C set
bvc v_unset
str r1, [r0], #1 // V set

v_unset:
bcc c_unset
str r1, [r0], #2 // C set

c_unset:
streq r1, [r0], #4 // Z set
strmi r1, [r0], #4 // N set
strmi r1, [r0], #4 // N set
Expand Down