Changeset a68003f in mainline

Timestamp:

2005-09-19T20:20:14Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b4865e1

Parents:

a2dc632

Message:

Memory routines per-arch declations for future implementation

Files:

• arch/amd64/include/memstr.h (added)
• arch/ia32/include/asm.h (modified) (2 diffs)
• arch/ia32/include/memstr.h (added)
• arch/ia64/include/memstr.h (added)
• arch/mips32/include/memstr.h (added)
• arch/ppc32/include/memstr.h (added)
• include/memstr.h (modified) (1 diff)

arch/ia32/include/asm.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2001-2004 Jakub Jermar
+ * Copyright (C) 2005 HelenOS project
  * All rights reserved.
  *
@@ -213 +214 @@
 }
 
-/** Copy memory
- * 
- * Copy a given number of bytes (3rd argument)
- * from the memory location defined by 2nd argument
- * to the memory location defined by 1st argument.
- * The memory areas cannot overlap.
- *
- * @param destination
- * @param source
- * @param number of bytes
- * @return destination
- */
-static inline void * memcpy(void * dst, const void * src, size_t cnt)
-{
-        __u32 d0, d1, d2;
-        
-        __asm__ __volatile__(
-                /* copy all full dwords */
-                "rep movsl\n\t"
-                /* load count again */
-                "movl %4, %%ecx\n\t"
-                /* ecx = ecx mod 4 */
-                "andl $3, %%ecx\n\t"
-                /* are there last <=3 bytes? */
-                "jz 1f\n\t"
-                /* copy last <=3 bytes */
-                "rep movsb\n\t"
-                /* exit from asm block */
-                "1:\n"
-                : "=&c" (d0), "=&D" (d1), "=&S" (d2)
-                : "0" (cnt / 4), "g" (cnt), "1" ((__u32) dst), "2" ((__u32) src)
-                : "memory");
-                
-        return dst;
-}
-
-
 #endif

include/memstr.h

@@ -32 +32 @@
 #include <typedefs.h>
 #include <arch/types.h>
-#include <arch/asm.h>
+#include <arch/memstr.h>
 
+/*
 extern void memsetw(__address dst, size_t cnt, __u16 x);
 extern void memsetb(__address dst, size_t cnt, __u8 x);
-
 extern int memcmp(__address src, __address dst, int cnt);
-extern void *memcpy(void *dst, const void *src, size_t cnt);
+extern void * memcpy(void *dst, const void *src, size_t cnt);
+*/
 
 /*