Changeset 11 for trunk/kernel/libk/memcpy.c

Timestamp:

Apr 26, 2017, 2:29:23 PM (7 years ago)

Author:

alain

Message:

Merge all FS related files in one single vfs directory.

File:

• trunk/kernel/libk/memcpy.c (modified) (4 diffs)

trunk/kernel/libk/memcpy.c

@@ -23 +23 @@
 
 #include <hal_types.h>
+#include <printk.h>
 
 /////////////////////////////////
@@ -32 +33 @@
     const uint32_t * wsrc = src;
 
+    // word per word copy if both addresses aligned
     if (!((uint32_t) wdst & 3) && !((uint32_t) wsrc & 3) )
     {
@@ -44 +46 @@
     unsigned char *csrc = (unsigned char*)wsrc;
 
+    // byte per byte for last bytes (or not aligned)
     while (size--) 
     {
@@ -51 +54 @@
 }
 
-///////////////////////////
-void * memset( void   * dst, 
-               int      s,
-               uint32_t size) 
+//////////////////////////////
+void * memset( void     * dst, 
+               uint32_t   val,
+               uint32_t   size) 
 {
-    char * a = (char *) dst;
-    while (size--)
+    // build 8 bits and 32 bits values
+    uint8_t    byte = (uint8_t)(val & 0xFF);
+    uint32_t   word = (val<<24) | (val<<16) | (val<<8) | val;
+
+    // word per word if address aligned
+    uint32_t * wdst = (uint32_t *)dst;
+
+    if( (((uint32_t)dst) & 0x3) == 0 )
     {
-        *a++ = (char)s;
+        while( size > 3 )
+        {
+            *wdst++ = word;
+            size -= 4;
+        }
     }
+
+    // byte per byte for last bytes (or not aligned)
+    char * cdst = (char *)wdst;
+
+    while( size-- )
+    {
+        *cdst++ = byte;
+    }
+
     return dst;
 }