Changeset 194 in vbox

Timestamp:

Jan 19, 2007 9:56:57 PM (18 years ago)

Author:

vboxsync

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

17670

Message:

memchr.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile (modified) (3 diffs)
• string/memchr.asm (copied) (copied from trunk/src/VBox/Runtime/string/memset.asm ) (2 diffs)
• string/memchr_alias.c (copied) (copied from trunk/src/VBox/Runtime/string/memset_alias.c ) (2 diffs)

trunk/src/VBox/Runtime/Makefile

@@ -442 +442 @@
         misc/setjmp.asm \
         \
+        string/memchr.asm \
+        string/memchr_alias.c \
         string/memcpy.asm \
         string/memcpy_alias.c \
@@ -512 +514 @@
 RuntimeR0Drv_TEMPLATE   = VBOXR0DRV
 RuntimeR0Drv_SDKS.win   = W2K3DDK WINPSDKINCS
-RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX
+RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS
 RuntimeR0Drv_DEFS.win   = IN_SUP_R0
 RuntimeR0Drv_DEFS.linux = MODULE KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) IN_SUP_R0 # why is IN_SUP_R0 here? because!
@@ -558 +560 @@
 RuntimeR0Drv_SOURCES.darwin = \
         RTErrConvertFromErrno.cpp \
+        string/memchr.asm \
         r0drv/initterm-r0drv.cpp \
         r0drv/memobj-r0drv.cpp \

trunk/src/VBox/Runtime/string/memchr.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; InnoTek Portable Runtime - No-CRT memset - AMD64 & X86.
+; InnoTek Portable Runtime - No-CRT memchr - AMD64 & X86.
 ;
 
@@ -23 +23 @@
 
 ;;
-; @param    pvDst   gcc: rdi  msc: ecx  x86:[esp+4]
+; @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(memset)
+BEGINPROC RT_NOCRT(memchr)
         cld
 %ifdef __AMD64__
  %ifdef ASM_CALL64_MSC
-        int3
-  %error "Port me"
+        or      r8, r8
+        jz      .not_found_early
+
+        mov     r9, rdi                 ; save rdi
+        mov     eax, edx
+        mov     rdi, rcx
+        mov     rcx, r8
  %else
-        movzx   eax, sil
-        cmp     rdx, 32
-        jb      .dobytes
+        mov     rcx, rdx
+        jrcxz   .not_found_early
 
-        ; eax = (al << 24) | (al << 16) | (al << 8) | al;
-        ; rdx = (eax << 32) | eax
-        movzx   esi, sil
-        mov     rax, qword 0101010101010101h
-        imul    rax, rsi
-
-        ; todo: alignment.
-
-        mov     rcx, rdx
-        shr     rcx, 3
-        rep stosq
-
-        and     rdx, 7
-.dobytes:
-        mov     rcx, rdx
-        rep stosb
+        mov     eax, esi
  %endif
 
 %else
-        push    edi
+        mov     ecx, [esp + 0ch]
+        jecxz   .not_found_early
+        mov     edx, edi                ; save edi
+        mov     eax, [esp + 8]
+        mov     edi, [esp + 4]
+%endif
 
-        mov     ecx, [esp + 0ch + 4]
-        movzx   eax, byte [esp + 08h + 4]
-        mov     edi, [esp + 04h + 4]
-        cmp     ecx, 12
-        jb      .dobytes
+        ; do the search
+        repne   scasb
+        jne     .not_found
 
-        ; eax = (al << 24) | (al << 16) | (al << 8) | al;
-        mov     ah, al
-        mov     edx, eax
-        shr     edx, 16
-        or      eax, edx
-
-        mov     edx, ecx
-        shr     ecx, 2
-        rep stosd
-
-        and     edx, 3
-        mov     ecx, edx
-.dobytes:
-        rep stosb
-
-        pop     edi
+        ; found it
+        lea     xAX, [xDI - 1]
+%ifdef ASM_CALL64_MSC
+        mov     rdi, r9
+%endif
+%ifdef __X86__
+        mov     edi, edx
 %endif
         ret
-ENDPROC RT_NOCRT(memset)
 
+.not_found:
+%ifdef ASM_CALL64_MSC
+        mov     rdi, r9
+%endif
+%ifdef __X86__
+        mov     edi, edx
+%endif
+.not_found_early:
+        xor     eax, eax
+        ret
+ENDPROC RT_NOCRT(memchr)
+

trunk/src/VBox/Runtime/string/memchr_alias.c

@@ -1 +1 @@
 /* $Id: $ */
 /** @file
- * InnoTek Portable Runtime - No-CRT memset() alias for gcc.
+ * InnoTek Portable Runtime - No-CRT memchr() alias for gcc.
  */
 
@@ -25 +25 @@
 *******************************************************************************/
 #include <iprt/nocrt/string.h>
-#undef memset
+#undef memchr
 
 #if defined(__DARWIN__) || defined(__WIN__)
 # ifndef __MINGW32__
-#  pragma weak memset
+#  pragma weak memchr
 # endif
 
 /* No alias support here (yet in the ming case). */
-extern void *(memset)(void *pvDst, int ch, size_t cb)
+extern void *(memchr)(const void *pv, int ch, size_t cb)
 {
-    return RT_NOCRT(memset)(pvDst, ch, cb);
+    return RT_NOCRT(memchr)(pv, ch, cb);
 }
 
 #elif __GNUC__ >= 4
 /* create a weak alias. */
-__asm__(".weak memset\t\n"
-        " .set memset," RT_NOCRT_STR(memset) "\t\n");
+__asm__(".weak memchr\t\n"
+        " .set memchr," RT_NOCRT_STR(memchr) "\t\n");
 #else
 /* create a weak alias. */
-extern __typeof(RT_NOCRT(memset)) memset __attribute__((weak, alias(RT_NOCRT_STR(memset))));
+extern __typeof(RT_NOCRT(memchr)) memchr __attribute__((weak, alias(RT_NOCRT_STR(memchr))));
 #endif