Changeset 228 for soft/giet_vm/libs/libsrl/srl_private_types.c

Timestamp:

Feb 12, 2013, 6:33:31 PM (11 years ago)

Author:

meunier

Message:

Added support for memspaces and const.
Added an interrupt masking to the "giet_context_switch" syscall
Corrected two bugs in boot/boot_init.c (one minor and one regarding barriers initialization)
Reformatted the code in all files.

File:

• soft/giet_vm/libs/libsrl/srl_private_types.c (modified) (3 diffs)

soft/giet_vm/libs/libsrl/srl_private_types.c

@@ +1 @@
+
 #include "srl_private_types.h"
 
@@ -6 +7 @@
 // GCC requires this function. Taken from MutekH.
 ////////////////////////////////////////////////////////////////////////////////////////
-void *memcpy(void *_dst, const void *_src, unsigned int size)
-{
-    unsigned int *dst = _dst;
-    const unsigned int *src = _src;
-    if ( ! ((unsigned int)dst & 3) && ! ((unsigned int)src & 3) )
+void * memcpy(void *_dst, const void * _src, unsigned int size) {
+    unsigned int * dst = _dst;
+    const unsigned int * src = _src;
+    if (!((unsigned int) dst & 3) && !((unsigned int) src & 3) )
         while (size > 3) {
             *dst++ = *src++;
@@ -25 +25 @@
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////////////
 //  mempcy()
 // GCC requires this function. Taken from MutekH.
 ////////////////////////////////////////////////////////////////////////////////////////
-inline void * memset(void *dst, int s, size_t count)
-{
-/*
-  int8_t s = _s;
-  const reg_t v = (uint8_t)s * (reg_t)0x0101010101010101LL;
-  int8_t *a = dst;
-  reg_t *r;
+inline void * memset(void * dst, int s, size_t count) {
+    char * a = (char *) dst;
+    while (count--){
+        *a++ = (char)s;
+    }
+    return dst;
+}
 
-  // align 
-  while ( ((uintptr_t *)a & reg_t_log2_m1) && count )
-    count--, *a++ = s;
 
-  size_t ucount = count & reg_t_log2_m1;
-  count &= ~reg_t_log2_m1;
+// Local Variables:
+// tab-width: 4
+// c-basic-offset: 4
+// c-file-offsets:((innamespace . 0)(inline-open . 0))
+// indent-tabs-mode: nil
+// End:
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
 
-  for (r = (reg_t*)a; count; count -= sizeof(reg_t))
-      *r++ = v;
-
-  for (a = (int8_t*)r; ucount; ucount--)
-      *a++ = s;
-
-*/
-        char *a = (char *) dst;
-        while (count--){
-                *a++ = (char)s;
-        }
-
-        return dst;
-}