Build 0.10.7

Updated 7800basic & bB to latest versions

Author: chunkypixel

CHANGELOG.md

@@ -0,0 +1,60 @@
+#!/bin/sh
+# 7800asm.sh
+# this script skips the basic preprocessing and creation of the assembly file
+# and it just (re)assembles the 7800.asm file
+
+# do some quick sanity checking...
+
+if [ ! "$bas7800dir" ] ; then
+  echo "### WARNING: the bas7800dir envionronment variable isn't set."
+fi
+
+OSTYPE=$(uname -s)
+ARCH=$(uname -m)
+for EXT in "" .$OSTYPE.x64 .$OSTYPE.x86 .$OSTYPE.$ARCH .$OSTYPE ; do
+  echo | 7800preprocess$EXT 2>/dev/null >&2 && break
+done
+
+echo | 7800preprocess$EXT 2>/dev/null >&2 && break
+if [ ! $? = 0 ] ; then
+  echo "### ERROR: couldn't find 7800basic binaries for $OSTYPE($ARCH). Exiting."
+  exit 1
+fi
+
+echo
+
+echo Using \"$EXT\" flavored 7800basic binaries
+echo "  "Location: $(which 7800preprocess$EXT | sed "s/7800preprocess$EXT//g" 2>/dev/null)
+BV=$(7800basic$EXT -v 2>/dev/null)
+echo "  Version: $BV" 
+
+#do dasm separately, because it's distributed separately
+for DASMEXT in "" .$OSTYPE.x64 .$OSTYPE.x86 .$OSTYPE.$ARCH .$OSTYPE ; do
+  dasm$DASMEXT 2>/dev/null >&2 
+  [ $? = 1 ] && break
+done
+dasm$DASMEXT 2>/dev/null >&2 
+if [ ! $? = 1 ] ; then
+  echo "### ERROR: couldn't find dasm binary for $OSTYPE($ARCH). Exiting."
+  exit 1
+fi
+
+echo Using \"$DASMEXT\" flavored dasm binary.
+echo "  "Location: $(which dasm$DASMEXT)
+
+DV=$(dasm$DASMEXT 2>/dev/null | grep ^DASM | head -n1)
+echo "  Version: $DV" 
+
+if [ "$1" = "-v" ] ; then
+  #this is just a version check. we already displayed the version earlier,
+  #so just exit.
+  exit
+fi
+
+echo
+  
+echo "(re)assembling $1"
+
+dasm$DASMEXT $1 -I"$bas7800dir/includes" -f3 -l"$1.list.txt" -p20 -s"$1.symbol.txt" -o"$1.bin" | 7800filter$EXT 
+
+exit 0

README.md

@@ -63,7 +63,7 @@ extern int TIGHTPACKBORDER;
 extern int changedmaholescalled;
 int maxpasses = 2;
 
-#define BASIC_VERSION_INFO "7800basic v0.34"
+#define BASIC_VERSION_INFO "7800basic v0.36"
 
 int main (int argc, char *argv[])
 {
@@ -358,6 +358,8 @@ int main (int argc, char *argv[])
 
 	    // preprocessing removed in favor of a simplistic lex-based preprocessor
 
+            // fprintf(stderr,"%s",code); // DEBUG
+
 	    i = 0;
 	    j = 0;
 	    k = 0;
@@ -392,7 +394,7 @@ int main (int argc, char *argv[])
 		sprintf (statement[0], "L0%d", unnamed++);
 	    }
 	    if (strncmp (statement[0], "end\0", 3))
-		printf (".%s ;; %s\n", statement[0], displaycode);	//    printf(".%s ; %s\n",statement[0],code);
+		printf (".%s ;;line %d;; %s\n", statement[0], line, displaycode);
 	    else
 		doend ();
 
@@ -426,11 +428,6 @@ int main (int argc, char *argv[])
 	printf ("  echo \"\"\n");
 	printf ("  echo \"######## ERROR: space overflow detected in\",[SPACEOVERFLOW]d,\"areas.\"\n");
 	printf ("  echo \"######## look above for areas with negative ROM space left.\"\n");
-	printf ("  echo \"######## Aborting assembly.\"\n");
-	printf ("SPACEOVERFLOWPASS SET (SPACEOVERFLOWPASS + 1)\n");
-	printf (" if SPACEOVERFLOWPASS > 0\n");
-	printf ("  ERR\n");
-	printf (" endif\n");
 	printf (" endif\n");
 
 	printf (" \n\n");