Changeset 9502 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Jun 8, 2008 3:02:19 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

31773

Message:

asm strlen. Added a few more string/mem functions to the windows R0 Runtime.

Location:

trunk/src/VBox/Runtime/common/string

Files:

• strchr_alias.c (modified) (2 diffs)
• strlen.asm (copied) (copied from trunk/src/VBox/Runtime/common/string/memchr.asm ) (3 diffs)
• strlen_alias.c (copied) (copied from trunk/src/VBox/Runtime/common/string/memchr_alias.c )

trunk/src/VBox/Runtime/common/string/strchr_alias.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT strchr() alias for gcc.
+ * IPRT - No-CRT strlen() alias for gcc.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -34 +34 @@
 *******************************************************************************/
 #include <iprt/nocrt/string.h>
-#undef strchr
+#undef strlen
 
 #if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
 # ifndef __MINGW32__
-#  pragma weak strchr
+#  pragma weak strlen
 # endif
 
 /* No alias support here (yet in the ming case). */
-extern char *(strchr)(const char *psz, int ch)
+extern char *(strlen)(const char *psz, int ch)
 {
-    return RT_NOCRT(strchr)(psz, ch);
+    return RT_NOCRT(strlen)(psz, ch);
 }
 
 #elif __GNUC__ >= 4
 /* create a weak alias. */
-__asm__(".weak strchr\t\n"
-        " .set strchr," RT_NOCRT_STR(strchr) "\t\n");
+__asm__(".weak strlen\t\n"
+        " .set strlen," RT_NOCRT_STR(strlen) "\t\n");
 #else
 /* create a weak alias. */
-extern __typeof(RT_NOCRT(strchr)) strchr __attribute__((weak, alias(RT_NOCRT_STR(strchr))));
+extern __typeof(RT_NOCRT(strlen)) strlen __attribute__((weak, alias(RT_NOCRT_STR(strlen))));
 #endif
 

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; IPRT - No-CRT memchr - AMD64 & X86.
+; IPRT - No-CRT strlen - AMD64 & X86.
 ;
 
 ;
-; Copyright (C) 2006-2007 Sun Microsystems, Inc.
+; Copyright (C) 2006-2008 Sun Microsystems, Inc.
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -34 +34 @@
 
 ;;
-; @param    pv      gcc: rdi  msc: ecx  x86:[esp+4]
-; @param    ch      gcc: esi  msc: edx  x86:[esp+8]
-; @param    cb      gcc: rdx  msc: r8   x86:[esp+0ch]
-BEGINPROC RT_NOCRT(memchr)
+; @param    psz     gcc: rdi  msc: rcx  x86: [esp+4]
+BEGINPROC RT_NOCRT(strlen)
         cld
 %ifdef RT_ARCH_AMD64
  %ifdef ASM_CALL64_MSC
-        or      r8, r8
-        jz      .not_found_early
-
         mov     r9, rdi                 ; save rdi
-        mov     eax, edx
         mov     rdi, rcx
-        mov     rcx, r8
- %else
-        mov     rcx, rdx
-        jrcxz   .not_found_early
-
-        mov     eax, esi
  %endif
-
 %else
-        mov     ecx, [esp + 0ch]
-        jecxz   .not_found_early
         mov     edx, edi                ; save edi
-        mov     eax, [esp + 8]
         mov     edi, [esp + 4]
 %endif
 
         ; do the search
+        mov     xCX, -1
+        xor     eax, eax
         repne   scasb
-        jne     .not_found
 
         ; found it
-        lea     xAX, [xDI - 1]
+        neg     xCX
+        lea     xAX, [xCX - 2]
 %ifdef ASM_CALL64_MSC
         mov     rdi, r9
@@ -76 +62 @@
 %endif
         ret
+ENDPROC RT_NOCRT(strlen)
 
-.not_found:
-%ifdef ASM_CALL64_MSC
-        mov     rdi, r9
-%endif
-%ifdef RT_ARCH_X86
-        mov     edi, edx
-%endif
-.not_found_early:
-        xor     eax, eax
-        ret
-ENDPROC RT_NOCRT(memchr)
-