54 files changed, 20 insertions, 19 deletions

diff --git a/minic/mcc b/minic/mcc
index f54545e..5a95042 100755
--- a/minic/mcc
+++ b/minic/mcc
@@ -29,7 +29,7 @@ fi
 
 
 ../minic/minic < $file        > /tmp/minic.ssa &&
-../lisc/lisc < /tmp/minic.ssa > /tmp/minic.s   &&
+../src/qbe < /tmp/minic.ssa   > /tmp/minic.s   &&
 cc $flags /tmp/minic.s
 
 if test $? -ne 0
diff --git a/lisc/.gitignore b/src/.gitignore
index af21541..0416fa9 100644
--- a/lisc/.gitignore
+++ b/src/.gitignore
@@ -1,4 +1,4 @@
-lisc
+qbe
 doc
 .comfile
 *.o
diff --git a/lisc/.tag b/src/.tag
index 5b8c210..5b8c210 100644
--- a/lisc/.tag
+++ b/src/.tag
diff --git a/lisc/Makefile b/src/Makefile
index e29c0b8..b9c87df 100644
--- a/lisc/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-BIN = lisc
+BIN = qbe
 OBJ = main.o util.o parse.o mem.o ssa.o copy.o live.o isel.o spill.o rega.o emit.o
 
 CFLAGS = -Wall -Wextra -std=c99 -g -pedantic
@@ -6,7 +6,7 @@ CFLAGS = -Wall -Wextra -std=c99 -g -pedantic
 $(BIN): $(OBJ)
 	$(CC) $(LDFLAGS) $(OBJ) -o $@
 
-$(OBJ): lisc.h
+$(OBJ): all.h
 
 .PHONY: clean check syndoc
 clean:
