tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix riscv64 stpcpy()." into main am: f971dc6b4a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2806858

Change-Id: Ida95db683074b4cb2c21288334a841831bd32b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-10-27 15:26:26 +00:00 committed by Automerger Merge Worker
commit f2f9d64a0a
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libc/arch-riscv64/string/stpcpy_vext.S
View file

@ -83,8 +83,9 @@ L(stpcpy_loop):
add pDstPtr, pDstPtr, iCurrentVL
bltz iActiveElemPos, L(stpcpy_loop)
// stpcpy() returns a pointer to the '\0', not the byte after it.
addi pDstPtr, pDstPtr, -1
// stpcpy() returns a pointer to the '\0' in the destination.
sub pDstPtr, pDstPtr, iCurrentVL
add pDstPtr, pDstPtr, iActiveElemPos
ret
END(stpcpy_vext)

25
tests/string_test.cpp
View file

@ -319,33 +319,34 @@ TEST(STRING_TEST, strcpy4) {
// one byte target with "\0" source
TEST(STRING_TEST, stpcpy2) {
char buf[1];
memset(buf, 'A', sizeof(buf));
char* orig = strdup("");
ASSERT_EQ(buf, stpcpy(buf, orig));
ASSERT_EQ('\0', buf[0]);
EXPECT_EQ(buf, stpcpy(buf, orig));
EXPECT_EQ('\0', buf[0]);
free(orig);
}
// multibyte target where we under fill target
TEST(STRING_TEST, stpcpy3) {
char buf[10];
char* orig = strdup("12345");
memset(buf, 'A', sizeof(buf));
ASSERT_EQ(buf+strlen(orig), stpcpy(buf, orig));
ASSERT_STREQ("12345", buf);
ASSERT_EQ('A', buf[6]);
ASSERT_EQ('A', buf[7]);
ASSERT_EQ('A', buf[8]);
ASSERT_EQ('A', buf[9]);
char* orig = strdup("12345");
EXPECT_EQ(buf+strlen(orig), stpcpy(buf, orig));
EXPECT_STREQ("12345", buf);
EXPECT_EQ('A', buf[6]);
EXPECT_EQ('A', buf[7]);
EXPECT_EQ('A', buf[8]);
EXPECT_EQ('A', buf[9]);
free(orig);
}
// multibyte target where we fill target exactly
TEST(STRING_TEST, stpcpy4) {
char buf[10];
char* orig = strdup("123456789");
memset(buf, 'A', sizeof(buf));
ASSERT_EQ(buf+strlen(orig), stpcpy(buf, orig));
ASSERT_STREQ("123456789", buf);
char* orig = strdup("123456789");
EXPECT_EQ(buf+strlen(orig), stpcpy(buf, orig));
EXPECT_STREQ("123456789", buf);
free(orig);
}