Added GCNEW

diff --git a/src/mm/memory.c b/src/mm/memory.c
index a9f486eed6a6aa0dd68a4627a3261773d0ca9bee..d2617465b4194fa8490cbf326f6241308c2985bb 100644 (file)
--- a/src/mm/memory.c
+++ b/src/mm/memory.c
@@ -49,14 +49,20 @@ long int maxdumpsize = 0;
 /* #define TRACECALLARGS */
 
 #ifdef TRACECALLARGS
-static char  nomallocmem[16777216];
-static char *nomalloctop = nomallocmem + 16777216;
-static char *nomallocptr = nomallocmem;
+static char *nomallocmem;
+static char *nomalloctop;
+static char *nomallocptr;
 
 static void *lit_checked_alloc (int length)
 {
        void *m;
 
+       if (!nomallocmem) {
+               nomallocmem = malloc(16777216);
+               nomalloctop = nomallocmem + 16777216;
+               nomallocptr = nomallocmem;
+       }
+
        nomallocptr = (void*) ALIGN ((long) nomallocptr, ALIGNSIZE);
        
        m = nomallocptr;

diff --git a/src/mm/memory.h b/src/mm/memory.h
index 10637f8edfc89907f509cc6fbcbbc54394519631..5713b817a228caa0b3be5cc5a598952b0250415d 100644 (file)
--- a/src/mm/memory.h
+++ b/src/mm/memory.h
@@ -14,6 +14,11 @@
 
 #define CODEMMAP
 
+#ifdef USE_BOEHM
+/* Uncollectable memory which can contain references */
+#define GCNEW(type,num) heap_alloc_uncollectable(sizeof(type) * (num))
+#endif
+
 #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 ) ) )

diff --git a/toolbox/memory.c b/toolbox/memory.c
index a9f486eed6a6aa0dd68a4627a3261773d0ca9bee..d2617465b4194fa8490cbf326f6241308c2985bb 100644 (file)
--- a/toolbox/memory.c
+++ b/toolbox/memory.c
@@ -49,14 +49,20 @@ long int maxdumpsize = 0;
 /* #define TRACECALLARGS */
 
 #ifdef TRACECALLARGS
-static char  nomallocmem[16777216];
-static char *nomalloctop = nomallocmem + 16777216;
-static char *nomallocptr = nomallocmem;
+static char *nomallocmem;
+static char *nomalloctop;
+static char *nomallocptr;
 
 static void *lit_checked_alloc (int length)
 {
        void *m;
 
+       if (!nomallocmem) {
+               nomallocmem = malloc(16777216);
+               nomalloctop = nomallocmem + 16777216;
+               nomallocptr = nomallocmem;
+       }
+
        nomallocptr = (void*) ALIGN ((long) nomallocptr, ALIGNSIZE);
        
        m = nomallocptr;

diff --git a/toolbox/memory.h b/toolbox/memory.h
index 10637f8edfc89907f509cc6fbcbbc54394519631..5713b817a228caa0b3be5cc5a598952b0250415d 100644 (file)
--- a/toolbox/memory.h
+++ b/toolbox/memory.h
@@ -14,6 +14,11 @@
 
 #define CODEMMAP
 
+#ifdef USE_BOEHM
+/* Uncollectable memory which can contain references */
+#define GCNEW(type,num) heap_alloc_uncollectable(sizeof(type) * (num))
+#endif
+
 #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 ) ) )