.gitignore

@@ -1 +1,3 @@
 *~
+*.o
+vm/vm

compiler/app/debug-build.scm

@@ -0,0 +1,2 @@
+(load-macros)
+(debug-build-file (car argv))

compiler/compiler.scm

@@ -109,3 +109,6 @@
 
 (define (compile-and-run-file filename)
   (for-each eval `((include ,filename))))
+
+(define (debug-build-file filename)
+  (compile `(include ,filename) #t #f '(halt)))

compiler/mac/macros.scm

@@ -149,3 +149,16 @@
 	  (args (cdddr exp))
 	  (x (gensym "x")))
       `(map (lambda (,x) (,f ,x . ,args)) ,xs))))
+
+
+;;; ADDED
+
+(defmacro inc!
+ (lambda (form)
+  (let ((x (cadr form)))
+     `(set-box! ,x (+ (unbox ,x) 1)))))
+
+(defmacro dec!
+ (lambda (form)
+  (let ((x (cadr form)))
+     `(set-box! ,x (- (unbox ,x) 1)))))

vm/Makefile

@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS+=-O3 -std=c99 -Wall -Werror -Wno-unused-but-set-variable -D_GNU_SOURCE -falign-functions=8
+CFLAGS+=-g -std=c99 -Wall -Werror -Wno-unused-but-set-variable -D_GNU_SOURCE -falign-functions=8
 
 SOURCES=read_word.c vm.c \
  allocator.c gc.c symboltable.c builtins.c ports.c\

vm/builtins.c

@@ -30,12 +30,14 @@ scm bltn_cons(void) {
 scm bltn_car(void) {
 	scm a = stack[reg_rbp + 1];
 
+	info_assert(scm_gettag(a) == TAG_CONS);
 	return get_cons_car(a);
 }
 
 scm bltn_cdr(void) {
 	scm a = stack[reg_rbp + 1];
 
+	info_assert(scm_gettag(a) == TAG_CONS);
 	return get_cons_cdr(a);
 }
 

vm/main.c

@@ -20,6 +20,7 @@ void load_and_exec(char *filename);
 void load_qcode_dir();
 
 void stack_and_quit() {
+	puts("SIGSEGV");
 	stack_trace();
 	exit(1);
 }
@@ -32,7 +33,7 @@ int main(int argc, char **argv) {
 
 	int i = 0;
 	
-	signal(SIGSEGV, stack_and_quit);
+	//signal(SIGSEGV, stack_and_quit);
 
 	/// SETUP ARGV
 	reg_acc = ATOM_NUL;
@@ -82,10 +83,19 @@ void load_qcode_dir(char *p)
 	char buf2[256] = { 0 };
 	DIR *dir;
 	struct dirent *ent;
+
+	if(!getenv("TAROTPATH")) {
+		puts("Please set TAROTPATH.");
+		exit(2);
+	}
 	
 	strcat(buf, getenv("TAROTPATH"));
 	strcat(buf, p);
 	dir = opendir(buf);
+	if(!dir) {
+		printf("Could not open qcode directory <%s%s>. Check TAROTPATH.\n", getenv("TAROTPATH"), p);
+		exit(2);
+	}
 	while((ent = readdir(dir))) {
 		if(ent->d_type == DT_REG) {
 		        strcpy(buf2, buf);