gc

njvm.c

@@ -419,29 +419,32 @@ void swap() {
 }
 
 void garbageCollector() {
+
     char *memToPurgePtr = halfHeapPtr - ((heapSizeKiB * 1024) / 2);
     swap();
-    //printf("%s\n", "stack");
-    for (int i = 0; i < stack.current; i++) {
+    printf("%s\n", "stack");
+    for (int i = 0; i < *stack.current; i++) {
         if (stack.stack[i].isObjRef) {
             stack.stack[i].u.objRef = relocate(stack.stack[i].u.objRef);
         }
     }
-    //printf("%s\n", "globals");
-    for (int i = 0; i < sda.size; i++) {
+    printf("%s\n", "globals");
+    for (int i = 0; i < *sda.size; i++) {
         sda.sda[i] = relocate(sda.sda[i]);
     }
 //    printf("%s\n", "retVal");
     //returnValue = relocate(returnValue);
 
-    //printf("%s\n", "op1");
+    printf("%s\n", "op1");
     bip.op1 = relocate(bip.op1);
     ObjRef b = bip.op1;
+
     if (b != NULL)
         //printf("%d\n", GET_SIZE(b));
 
         //printf("%s\n", "op2");
         bip.op2 = relocate(bip.op2);
+
     b = bip.op2;
     if (b != NULL)
         //printf("%d\n", GET_SIZE(b));
@@ -449,12 +452,19 @@ void garbageCollector() {
         //printf("%s\n", "res");
         bip.res = relocate(bip.res);
     b = bip.res;
-    if(b!= NULL)
+
+    if (b != NULL) {
         //printf("%d\n", GET_SIZE(b));
 
-        //printf("%s\n", "rem");
+        printf("%s\n", "rem");
+        bip.op1 = bip.rem;
+        bigPrint(stdout);
         bip.rem = relocate(bip.rem);
+        printf("%s\n", "rem");
+    }
+
     b = bip.rem;
+    printf("bip finished\n");
     if (b != NULL)
         //printf("%d\n", GET_SIZE(b));