Changeset 271 for soft/giet_vm/giet_libs

Timestamp:

Jan 17, 2014, 11:49:27 PM (11 years ago)

Author:

cfuguet

Message:

• Bugfix: The ISR_SWITCH index should be NB_PROCS_MAX + local_pid. This is because the first NB_PROCS_MAX indexes on the XICU in each cluster are used for the WAKEUP software interrupts.

• Relocating the memcpy and memset functions into the giet_libs/stdlib.* files.

• Modification of the sort application to used 8 threads instead of
  4. Modifying the mapping files to distribute the 8 threads on the available processors. (Ex. When using 4 processors, each one executes 2 threads)

Location:

soft/giet_vm/giet_libs

Files:

• srl.h (modified) (1 diff)
• stdio.c (modified) (2 diffs)
• stdlib.c (modified) (2 diffs)
• stdlib.h (modified) (1 diff)

soft/giet_vm/giet_libs/srl.h

@@ -10 +10 @@
 #include "mapping_info.h"
 #include "stdio.h"
-#include "utils.h"
+#include "stdlib.h"
 
 #include "libsrl/srl_public_types.h"

soft/giet_vm/giet_libs/stdio.c

@@ -13 +13 @@
 #include <stdio.h>
 #include <giet_config.h>
-
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -823 +822 @@
     }
 }
-///////////////////////////////////////////////////////////////////////////////////
-// memcpy()
-///////////////////////////////////////////////////////////////////////////////////
-inline void* memcpy( void*        dest, 
-                     const void*  source,
-                     unsigned int size ) 
-{
-    unsigned int*       dst = dest;
-    const unsigned int* src = source;
-
-    // word-by-word copy
-    if (!((unsigned int) dst & 3) && !((unsigned int) src & 3)) 
-    {
-        while (size > 3) 
-        {
-            *dst++ = *src++;
-            size -= 4;
-        }
-    }
-
-    unsigned char * cdst = (unsigned char *) dst;
-    unsigned char * csrc = (unsigned char *) src;
-
-    /* byte-by-byte copy */
-    while (size--) 
-    {
-        *cdst++ = *csrc++;
-    }
-    return dest;
-}
 
 // Local Variables:

soft/giet_vm/giet_libs/stdlib.c

@@ -5 +5 @@
 // Copyright (c) UPMC-LIP6
 ///////////////////////////////////////////////////////////////////////////////////
+
+#include <stdlib.h>
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -31 +33 @@
 }
         
+////////////////////////////////////////////////////////////////////////////////////////
+//  mempcy()
+// 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) )
+        while (size > 3) {
+            *dst++ = *src++;
+            size -= 4;
+        }
+
+    unsigned char *cdst = (unsigned char*)dst;
+    unsigned char *csrc = (unsigned char*)src;
+
+    while (size--) {
+        *cdst++ = *csrc++;
+    }
+    return _dst;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////
+//  mempcy()
+// GCC requires this function. Taken from MutekH.
+////////////////////////////////////////////////////////////////////////////////////////
+inline void * memset(void * dst, int s, unsigned int count) {
+    char * a = (char *) dst;
+    while (count--){
+        *a++ = (char)s;
+    }
+    return dst;
+}
+
 // Local Variables:
 // tab-width: 4

soft/giet_vm/giet_libs/stdlib.h

@@ -10 +10 @@
 
 int atoi (char * str);
+
+////////////////////////////////////////////////////////////////////////////////////////
+//  mempcy()
+// GCC requires this function. Taken from MutekH.
+////////////////////////////////////////////////////////////////////////////////////////
+void * memcpy(void *_dst, const void * _src, unsigned int size);
+
+////////////////////////////////////////////////////////////////////////////////////////
+//  mempcy()
+// GCC requires this function. Taken from MutekH.
+////////////////////////////////////////////////////////////////////////////////////////
+inline void * memset(void * dst, int s, unsigned int count);
 #endif