#include "gc.h"
bigint object_id_counter = 1000000;
-enum gc_option { large, boehm, nitgc } gc_option;
+enum gc_option { large, gc_opt_malloc, boehm, nitgc } gc_option;
#ifdef WITH_LIBGC
#define GC_DEBUG
void *raw_alloc(size_t s0)
{
switch (gc_option) {
- case nitgc: return malloc(s0); break;
+ case nitgc: return malloc(s0);
+ case gc_opt_malloc: return malloc(s0);
default: return alloc(s0);
}
}
case boehm: return GC_MALLOC(s0);
#endif
case nitgc: return Nit_gc_malloc(s0);
+ case gc_opt_malloc: return calloc(1, s0);
case large:
default: return large_alloc(s0);
}
#endif
} else if (strcmp(opt, "nitgc")==0) {
gc_option = nitgc;
+ } else if (strcmp(opt, "malloc")==0) {
+ gc_option = gc_opt_malloc;
} else if (strcmp(opt, "large")==0) {
gc_option = large;
} else if (strcmp(opt, "help")==0) {
#ifdef WITH_LIBGC
", 'boehm'"
#endif
- ", 'large'. Default is '%s'.\n", def);
+ ", 'large', 'malloc'. Default is '%s'.\n", def);
exit(1);
} else {
fprintf(stderr, "Invalid GC option in NIT_GC_OPTION environment variable. Using default '%s'.\n", def);
}
exit(i);
}
+
+void nit_abort(const char* s, const char* msg, const char* loc, int line) {
+ fprintf(stderr, s, msg);
+ fprintf(stderr, " (%s", loc);
+ if (line != 0) fprintf(stderr, ":%d", line);
+ fprintf(stderr, ")\n");
+ nit_exit(1);
+}