X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=3_test%2Fexectest.sh;h=77ac27da596fbd76abddbc20ebad9b07eaa1ad0c;hb=HEAD;hp=5d1a60b374b9fbf49d9d46706eac0ae77f7a8bdd;hpb=686ea778babcb0cfc8bb5e3900885398f43fb4a9;p=calu.git

diff --git a/3_test/exectest.sh b/3_test/exectest.sh
index 5d1a60b..77ac27d 100755
--- a/3_test/exectest.sh
+++ b/3_test/exectest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 ARG2=$2
 
@@ -10,8 +10,8 @@ cleantools() {
 }
 
 buildtools() {
-	make -C ../3a_asm all
-	make -C ../3b_sim all
+	make -C ../3a_asm -j3 all
+	make -C ../3b_sim -j3 all
 }
 
 runasm() {
@@ -22,6 +22,14 @@ runasm() {
 	../3a_asm/dtas < $ARG2 > ${ARG2%.s}.dthex
 }
 
+runasmbin() {
+	if [ "$ARG2" == ""  ]; then
+		echo "runasm: please provide a assembler file"
+		exit 1
+	fi
+	../3a_asm/dtas -b < $ARG2 > ${ARG2%.s}_bin.dthex
+}
+
 runsim() {
 	if [ "$ARG2" == ""  ]; then
 		echo "runsim: please provide a dthex file"
@@ -43,8 +51,11 @@ case $1 in
 	clean) cleantools;;
 	build) buildtools;;
 	asm) runasm;;
+	asmbin) runasmbin;;
 	sim) runsim;;
 	asmsim) runasmsim;;
-	*) echo "first argument must be clean|build|asm <file>|sim <file>"
+	*) echo "first argument must be clean|build|"
+	   echo "asm <file.s>|asmbin <file.s>|"
+	   echo "sim <file.dthex>|asmsim <file.s>"
 esac