Changeset d6b81941 in mainline for kernel/generic/src/lib/memfnc.c

Timestamp:

2011-03-29T21:59:55Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

563b538, ad7a6c9

Parents:

ebebd38 (diff), 3abfe9a8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge toolchain upgrade and related changes. Highlights:

• GCC 4.6, binutils 2.21
• change the default CROSS_PREFIX to /usr/local/cross to avoid ugly pollution in the /usr/local directory (closes #252)
• amd64: use a silly workaround to avoid possible GCC 4.6 bug (going to report to GCC's bugzilla)
• toolchain.sh now supports parallel toolchain build (i.e. all targets at once)
• improve linker scripts to support the newest compiler input sections
• remove unused variables and other various fixes for GCC 4.6 warnings (GCC 4.5.1 also passes compilation)
• unification of kernel memcpy() and memstr() functions (use compiler builtins whenever possible, keep plain C fallback implementations in a sepearate object file)

File:

• kernel/generic/src/lib/memfnc.c (moved) (moved from kernel/arch/amd64/include/memstr.h ) (2 diffs)

kernel/generic/src/lib/memfnc.c

@@ -1 @@
-/*
- * Copyright (c) 2005 Sergey Bondari
+        /*
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup generic
  * @{
  */
-/** @file
+
+/**
+ * @file
+ * @brief Memory string functions.
+ *
+ * This file provides architecture independent functions to manipulate blocks
+ * of memory. These functions are optimized as much as generic functions of
+ * this type can be.
  */
 
-#ifndef KERN_amd64_MEMSTR_H_
-#define KERN_amd64_MEMSTR_H_
+#include <lib/memfnc.h>
+#include <typedefs.h>
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+/** Fill block of memory.
+ *
+ * Fill cnt bytes at dst address with the value val.
+ *
+ * @param dst Destination address to fill.
+ * @param val Value to fill.
+ * @param cnt Number of bytes to fill.
+ *
+ * @return Destination address.
+ *
+ */
+void *memset(void *dst, int val, size_t cnt)
+{
+        size_t i;
+        uint8_t *ptr = (uint8_t *) dst;
+        
+        for (i = 0; i < cnt; i++)
+                ptr[i] = val;
+        
+        return dst;
+}
 
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
-
-#endif
+/** Move memory block without overlapping.
+ *
+ * Copy cnt bytes from src address to dst address. The source
+ * and destination memory areas cannot overlap.
+ *
+ * @param dst Destination address to copy to.
+ * @param src Source address to copy from.
+ * @param cnt Number of bytes to copy.
+ *
+ * @return Destination address.
+ *
+ */
+void *memcpy(void *dst, const void *src, size_t cnt)
+{
+        uint8_t *dp = (uint8_t *) dst;
+        const uint8_t *sp = (uint8_t *) src;
+        
+        while (cnt-- != 0)
+                        *dp++ = *sp++;
+        
+        return dst;
+}
 
 /** @}