fix javadoc

[IRC.git] / Robust / src / Runtime / garbage.c

diff --git a/Robust/src/Runtime/garbage.c b/Robust/src/Runtime/garbage.c
index c4ab01c79e905b07dcb309978f1834de0a91531d..0b97ee339fd4b20655cc10f458ff3e741036fe80 100644 (file)
--- a/Robust/src/Runtime/garbage.c
+++ b/Robust/src/Runtime/garbage.c
@@ -282,7 +282,7 @@ void * mygcmalloc(struct garbagelist * stackptr, int size) {
     collect(stackptr);
 
     /* Update stat on previous gc size */
-    lastgcsize=to_heapptr-to_heapbase;
+    lastgcsize=(to_heapptr-to_heapbase)+size;
 
     /* Flip to/curr heaps */
     {
@@ -299,7 +299,10 @@ void * mygcmalloc(struct garbagelist * stackptr, int size) {
       curr_heapgcpoint=((char *) curr_heapbase)+GCPOINT(curr_heaptop-curr_heapbase);
       to_heapptr=to_heapbase;
       
-      //XXXXX Need check here in case we allocate a really big object
+      /* Not enough room :(, redo gc */
+      if (curr_heapptr>curr_heapgcpoint)
+       return mygcmalloc(stackptr, size);
+      
       bzero(tmp, curr_heaptop-tmp);
       return tmp;
     }