Changeset 96373 in vbox

Timestamp:

Aug 20, 2022 3:08:08 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Implemented wcslen. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/string/wcslen.asm (copied) (copied from trunk/src/VBox/Runtime/common/string/strlen.asm ) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstNoCrt-1.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1984 +1984 @@
         common/string/strstr.cpp \
         common/string/strcspn.cpp \
-        common/string/strpbrk.cpp
+        common/string/strpbrk.cpp \
+        common/string/wcslen.asm
+
   RuntimeR3_SOURCES.amd64 = $(RuntimeBaseR3_SOURCES.amd64) \
         common/math/atan.asm  \
@@ -2062 +2064 @@
         common/string/strstr.cpp \
         common/string/strcspn.cpp \
-        common/string/strpbrk.cpp
+        common/string/strpbrk.cpp \
+        common/string/wcslen.asm
+
   RuntimeR3_SOURCES.win = $(filter-out \
         r3/generic/RTLocaleQueryLocaleName-r3-generic.cpp \

trunk/src/VBox/Runtime/common/string/wcslen.asm

@@ -31 +31 @@
 ;;
 ; @param    psz     gcc: rdi  msc: rcx  x86: [esp+4]  wcall: eax
-RT_NOCRT_BEGINPROC strlen
+RT_NOCRT_BEGINPROC wcslen
         cld
 %ifdef RT_ARCH_AMD64
@@ -50 +50 @@
         mov     xCX, -1
         xor     eax, eax
-        repne   scasb
+        repne   scasw
 
         ; found it
         neg     xCX
         lea     xAX, [xCX - 2]
+        shr     xCX, 1
 %ifdef ASM_CALL64_MSC
         mov     rdi, r9
-%endif
-%ifdef RT_ARCH_X86
+%elifdef RT_ARCH_X86
         mov     edi, edx
 %endif
         ret
-ENDPROC RT_NOCRT(strlen)
+ENDPROC RT_NOCRT(wcslen)
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -582 +582 @@
         ../common/string/strcmp.asm \
         ../common/string/strcpy.asm \
-        ../common/string/strlen.asm
+        ../common/string/strlen.asm \
+        ../common/string/wcslen.asm
 
 tstRTNoCrt-2_TEMPLATE = VBOXR3TSTEXE

trunk/src/VBox/Runtime/testcase/tstNoCrt-1.cpp

@@ -493 +493 @@
     cch = RT_NOCRT(strlen)(s_szTest3);      CHECK_CCH(sizeof(s_szTest3) - 1);
 
+#ifdef _MSC_VER
+    /*
+     * Some simple wcslen checks.
+     */
+    RTPrintf("tstNoCrt-1: wcslen\n");
+    cch = RT_NOCRT(wcslen)(L"");             CHECK_CCH(0);
+    cch = RT_NOCRT(wcslen)(L"1");            CHECK_CCH(1);
+    cch = RT_NOCRT(wcslen)(L"12");           CHECK_CCH(2);
+    cch = RT_NOCRT(wcslen)(L"123");          CHECK_CCH(3);
+    cch = RT_NOCRT(wcslen)(L"1234");         CHECK_CCH(4);
+    cch = RT_NOCRT(wcslen)(L"12345");        CHECK_CCH(5);
+#endif
+
     /*
      * Summary.