Changeset 777 for soft/giet_vm/giet_libs/malloc.c

Timestamp:

Feb 4, 2016, 6:25:22 PM (8 years ago)

Author:

meunier

Message:

• Ajout de quelques fonction dans la lib math
• Déplacement de certaines fonctions de stdlib vers string

File:

• soft/giet_vm/giet_libs/malloc.c (modified) (4 diffs)

soft/giet_vm/giet_libs/malloc.c

@@ -8 +8 @@
 #include "malloc.h"
 #include "stdio.h"
+#include "stdlib.h"
 #include "giet_config.h"
 
@@ -214 +215 @@
 
 ////////////////////////////////////////
-void * remote_malloc( unsigned int size,
+void * remote_malloc( int size,
                       unsigned int x,
                       unsigned int y ) 
@@ -278 +279 @@
 #endif
 
-    return (void*)base;
+    return (void*) base;
 
 } // end remote_malloc()
@@ -284 +285 @@
 
 //////////////////////////////////
-void * malloc( unsigned int size )
+void * malloc( int size )
 {
     // get cluster coordinates
-    unsigned int    x;
-    unsigned int    y;
-    unsigned int    lpid;
+    unsigned int x;
+    unsigned int y;
+    unsigned int lpid;
     giet_proc_xyp( &x, &y, &lpid );
 
     return remote_malloc( size, x, y );
 } 
+
+
+////////////////////////////////////
+void * calloc ( int nbmem, int size )
+{
+    void * a = malloc( nbmem * size );
+    memset( a, 0, nbmem * size );
+    return a;
+}
 
 ///////////////////////////////////////////