X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=as%2Fmcs51%2Fasmain.c;h=eed56eac6c3eca6017d27d696ebb57cee40101b9;hb=39d8c4ce9178dd0f1cd4d58c680a226f50cc9ad3;hp=8c3d68dc3686c0441f4717a3122e9c4c52e002ff;hpb=28ddfae037e9fdfd03615953bdf9f5f0811fc393;p=fw%2Fsdcc

diff --git a/as/mcs51/asmain.c b/as/mcs51/asmain.c
index 8c3d68dc..eed56eac 100644
--- a/as/mcs51/asmain.c
+++ b/as/mcs51/asmain.c
@@ -11,15 +11,14 @@
  * 29-Oct-97 JLH pass ";!" comments to output file
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <setjmp.h>
 #include <string.h>
-#if !defined(_MSC_VER)
-#include <alloc.h>
-#endif
+
 #include "asm.h"
+#include "strcmpi.h"
 
-extern VOID machine(struct mne *);
 /*)Module	asmain.c
  *
  *	The module asmain.c includes the command argument parser,
@@ -149,6 +148,9 @@ extern VOID machine(struct mne *);
  *		REL, LST, and/or SYM files may be generated.
  */
 
+int fatalErrors=0;
+char relFile[128];
+
 int
 main(argc, argv)
 char *argv[];
@@ -243,8 +245,11 @@ char *argv[];
 			if (inpfil == 0) {
 				if (lflag)
 					lfp = afile(p, "lst", 1);
-				if (oflag)
-					ofp = afile(p, "rel", 1);
+				if (oflag) {
+				  ofp = afile(p, "rel", 1);
+				  // save the file name if we have to delete it on error
+				  strcpy(relFile,afn);
+				}
 				if (sflag)
 					tfp = afile(p, "sym", 1);
 			}
@@ -319,8 +324,10 @@ char *argv[];
 	if (lflag) {
 		lstsym(lfp);
 	}
-	asexit(aserr != 0);
-	return 0;
+	//printf ("aserr: %d\n", aserr);
+	//printf ("fatalErrors: %d\n", fatalErrors);
+	asexit(fatalErrors);
+	return 0; // hush the compiler
 }
 
 /*)Function	VOID	asexit(i)
@@ -365,7 +372,11 @@ int i;
 	/*for (j=0; j<MAXINC && ifp[j] != NULL; j++) {
 		fclose(ifp[j]);
 		}*/
-
+	if (i) {
+	  // remove output file
+	  printf ("removing %s\n", relFile);
+	  unlink(relFile);
+	}
 	exit(i);
 }
 
@@ -441,7 +452,7 @@ int i;
  *		char	getnb()		aslex.c
  *		VOID	getst()		aslex.c
  *		sym *	lookup()	assym.c
- *		VOID	machin()	___mch.c
+ *		VOID	machine()	___mch.c
  *		mne *	mlookup()	assym.c
  *		int	more()		aslex.c
  *		VOID *	new()		assym.c
@@ -469,7 +480,7 @@ asmbl()
 	struct expr e1;
 	char id[NCPS];
 	char opt[NCPS];
-	char fn[FILSPC];
+	char fn[PATH_MAX];
 	char *p;
 	int d, n, uaf, uf;
 
@@ -789,7 +800,7 @@ loop:
 		break;
 
 	case S_MODUL:
-		getst(id, -1);
+	        getst(id, getnb()); // a module can start with a digit
 		if (pass == 0) {
 			if (module[0]) {
 				err('m');
@@ -833,10 +844,6 @@ loop:
 		if ((ap = alookup(id)) != NULL) {
 			if (uaf && uf != ap->a_flag)
 				err('m');
-                        if (ap->a_flag & A_OVR) {
-				ap->a_size = 0; 
-                                ap->a_fuzz=0;
-			}
 		} else {
 			ap = (struct area *) new (sizeof(struct area));
 			ap->a_ap = areap;
@@ -901,7 +908,7 @@ loop:
 		d = getnb();
 		p = fn;
 		while ((c = get()) != d) {
-			if (p < &fn[FILSPC-1]) {
+			if (p < &fn[PATH_MAX-1]) {
 				*p++ = c;
 			} else {
 				break;
@@ -925,7 +932,7 @@ loop:
 		{
 		    getst(id, -1);
 		    
-		    if (!strcmpi(id, "on"))
+		    if (!as_strcmpi(id, "on"))
 		    {
 		    	/* Quick sanity check: size of 
 		    	 * Addr_T must be at least 24 bits.
@@ -943,7 +950,7 @@ loop:
 		    	    flat24Mode = 1;
 		    	}
 		    }
-		    else if (!strcmpi(id, "off"))
+		    else if (!as_strcmpi(id, "off"))
 		    {
 		        flat24Mode = 0;
 		    }
@@ -1032,30 +1039,36 @@ char *fn;
 char *ft;
 int wf;
 {
-	register char *p1, *p2, *p3;
+	register char *p2, *p3;
 	register int c;
 	FILE *fp;
 
-	p1 = fn;
 	p2 = afn;
 	p3 = ft;
-	while ((c = *p1++) != 0 && c != FSEPX) {
-		if (p2 < &afn[FILSPC-4])
-			*p2++ = c;
-	}
+
+	strcpy (afn, fn);
+	p2 = strrchr (afn, FSEPX);		// search last '.'
+	if (!p2)
+		p2 = afn + strlen (afn);
+	if (p2 > &afn[PATH_MAX-4])		// truncate filename, if it's too long
+		p2 = &afn[PATH_MAX-4];
 	*p2++ = FSEPX;
-	if (*p3 == 0) {
-		if (c == FSEPX) {
-			p3 = p1;
-		} else {
-			p3 = dsft;
-		}
+
+	// choose a file-extension
+	if (*p3 == 0) {					// extension supplied?
+		p3 = strrchr (fn, FSEPX);	// no: extension in fn?
+		if (p3)
+			++p3;
+		else
+			p3 = dsft;					// no: default extension
 	}
-	while ((c = *p3++) != 0) {
-		if (p2 < &afn[FILSPC-1])
+
+	while ((c = *p3++) != 0) {		// strncpy
+		if (p2 < &afn[PATH_MAX-1])
 			*p2++ = c;
 	}
 	*p2++ = 0;
+
 	if ((fp = fopen(afn, wf?"w":"r")) == NULL) {
 		fprintf(stderr, "%s: cannot %s.\n", afn, wf?"create":"open");
 		asexit(1);
@@ -1098,11 +1111,26 @@ register struct area *nap;
 	register struct area *oap;
 
 	oap = dot.s_area;
+	/* fprintf (stderr, "%s dot.s_area->a_size: %d dot.s_addr: %d\n",
+	     oap->a_id, dot.s_area->a_size, dot.s_addr); */
 	oap->a_fuzz = fuzz;
-	oap->a_size = dot.s_addr;
-	fuzz = nap->a_fuzz;
+	if (oap->a_flag & A_OVR) {
+	  // the size of an overlay is the biggest size encountered
+	  if (oap->a_size < dot.s_addr) {
+	    oap->a_size = dot.s_addr;
+	  }
+	} else {
+	  oap->a_size = dot.s_addr;
+	}
+	if (nap->a_flag & A_OVR) {
+	  // a new overlay starts at 0, no fuzz
+	  dot.s_addr = 0;
+	  fuzz = 0;
+	} else {
+	  dot.s_addr = nap->a_size;
+	  fuzz = nap->a_fuzz;
+	}
 	dot.s_area = nap;
-	dot.s_addr = nap->a_size;
 	outall();
 }