Deleted: trunk/reactos/lib/string/i386/memchr.s
Added: trunk/reactos/lib/string/i386/memchr_asm.s
Deleted: trunk/reactos/lib/string/i386/memcpy.s
Added: trunk/reactos/lib/string/i386/memcpy_asm.s
Deleted: trunk/reactos/lib/string/i386/memmove.s
Added: trunk/reactos/lib/string/i386/memmove_asm.s
Deleted: trunk/reactos/lib/string/i386/memset.s
Added: trunk/reactos/lib/string/i386/memset_asm.s
Deleted: trunk/reactos/lib/string/i386/strcat.s
Added: trunk/reactos/lib/string/i386/strcat_asm.s
Deleted: trunk/reactos/lib/string/i386/strchr.s
Added: trunk/reactos/lib/string/i386/strchr_asm.s
Deleted: trunk/reactos/lib/string/i386/strcmp.s
Added: trunk/reactos/lib/string/i386/strcmp_asm.s
Deleted: trunk/reactos/lib/string/i386/strcpy.s
Added: trunk/reactos/lib/string/i386/strcpy_asm.s
Deleted: trunk/reactos/lib/string/i386/strlen.s
Added: trunk/reactos/lib/string/i386/strlen_asm.s
Deleted: trunk/reactos/lib/string/i386/strncat.s
Added: trunk/reactos/lib/string/i386/strncat_asm.s
Deleted: trunk/reactos/lib/string/i386/strncmp.s
Added: trunk/reactos/lib/string/i386/strncmp_asm.s
Deleted: trunk/reactos/lib/string/i386/strncpy.s
Added: trunk/reactos/lib/string/i386/strncpy_asm.s
Deleted: trunk/reactos/lib/string/i386/strnlen.s
Added: trunk/reactos/lib/string/i386/strnlen_asm.s
Deleted: trunk/reactos/lib/string/i386/strrchr.s
Added: trunk/reactos/lib/string/i386/strrchr_asm.s
Deleted: trunk/reactos/lib/string/i386/wcscat.s
Added: trunk/reactos/lib/string/i386/wcscat_asm.s
Deleted: trunk/reactos/lib/string/i386/wcschr.s
Added: trunk/reactos/lib/string/i386/wcschr_asm.s
Deleted: trunk/reactos/lib/string/i386/wcscmp.s
Added: trunk/reactos/lib/string/i386/wcscmp_asm.s
Deleted: trunk/reactos/lib/string/i386/wcscpy.s
Added: trunk/reactos/lib/string/i386/wcscpy_asm.s
Deleted: trunk/reactos/lib/string/i386/wcslen.s
Added: trunk/reactos/lib/string/i386/wcslen_asm.s
Deleted: trunk/reactos/lib/string/i386/wcsncat.s
Added: trunk/reactos/lib/string/i386/wcsncat_asm.s
Deleted: trunk/reactos/lib/string/i386/wcsncmp.s
Added: trunk/reactos/lib/string/i386/wcsncmp_asm.s
Deleted: trunk/reactos/lib/string/i386/wcsncpy.s
Added: trunk/reactos/lib/string/i386/wcsncpy_asm.s
Deleted: trunk/reactos/lib/string/i386/wcsnlen.s
Added: trunk/reactos/lib/string/i386/wcsnlen_asm.s
Deleted: trunk/reactos/lib/string/i386/wcsrchr.s
Added: trunk/reactos/lib/string/i386/wcsrchr_asm.s
Modified: trunk/reactos/lib/string/string.xml
--- trunk/reactos/lib/string/i386/memchr.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/memchr.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,31 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS kernel
- * FILE: lib/string/i386/memchr.s
- */
-
-/*
- * void* memchr(const void* s, int c, size_t n)
- */
-
-.globl _memchr
-
-_memchr:
- push %ebp
- mov %esp,%ebp
- push %edi
- mov 0x8(%ebp),%edi
- mov 0xc(%ebp),%eax
- mov 0x10(%ebp),%ecx
- cld
- repne scasb
- je .L1
- mov $1,%edi
-.L1:
- mov %edi,%eax
- dec %eax
- pop %edi
- leave
- ret
-
--- trunk/reactos/lib/string/i386/memcpy.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/memcpy.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,50 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * void *memcpy (void *to, const void *from, size_t count)
- */
-
-.globl _memcpy
-
-_memcpy:
- push %ebp
- mov %esp,%ebp
- push %esi
- push %edi
- mov 0x8(%ebp),%edi
- mov 0xc(%ebp),%esi
- mov 0x10(%ebp),%ecx
- cld
- cmp $16,%ecx
- jb .L1
- mov %ecx,%edx
- test $3,%edi
- je .L2
-/*
- * Make the destination dword aligned
- */
- mov %edi,%ecx
- and $3,%ecx
- sub $5,%ecx
- not %ecx
- sub %ecx,%edx
- rep movsb
- mov %edx,%ecx
-.L2:
- shr $2,%ecx
- rep movsl
- mov %edx,%ecx
- and $3,%ecx
-.L1:
- test %ecx,%ecx
- je .L3
- rep movsb
-.L3:
- pop %edi
- pop %esi
- mov 0x8(%ebp),%eax
- leave
- ret
-
--- trunk/reactos/lib/string/i386/memmove.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/memmove.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,116 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * void *memmove (void *to, const void *from, size_t count)
- */
-
-.globl _memmove
-
-_memmove:
- push %ebp
- mov %esp,%ebp
-
- push %esi
- push %edi
-
- mov 8(%ebp),%edi
- mov 12(%ebp),%esi
- mov 16(%ebp),%ecx
-
- cmp %esi,%edi
- jbe .CopyUp
- mov %ecx,%eax
- add %esi,%eax
- cmp %eax,%edi
- jb .CopyDown
-
-.CopyUp:
- cld
-
- cmp $16,%ecx
- jb .L1
- mov %ecx,%edx
- test $3,%edi
- je .L2
-/*
- * Make the destination dword aligned
- */
- mov %edi,%ecx
- and $3,%ecx
- sub $5,%ecx
- not %ecx
- sub %ecx,%edx
- rep movsb
- mov %edx,%ecx
-.L2:
- shr $2,%ecx
- rep movsl
- mov %edx,%ecx
- and $3,%ecx
-.L1:
- test %ecx,%ecx
- je .L3
- rep movsb
-.L3:
- mov 16(%ebp),%eax
- pop %edi
- pop %esi
- leave
- ret
-
-.CopyDown:
- std
-
- add %ecx,%edi
- add %ecx,%esi
-
- cmp $16,%ecx
- jb .L4
- mov %ecx,%edx
- test $3,%edi
- je .L5
-
-/*
- * Make the destination dword aligned
- */
- mov %edi,%ecx
- and $3,%ecx
- sub %ecx,%edx
- dec %esi
- dec %edi
- rep movsb
- mov %edx,%ecx
-
- sub $3,%esi
- sub $3,%edi
-.L6:
- shr $2,%ecx
- rep movsl
- mov %edx,%ecx
- and $3,%ecx
- je .L7
- add $3,%esi
- add $3,%edi
-.L8:
- rep movsb
-.L7:
- cld
- mov 8(%ebp),%eax
- pop %edi
- pop %esi
- leave
- ret
-.L5:
- sub $4,%edi
- sub $4,%esi
- jmp .L6
-
-.L4:
- test %ecx,%ecx
- je .L7
- dec %esi
- dec %edi
- jmp .L8
-
--- trunk/reactos/lib/string/i386/memset.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/memset.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,47 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * void *memset (void *src, int val, size_t count)
- */
-
-.globl _memset
-
-_memset:
- push %ebp
- mov %esp,%ebp
- push %edi
- mov 0x8(%ebp),%edi
- movzb 0xc(%ebp),%eax
- mov 0x10(%ebp),%ecx
- cld
- cmp $16,%ecx
- jb .L1
- mov $0x01010101,%edx
- mul %edx
- mov %ecx,%edx
- test $3,%edi
- je .L2
- mov %edi,%ecx
- and $3,%ecx
- sub $5,%ecx
- not %ecx
- sub %ecx,%edx
- rep stosb
- mov %edx,%ecx
-.L2:
- shr $2,%ecx
- rep stosl
- mov %edx,%ecx
- and $3,%ecx
-.L1:
- test %ecx,%ecx
- je .L3
- rep stosb
-.L3:
- pop %edi
- mov 0x8(%ebp),%eax
- leave
- ret
-
--- trunk/reactos/lib/string/i386/strcat.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strcat.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcscat.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strchr.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strchr.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcschr.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strcmp.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strcmp.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcscmp.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strcpy.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strcpy.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcscpy.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strlen.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strlen.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcslen.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strncat.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strncat.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcsncat.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strncmp.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strncmp.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcsncmp.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strncpy.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strncpy.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcsncpy.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strnlen.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strnlen.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcsnlen.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/strrchr.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/strrchr.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,6 +0,0 @@
-/* $Id$
- */
-
-#include "tcsrchr.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcscat.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcscat.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcscat.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcschr.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcschr.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcschr.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcscmp.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcscmp.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcscmp.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcscpy.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcscpy.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcscpy.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcslen.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcslen.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcslen.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcsncat.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcsncat.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcsncat.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcsncmp.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcsncmp.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcsncmp.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcsncpy.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcsncpy.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcsncpy.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcsnlen.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcsnlen.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcsnlen.h"
-
-/* EOF */
--- trunk/reactos/lib/string/i386/wcsrchr.s 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/i386/wcsrchr.s 2005-10-27 19:42:06 UTC (rev 18797)
@@ -1,7 +0,0 @@
-/* $Id$
- */
-
-#define _UNICODE
-#include "tcsrchr.h"
-
-/* EOF */
--- trunk/reactos/lib/string/string.xml 2005-10-27 19:33:42 UTC (rev 18796)
+++ trunk/reactos/lib/string/string.xml 2005-10-27 19:42:06 UTC (rev 18797)
@@ -2,30 +2,30 @@
<define name="__NO_CTYPE_INLINES" />
<if property="ARCH" value="i386">
<directory name="i386">
- <file>memchr.s</file>
- <file>memcpy.s</file>
- <file>memmove.s</file>
- <file>memset.s</file>
- <file>strcat.s</file>
- <file>strchr.s</file>
- <file>strcmp.s</file>
- <file>strcpy.s</file>
- <file>strlen.s</file>
- <file>strncat.s</file>
- <file>strncmp.s</file>
- <file>strncpy.s</file>
- <file>strnlen.s</file>
- <file>strrchr.s</file>
- <file>wcscat.s</file>
- <file>wcschr.s</file>
- <file>wcscmp.s</file>
- <file>wcscpy.s</file>
- <file>wcslen.s</file>
- <file>wcsncat.s</file>
- <file>wcsncmp.s</file>
- <file>wcsncpy.s</file>
- <file>wcsnlen.s</file>
- <file>wcsrchr.s</file>
+ <file>memchr_asm.s</file>
+ <file>memcpy_asm.s</file>
+ <file>memmove_asm.s</file>
+ <file>memset_asm.s</file>
+ <file>strcat_asm.s</file>
+ <file>strchr_asm.s</file>
+ <file>strcmp_asm.s</file>
+ <file>strcpy_asm.s</file>
+ <file>strlen_asm.s</file>
+ <file>strncat_asm.s</file>
+ <file>strncmp_asm.s</file>
+ <file>strncpy_asm.s</file>
+ <file>strnlen_asm.s</file>
+ <file>strrchr_asm.s</file>
+ <file>wcscat_asm.s</file>
+ <file>wcschr_asm.s</file>
+ <file>wcscmp_asm.s</file>
+ <file>wcscpy_asm.s</file>
+ <file>wcslen_asm.s</file>
+ <file>wcsncat_asm.s</file>
+ <file>wcsncmp_asm.s</file>
+ <file>wcsncpy_asm.s</file>
+ <file>wcsnlen_asm.s</file>
+ <file>wcsrchr_asm.s</file>
</directory>
</if>
<ifnot property="ARCH" value="i386">