X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmm%2Fmemory.h;h=5a4baa8532c21dd11921962ff3fef43baf5618ab;hb=d75b6037acf17c342166b9c9bd6e657dfdd12cd9;hp=c87df8b271d06bb364923f23f3d1d093597465c8;hpb=a5e50b963d8361674a679587d9d246bf9fc20d98;p=cacao.git

diff --git a/src/mm/memory.h b/src/mm/memory.h
index c87df8b27..5a4baa853 100644
--- a/src/mm/memory.h
+++ b/src/mm/memory.h
@@ -1,9 +1,9 @@
 /* toolbox/memory.h - macros for memory management
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: memory.h 1494 2004-11-12 13:34:26Z twisti $
+   $Id: memory.h 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
@@ -34,8 +34,12 @@
 #ifndef _MEMORY_H
 #define _MEMORY_H
 
+#include <string.h>
+
+#include "arch.h"
 #include "types.h"
 
+
 /* 
 ---------------------------- Interface description -----------------------
 
@@ -109,7 +113,7 @@ struct dumpblock {
 
 /* dumpinfo ********************************************************************
 
-   TODO
+   DOCUMENT ME!
 
 *******************************************************************************/
 
@@ -123,52 +127,51 @@ struct dumpinfo {
 
 
 /* Uncollectable memory which can contain references */
-void *heap_alloc_uncollectable(u4 bytelen);
-void heap_free(void *);
 
-#define GCNEW(type,num)       heap_alloc_uncollectable(sizeof(type) * (num))
-#define GCFREE(ptr)           heap_free(ptr)
+#define GCNEW(type,num)       ((type *) heap_alloc_uncollectable(sizeof(type) * (num)))
+#define GCFREE(ptr)           heap_free((ptr))
 
 #define ALIGN(pos,size)       ((((pos) + (size) - 1) / (size)) * (size))
 #define PADDING(pos,size)     (ALIGN((pos),(size)) - (pos))
 #define OFFSET(s,el)          ((int) ((size_t) & (((s*) 0)->el)))
 
 
-#define NEW(type)             ((type*) mem_alloc(sizeof(type)))
-#define FREE(ptr,type)        mem_free(ptr, sizeof(type))
+#define NEW(type)             ((type *) mem_alloc(sizeof(type)))
+#define FREE(ptr,type)        mem_free((ptr), sizeof(type))
 
-#define MNEW(type,num)        ((type*) mem_alloc(sizeof(type) * (num)))
-#define MFREE(ptr,type,num)   mem_free(ptr, sizeof(type) * (num))
-#define MREALLOC(ptr,type,num1,num2) mem_realloc(ptr, sizeof(type) * (num1), \
-                                                      sizeof(type) * (num2))
+#define MNEW(type,num)        ((type *) mem_alloc(sizeof(type) * (num)))
+#define MFREE(ptr,type,num)   mem_free((ptr), sizeof(type) * (num))
+#define MREALLOC(ptr,type,num1,num2) mem_realloc((ptr), sizeof(type) * (num1), \
+                                                        sizeof(type) * (num2))
 
-#define DNEW(type)            ((type*) dump_alloc(sizeof(type)))
-#define DMNEW(type,num)       ((type*) dump_alloc(sizeof(type) * (num)))
-#define DMREALLOC(ptr,type,num1,num2)  dump_realloc(ptr, sizeof(type) * (num1),\
-                                                         sizeof(type) * (num2))
+#define DNEW(type)            ((type *) dump_alloc(sizeof(type)))
+#define DMNEW(type,num)       ((type *) dump_alloc(sizeof(type) * (num)))
+#define DMREALLOC(ptr,type,num1,num2) dump_realloc((ptr), sizeof(type) * (num1), \
+                                                          sizeof(type) * (num2))
 
-#define MCOPY(dest,src,type,num)  memcpy(dest,src, sizeof(type)* (num))
+#define MCOPY(dest,src,type,num) memcpy((dest), (src), sizeof(type) * (num))
+#define MSET(ptr,byte,type,num) memset((ptr), (byte), sizeof(type) * (num))
 
 #if defined(USE_CODEMMAP)
-#define CNEW(type,num)        ((type*) mem_mmap( sizeof(type) * (num)))
-#define CFREE(ptr,num)
+#define CNEW(type,num)        ((type *) mem_mmap(sizeof(type) * (num)))
+#define CFREE(ptr,num)        /* nothing */
 #else
-#define CNEW(type,num)        ((type*) mem_alloc(sizeof(type) * (num)))
-#define CFREE(ptr,num)        mem_free(ptr, num)
+#define CNEW(type,num)        ((type *) mem_alloc(sizeof(type) * (num)))
+#define CFREE(ptr,num)        mem_free((ptr), (num))
 #endif
 
 
-/* function prototypes */
+/* function prototypes ********************************************************/
 
-void *mem_mmap(int size);
-void *mem_alloc(int size);
-void mem_free(void *m, int size);
-void *mem_realloc(void *src, int len1, int len2);
+void *mem_mmap(s4 size);
+void *mem_alloc(s4 size);
+void  mem_free(void *m, s4 size);
+void *mem_realloc(void *src, s4 len1, s4 len2);
 
-void *dump_alloc(int size);
-void *dump_realloc(void *src, int len1, int len2);
-long dump_size();
-void dump_release(int size);
+void *dump_alloc(s4 size);
+void *dump_realloc(void *src, s4 len1, s4 len2);
+s4    dump_size();
+void  dump_release(s4 size);
 
 #endif /* _MEMORY_H */