add some basic checks

5 files changed, 160 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index b5770ce..d0dcd40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ lib/decls.h
 lib/defns.h
 lib/ops.h
 lib/*.d
+tests/*.d
 build
 copyjit
 !include/copyjit
diff --git a/Makefile b/Makefile
index a112e1c..9a89746 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ ARCH		!= uname -m
 
 LINT		= $(COMPILE) $(LINTFLAGS)
 
+TEST_OBJS	!= ./scripts/gen-deps --sources tests/check.c
 OBJS		!= ./scripts/gen-deps --sources "$(SOURCES)"
 OPS		!= ./scripts/gen-ops --ops "$(OP_SOURCES)"
 IMMS		!= ./scripts/gen-ops --imms "$(IMM_SOURCES)"
@@ -94,8 +95,11 @@ docs:
 	@doxygen docs/doxygen.conf
 
 .PHONY: check
-check: copyjit
-	./tests/check.sh
+check: tests/check
+	./tests/check
+
+tests/check: $(OBJS) $(TEST_OBJS)
+	$(COMPILE) build/tests/check.o build/src/copyjit.o -o tests/check
 
 copyjit: $(OBJS)
 	$(COMPILE) $(OBJS) -o $@
@@ -111,6 +115,7 @@ copyjit: $(OBJS)
 clean:
 	@$(RM) -r build copyjit lib/gen/* lib/*.bin lib/*.d lib/empty lib/prune deps.mk
 	@$(RM) -r lib/*decls.h lib/*defns.h lib/ops.h lib/imm.h
+	@$(RM) tests/check
 
 .PHONY: clean_docs
 clean_docs:
diff --git a/ops/common.h b/ops/common.h
index 6b124b3..6d3119a 100644
--- a/ops/common.h
+++ b/ops/common.h
@@ -17,9 +17,9 @@ typedef reg_t (*op_call)(reg_t *sp, reg_t a, reg_t x, reg_t y, reg_t o);
 #define JUMP(target, sp, a, x, y, o) \
 	return CALL(target, sp, a, x, y, o);
 
-#define BRANCH(target, cond, sp, a, x, y, o)                        \
+#define BRANCH(target, cond, sp, a, x, y, o)                               \
 	return ((op_call)((cond) ? (void *)(target) : (void *)&__next_op)) \
-	((sp), (a), (x), (y), (o));                                 \
+	       ((sp), (a), (x), (y), (o));                                 \
 
 #define DEFINE_OP(name) reg_t _op(reg_t *sp, reg_t a, reg_t x, reg_t y, reg_t o)
 
diff --git a/tests/check b/tests/check
new file mode 100755
index 0000000..b079a57
--- /dev/null
+++ b/tests/check
diff --git a/tests/check.c b/tests/check.c
new file mode 100644
index 0000000..8f4c6de
--- /dev/null
+++ b/tests/check.c
@@ -0,0 +1,150 @@
+#include <assert.h>
+#include <stddef.h>
+
+#include "../src/copyjit.h"
+
+#define IMMEDIATES 1000
+
+static void check_li()
+{
+	// x
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+		compile_fast_lix(&ctx, i);
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+
+	// y
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+		// actual instruction under test
+		compile_fast_liy(&ctx, i);
+
+		// juggling to get stuff into the return register x
+		compile_fast_lix(&ctx, 0);
+		compile_add(&ctx);
+		compile_movxa(&ctx);
+
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+
+	// o
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+		// actual instruction under test
+		compile_fast_lio(&ctx, i);
+
+		// juggling to get stuff into the return register x
+		compile_movxo(&ctx);
+
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+
+	// a
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+		// actual instruction under test
+		compile_fast_lia(&ctx, i);
+
+		// juggling to get stuff into the return register x
+		compile_movxa(&ctx);
+
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+}
+
+static void check_add()
+{
+	// x
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+
+		compile_fast_lix(&ctx, 0);
+		compile_fast_addix(&ctx, i);
+
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+
+	// y
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+
+		compile_fast_liy(&ctx, 0);
+		compile_fast_addiy(&ctx, i);
+
+		compile_fast_lix(&ctx, 0);
+		compile_add(&ctx);
+		compile_movxa(&ctx);
+
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+
+	// o
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+
+		compile_fast_lio(&ctx, 0);
+		compile_fast_addio(&ctx, i);
+
+		compile_movxo(&ctx);
+
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+
+	// a
+	for (size_t i = 0; i < IMMEDIATES; ++i) {
+		ctx_t ctx;
+		compile_start(&ctx);
+
+		compile_fast_lia(&ctx, 0);
+		compile_fast_addia(&ctx, i);
+
+		compile_movxa(&ctx);
+
+		compile_end(&ctx);
+		compile_finish(&ctx);
+
+		assert(run(&ctx) == i);
+	}
+}
+
+static void check_branch()
+{
+	/* oh yeah, I don't support forward references (yet), so this is a bit
+	 * tricky */
+}
+
+int main()
+{
+	check_li();
+	check_add();
+	check_branch();
+}