diff --git a/lisc/lisc.h b/src/all.h
index e0542da..e0542da 100644
--- a/lisc/lisc.h
+++ b/src/all.h
diff --git a/lisc/copy.c b/src/copy.c
index d2b0285..ef2d01d 100644
--- a/lisc/copy.c
+++ b/src/copy.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 
 typedef struct RList RList;
 struct RList {
diff --git a/lisc/emit.c b/src/emit.c
index ee0318f..b9dc782 100644
--- a/lisc/emit.c
+++ b/src/emit.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 
 enum {
 	SLong = 0,
diff --git a/lisc/isel.c b/src/isel.c
index 2235cff..48e29ef 100644
--- a/lisc/isel.c
+++ b/src/isel.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 #include <limits.h>
 
 /* For x86_64, do the following:
diff --git a/lisc/live.c b/src/live.c
index 43ceed9..44806e1 100644
--- a/lisc/live.c
+++ b/src/live.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 
 void
 liveon(BSet *v, Blk *b, Blk *s)
diff --git a/lisc/main.c b/src/main.c
index 026a8b0..b8cd7d6 100644
--- a/lisc/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 #include <ctype.h>
 #include <getopt.h>
 
diff --git a/lisc/mem.c b/src/mem.c
index 914f181..bda43d7 100644
--- a/lisc/mem.c
+++ b/src/mem.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 
 /* Memory optimization:
  *
diff --git a/lisc/parse.c b/src/parse.c
index 49595c4..903e909 100644
--- a/lisc/parse.c
+++ b/src/parse.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 #include <ctype.h>
 #include <stdarg.h>
 
diff --git a/lisc/rega.c b/src/rega.c
index ead2806..7f8edcf 100644
--- a/lisc/rega.c
+++ b/src/rega.c
@@ -1,4 +1,5 @@
-#include "lisc.h"
+#include "all.h"
+
 #ifdef TEST_PMOV
 	#undef assert
 	#define assert(x) assert_test(#x, x)
diff --git a/lisc/spill.c b/src/spill.c
index 33392a3..72f8106 100644
--- a/lisc/spill.c
+++ b/src/spill.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 
 static void
 loopmark(Blk *hd, Blk *b, Phi *p)
diff --git a/lisc/ssa.c b/src/ssa.c
index 7ccd944..0c163aa 100644
--- a/lisc/ssa.c
+++ b/src/ssa.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 #include <stdarg.h>
 
 static void
diff --git a/lisc/test/_alt.ssa b/src/test/_alt.ssa
index 3f89e5e..3f89e5e 100644
--- a/lisc/test/_alt.ssa
+++ b/src/test/_alt.ssa
diff --git a/lisc/test/_dragon.ssa b/src/test/_dragon.ssa
index b169e1b..b169e1b 100644
--- a/lisc/test/_dragon.ssa
+++ b/src/test/_dragon.ssa
diff --git a/lisc/test/_fix1.ssa b/src/test/_fix1.ssa
index e89307f..e89307f 100644
--- a/lisc/test/_fix1.ssa
+++ b/src/test/_fix1.ssa
diff --git a/lisc/test/_fix2.ssa b/src/test/_fix2.ssa
index 89f236d..89f236d 100644
--- a/lisc/test/_fix2.ssa
+++ b/src/test/_fix2.ssa
diff --git a/lisc/test/_fix3.ssa b/src/test/_fix3.ssa
index 283e5a1..283e5a1 100644
--- a/lisc/test/_fix3.ssa
+++ b/src/test/_fix3.ssa
diff --git a/lisc/test/_fix4.ssa b/src/test/_fix4.ssa
index 181768d..181768d 100644
--- a/lisc/test/_fix4.ssa
+++ b/src/test/_fix4.ssa
diff --git a/lisc/test/_live.ssa b/src/test/_live.ssa
index fce4cb9..fce4cb9 100644
--- a/lisc/test/_live.ssa
+++ b/src/test/_live.ssa
diff --git a/lisc/test/_rpo.ssa b/src/test/_rpo.ssa
index a10c6b1..a10c6b1 100644
--- a/lisc/test/_rpo.ssa
+++ b/src/test/_rpo.ssa
diff --git a/lisc/test/_spill1.ssa b/src/test/_spill1.ssa
index df5e4c2..df5e4c2 100644
--- a/lisc/test/_spill1.ssa
+++ b/src/test/_spill1.ssa
diff --git a/lisc/test/_spill2.ssa b/src/test/_spill2.ssa
index d462d0b..d462d0b 100644
--- a/lisc/test/_spill2.ssa
+++ b/src/test/_spill2.ssa
diff --git a/lisc/test/_spill3.ssa b/src/test/_spill3.ssa
index cdfda2d..cdfda2d 100644
--- a/lisc/test/_spill3.ssa
+++ b/src/test/_spill3.ssa
diff --git a/lisc/test/abi1.ssa b/src/test/abi1.ssa
index 69cce44..69cce44 100644
--- a/lisc/test/abi1.ssa
+++ b/src/test/abi1.ssa
diff --git a/lisc/test/abi2.ssa b/src/test/abi2.ssa
index b82c80c..b82c80c 100644
--- a/lisc/test/abi2.ssa
+++ b/src/test/abi2.ssa
diff --git a/lisc/test/abi3.ssa b/src/test/abi3.ssa
index 608d1db..608d1db 100644
--- a/lisc/test/abi3.ssa
+++ b/src/test/abi3.ssa
diff --git a/lisc/test/abi4.ssa b/src/test/abi4.ssa
index 4c3d89b..4c3d89b 100644
--- a/lisc/test/abi4.ssa
+++ b/src/test/abi4.ssa
diff --git a/lisc/test/abi5.ssa b/src/test/abi5.ssa
index 4c5eaea..4c5eaea 100644
--- a/lisc/test/abi5.ssa
+++ b/src/test/abi5.ssa
diff --git a/lisc/test/align.ssa b/src/test/align.ssa
index 84d1fb9..84d1fb9 100644
--- a/lisc/test/align.ssa
+++ b/src/test/align.ssa
diff --git a/lisc/test/collatz.ssa b/src/test/collatz.ssa
index 373ecac..373ecac 100644
--- a/lisc/test/collatz.ssa
+++ b/src/test/collatz.ssa
diff --git a/lisc/test/cprime.ssa b/src/test/cprime.ssa
index 1ca60e1..1ca60e1 100644
--- a/lisc/test/cprime.ssa
+++ b/src/test/cprime.ssa
diff --git a/lisc/test/cup.ssa b/src/test/cup.ssa
index 013394f..013394f 100644
--- a/lisc/test/cup.ssa
+++ b/src/test/cup.ssa
diff --git a/lisc/test/dark.ssa b/src/test/dark.ssa
index 5046af3..5046af3 100644
--- a/lisc/test/dark.ssa
+++ b/src/test/dark.ssa
diff --git a/lisc/test/double.ssa b/src/test/double.ssa
index d885d28..d885d28 100644
--- a/lisc/test/double.ssa
+++ b/src/test/double.ssa
diff --git a/lisc/test/echo.ssa b/src/test/echo.ssa
index d3c8a25..d3c8a25 100644
--- a/lisc/test/echo.ssa
+++ b/src/test/echo.ssa
diff --git a/lisc/test/eucl.ssa b/src/test/eucl.ssa
index f50fd2c..f50fd2c 100644
--- a/lisc/test/eucl.ssa
+++ b/src/test/eucl.ssa
diff --git a/lisc/test/euclc.ssa b/src/test/euclc.ssa
index c76db2f..c76db2f 100644
--- a/lisc/test/euclc.ssa
+++ b/src/test/euclc.ssa
diff --git a/lisc/test/fpcnv.ssa b/src/test/fpcnv.ssa
index 5fd3be9..5fd3be9 100644
--- a/lisc/test/fpcnv.ssa
+++ b/src/test/fpcnv.ssa
diff --git a/lisc/test/go.sh b/src/test/go.sh
index 9879ff4..35bf525 100755
--- a/lisc/test/go.sh
+++ b/src/test/go.sh
@@ -41,7 +41,7 @@ once() {
 
 	echo "$T... "
 
-	if ! ./lisc $T -o $ASM
+	if ! ./qbe $T -o $ASM
 	then
 		echo "[qbe fail]"
 		return 1
diff --git a/lisc/test/loop.ssa b/src/test/loop.ssa
index c8c4ee0..c8c4ee0 100644
--- a/lisc/test/loop.ssa
+++ b/src/test/loop.ssa
diff --git a/lisc/test/mandel.ssa b/src/test/mandel.ssa
index efefeb3..efefeb3 100644
--- a/lisc/test/mandel.ssa
+++ b/src/test/mandel.ssa
diff --git a/lisc/test/max.ssa b/src/test/max.ssa
index 547e9d4..547e9d4 100644
--- a/lisc/test/max.ssa
+++ b/src/test/max.ssa
diff --git a/lisc/test/prime.ssa b/src/test/prime.ssa
index 12d0273..12d0273 100644
--- a/lisc/test/prime.ssa
+++ b/src/test/prime.ssa
diff --git a/lisc/test/puts10.ssa b/src/test/puts10.ssa
index 1dcf227..1dcf227 100644
--- a/lisc/test/puts10.ssa
+++ b/src/test/puts10.ssa
diff --git a/lisc/test/sum.ssa b/src/test/sum.ssa
index 266054e..266054e 100644
--- a/lisc/test/sum.ssa
+++ b/src/test/sum.ssa
diff --git a/lisc/tools/abi.ml b/src/tools/abi.ml
index d845c74..d845c74 100644
--- a/lisc/tools/abi.ml
+++ b/src/tools/abi.ml
diff --git a/lisc/tools/abitest.sh b/src/tools/abitest.sh
index 6305176..d5b16e5 100755
--- a/lisc/tools/abitest.sh
+++ b/src/tools/abitest.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 OCAMLC=/usr/bin/ocamlc
-QBE=`pwd`/lisc
+QBE=`pwd`/qbe
 
 failure() {
 	echo "Failure at stage:" $1 >&2
diff --git a/lisc/tools/fptox.c b/src/tools/fptox.c
index a2bc155..a2bc155 100644
--- a/lisc/tools/fptox.c
+++ b/src/tools/fptox.c
diff --git a/lisc/tools/pmov.c b/src/tools/pmov.c
index efbecd7..efbecd7 100644
--- a/lisc/tools/pmov.c
+++ b/src/tools/pmov.c
diff --git a/lisc/tools/regress.sh b/src/tools/regress.sh
index c1b90b2..4106b00 100755
--- a/lisc/tools/regress.sh
+++ b/src/tools/regress.sh
@@ -4,8 +4,8 @@ for t in test/*
 do
 	printf "Test $t ... "
 
-	./lisc   $t >/tmp/out.0 2>&1
-	./lisc.1 $t >/tmp/out.1 2>&1
+	./qbe   $t >/tmp/out.0 2>&1
+	./qbe.1 $t >/tmp/out.1 2>&1
 
 	if diff /tmp/out.0 /tmp/out.1 > /dev/null
 	then
diff --git a/lisc/util.c b/src/util.c
index 368a060..65b3ff8 100644
--- a/lisc/util.c
+++ b/src/util.c
@@ -1,4 +1,4 @@
-#include "lisc.h"
+#include "all.h"
 
 typedef struct Bitset Bitset;
 typedef struct Vec Vec;