gc

Makefile

@@ -9,4 +9,4 @@ run: build
 	./njvm prog.bin
 
 debug: build
-	./njvm --debug prog.bin
+	./njvm --debug --heap 100000 --stack 1000 prog.bin

njvm.c

@@ -541,12 +541,12 @@ int main(int argc, char *argv[]) {
                 return 0;
             } else if (strcmp(argv[i], "--stack") == 0) {
                 i++;
-                // TODO: implement stack size
+                size = atoi(argv[i]);
             } else if (strcmp(argv[i], "--heap") == 0) {
                 i++;
                 argVheapSizeKiB = atoi(argv[i]);
             } else if (strcmp(argv[i], "--gcpurge") == 0) {
-                // TODO: implement gcpurge
+                purgeFlag = true;
             } else {
                 sizeSDA = fromFile(argv[i], program);
                 run = 1;

record.c

@@ -8,11 +8,12 @@
 #include "njvm.h"
 
 ObjRef newRecord(int size){
+    printf("Size: %i\n", size);
     ObjRef record;
     unsigned int objSize;
     objSize = sizeof(*record) + (size * sizeof(void *));
     if((record = alloc(objSize)) == NULL){
-        perror("malloc");
+        perror("alloc");
     }
     record->size = MSB;
     record->size = record->size + size;
@@ -49,7 +50,7 @@ void setField(ObjRef arr, int point, ObjRef value){
         else
             size = sizeof(*value) + (GET_ELEMENT_COUNT(value) * sizeof(void *));
     }
-    if((GET_REFS_PTR(arr)[point] = malloc(size)) == NULL) perror("malloc");
+    if((GET_REFS_PTR(arr)[point] = alloc(size)) == NULL) perror("alloc");
     GET_REFS_PTR(arr)[point] ->size = size;
     * (ObjRef *)GET_REFS_PTR(arr)[point]->data = value;
 }

stackslot.c

@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "objref.c"
+#include "njvm.h"
 
 typedef int Object;
 
@@ -19,8 +20,8 @@ typedef struct {
 ObjRef getIntObj(int val) {
     ObjRef intObject;
     unsigned int objSize = sizeof(ObjRef) + sizeof(int);
-    if ((intObject = malloc(objSize)) == NULL) {
+    if ((intObject = alloc(objSize)) == NULL) {
-        perror("malloc");
+        perror("alloc");
     }
     *(int *) intObject->data = val;
     intObject->size = objSize;