X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCglue.c;h=8da2373b20efcec722d02ca81def21c604c141e8;hb=3d9baea5496ef88e42e66cc1dacdfca167e2226e;hp=6d4fbe1b735997dbe7495e6e8b6b653a836f66bb;hpb=7a873fa453215d3a0a06b98acc781a814e866ad4;p=fw%2Fsdcc

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 6d4fbe1b..8da2373b 100644
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -26,8 +26,12 @@
 #include "asm.h"
 #include <time.h>
 #include "newalloc.h"
+#include <fcntl.h>
+#include <sys/stat.h>
 
-#if !defined(__BORLANDC__) && !defined(_MSC_VER)
+#ifdef _WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 
@@ -41,10 +45,26 @@ set *externs = NULL;		/* Varibles that are declared as extern */
 unsigned maxInterrupts = 6;
 int allocInfo = 1;
 symbol *mainf;
-extern char *VersionString;
+set *pipeSet = NULL;            /* set of pipes */
 set *tmpfileSet = NULL;		/* set of tmp file created by the compiler */
 set *tmpfileNameSet = NULL;	/* All are unlinked at close. */
 
+/*-----------------------------------------------------------------*/
+/* closePipes - closes all pipes created by the compiler           */
+/*-----------------------------------------------------------------*/
+DEFSETFUNC (closePipes)
+{
+  FILE *pfile = item;
+  int ret;
+
+  if (pfile) {
+    ret = pclose (pfile);
+    assert(ret != -1);
+  }
+
+  return 0;
+}
+
 /*-----------------------------------------------------------------*/
 /* closeTmpFiles - closes all tmp files created by the compiler    */
 /*                 because of BRAIN DEAD MS/DOS & CYGNUS Libraries */
@@ -52,29 +72,53 @@ set *tmpfileNameSet = NULL;	/* All are unlinked at close. */
 DEFSETFUNC (closeTmpFiles)
 {
   FILE *tfile = item;
+  int ret;
 
-  if (tfile)
-    fclose (tfile);
+  if (tfile) {
+    ret = fclose (tfile);
+    assert(ret == 0);
+  }
 
   return 0;
 }
 
 /*-----------------------------------------------------------------*/
-/* rmTmpFiles - closes all tmp files created by the compiler    */
+/* rmTmpFiles - unlinks all tmp files created by the compiler      */
 /*                 because of BRAIN DEAD MS/DOS & CYGNUS Libraries */
 /*-----------------------------------------------------------------*/
 DEFSETFUNC (rmTmpFiles)
 {
   char *name = item;
+  int ret;
 
-  if (name)
-    {
-      unlink (name);
+  if (name) {
+      ret = unlink (name);
+      assert(ret == 0);
       Safe_free (name);
-    }
+  }
+
   return 0;
 }
 
+/*-----------------------------------------------------------------*/
+/* rm_tmpfiles - close and remove temporary files and delete sets  */
+/*-----------------------------------------------------------------*/
+void
+rm_tmpfiles (void)
+{
+  /* close temporary files */
+  applyToSet (pipeSet, closePipes);
+  /* close temporary files */
+  deleteSet (&pipeSet);
+
+  applyToSet (tmpfileSet, closeTmpFiles);
+  /* remove temporary files */
+  applyToSet (tmpfileNameSet, rmTmpFiles);
+  /* delete temorary file sets */
+  deleteSet (&tmpfileSet);
+  deleteSet (&tmpfileNameSet);
+}
+
 /*-----------------------------------------------------------------*/
 /* copyFile - copies source file to destination file               */
 /*-----------------------------------------------------------------*/
@@ -92,7 +136,6 @@ copyFile (FILE * dest, FILE * src)
 char *
 aopLiteralLong (value * val, int offset, int size)
 {
-	char *rs;
 	union {
 		float f;
 		unsigned char c[4];
@@ -112,17 +155,18 @@ aopLiteralLong (value * val, int offset, int size)
 		v >>= (offset * 8);
 		switch (size) {
 		case 1:
-			tsprintf (buffer, "!immedbyte", (unsigned int) v & 0xff);
+			tsprintf (buffer, sizeof(buffer), 
+				  "!immedbyte", (unsigned int) v & 0xff);
 			break;
 		case 2:
-			tsprintf (buffer, "!immedword", (unsigned int) v & 0xffff);
+			tsprintf (buffer, sizeof(buffer), 
+				  "!immedword", (unsigned int) v & 0xffff);
 			break;
 		default:
 			/* Hmm.  Too big for now. */
 			assert (0);
 		}
-		rs = Safe_calloc (1, strlen (buffer) + 1);
-		return strcpy (rs, buffer);
+		return Safe_strdup (buffer);
 	}
 
 	/* PENDING: For now size must be 1 */
@@ -130,13 +174,14 @@ aopLiteralLong (value * val, int offset, int size)
 
 	/* it is type float */
 	fl.f = (float) floatFromVal (val);
-#ifdef _BIG_ENDIAN
-	tsprintf (buffer, "!immedbyte", fl.c[3 - offset]);
+#ifdef WORDS_BIGENDIAN
+	tsprintf (buffer, sizeof(buffer), 
+		  "!immedbyte", fl.c[3 - offset]);
 #else
-	tsprintf (buffer, "!immedbyte", fl.c[offset]);
+	tsprintf (buffer, sizeof(buffer), 
+		  "!immedbyte", fl.c[offset]);
 #endif
-	rs = Safe_calloc (1, strlen (buffer) + 1);
-	return strcpy (rs, buffer);
+	return Safe_strdup (buffer);
 }
 
 /*-----------------------------------------------------------------*/
@@ -217,18 +262,22 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 	continue;
 
       /* print extra debug info if required */
-      if (options.debug) {
-	cdbSymbol (sym, cdbFile, FALSE, FALSE);
-	if (!sym->level) /* global */
-	  if (IS_STATIC (sym->etype))
-	    fprintf (map->oFile, "F%s$", moduleName); /* scope is file */
+      if (options.debug)
+	{
+	  if (!sym->level) /* global */
+	    {
+	      if (IS_STATIC (sym->etype))
+	        fprintf (map->oFile, "F%s$", moduleName); /* scope is file */
+	      else
+	        fprintf (map->oFile, "G$");	/* scope is global */
+	    }
 	  else
-	    fprintf (map->oFile, "G$");	/* scope is global */
-	else
-	  /* symbol is local */
-	  fprintf (map->oFile, "L%s$", (sym->localof ? sym->localof->name : "-null-"));
-	fprintf (map->oFile, "%s$%d$%d", sym->name, sym->level, sym->block);
-      }
+	    {
+	      /* symbol is local */
+	      fprintf (map->oFile, "L%s$", (sym->localof ? sym->localof->name : "-null-"));
+	    }
+	  fprintf (map->oFile, "%s$%d$%d", sym->name, sym->level, sym->block);
+	}
       
       /* if it has an initial value then do it only if
          it is a global variable */
@@ -237,8 +286,8 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 	  // create a new "XINIT (CODE)" symbol, that will be emitted later
 	  newSym=copySymbol (sym);
 	  SPEC_OCLS(newSym->etype)=xinit;
-	  sprintf (newSym->name, "__xinit_%s", sym->name);
-	  sprintf (newSym->rname,"__xinit_%s", sym->rname);
+	  SNPRINTF (newSym->name, sizeof(newSym->name), "__xinit_%s", sym->name);
+	  SNPRINTF (newSym->rname, sizeof(newSym->rname), "__xinit_%s", sym->rname);
 	  SPEC_CONST(newSym->etype)=1;
 	  SPEC_STAT(newSym->etype)=1;
 	  resolveIvalSym(newSym->ival);
@@ -359,7 +408,7 @@ initPointer (initList * ilist, sym_link *toType)
 		/* address of symbol */
 		if (IS_AST_SYM_VALUE (expr->left)) {
 			val = copyValue (AST_VALUE (expr->left));
-			val->type = newLink ();
+			val->type = newLink (DECLARATOR);
 			if (SPEC_SCLS (expr->left->etype) == S_CODE) {
 				DCL_TYPE (val->type) = CPOINTER;
 				DCL_PTR_CONST (val->type) = port->mem.code_ro;
@@ -418,7 +467,7 @@ initPointer (initList * ilist, sym_link *toType)
 	    IS_ARRAY(expr->right->ftype)) {
 
 		val = copyValue (AST_VALUE (expr->right));
-		val->type = newLink ();
+		val->type = newLink (DECLARATOR);
 		if (SPEC_SCLS (expr->right->etype) == S_CODE) {
 			DCL_TYPE (val->type) = CPOINTER;
 			DCL_PTR_CONST (val->type) = port->mem.code_ro;
@@ -529,7 +578,6 @@ pointerTypeToGPByte (const int p_type, const char *iname, const char *oname)
 void 
 _printPointerType (FILE * oFile, const char *name)
 {
-  /* if (TARGET_IS_DS390) */
   if (options.model == MODEL_FLAT24)
     {
       fprintf (oFile, "\t.byte %s,(%s >> 8),(%s >> 16)", name, name, name);
@@ -734,12 +782,13 @@ printIvalChar (sym_link * type, initList * ilist, FILE * oFile, char *s)
 /*-----------------------------------------------------------------*/
 /* printIvalArray - generates code for array initialization        */
 /*-----------------------------------------------------------------*/
-void 
+void
 printIvalArray (symbol * sym, sym_link * type, initList * ilist,
 		FILE * oFile)
 {
   initList *iloop;
   int lcnt = 0, size = 0;
+  sym_link *last_type;
 
   /* take care of the special   case  */
   /* array of characters can be init  */
@@ -763,6 +812,11 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist,
 
   iloop = ilist->init.deep;
   lcnt = DCL_ELEM (type);
+  for (last_type = type->next; 
+       last_type && IS_DECL(last_type) && DCL_ELEM (last_type); 
+       last_type = last_type->next) {
+    lcnt *= DCL_ELEM (last_type);
+  }
 
   for (;;)
     {
@@ -1098,7 +1152,7 @@ emitStaticSeg (memmap * map, FILE * out)
 
       /* print extra debug info if required */
       if (options.debug) {
-	cdbSymbol (sym, cdbFile, FALSE, FALSE);
+
 	if (!sym->level)
 	  {			/* global */
 	    if (IS_STATIC (sym->etype))
@@ -1136,6 +1190,13 @@ emitStaticSeg (memmap * map, FILE * out)
 	      resolveIvalSym (sym->ival);
 	      printIval (sym, sym->type, sym->ival, out);
 	      noAlloc--;
+	      /* if sym is a simple string and sym->ival is a string, 
+		 WE don't need it anymore */
+	      if (IS_ARRAY(sym->type) && IS_CHAR(sym->type->next) &&
+		  IS_AST_SYM_VALUE(list2expr(sym->ival)) &&
+		  list2val(sym->ival)->sym->isstrlit) {
+		freeStringSymbol(list2val(sym->ival)->sym);
+	      }
 	    }
 	  else {
 	      /* allocate space */
@@ -1162,7 +1223,7 @@ emitStaticSeg (memmap * map, FILE * out)
 /* emitMaps - emits the code for the data portion the code         */
 /*-----------------------------------------------------------------*/
 void 
-emitMaps ()
+emitMaps (void)
 {
   inInitMode++;
   /* no special considerations for the following
@@ -1211,7 +1272,7 @@ createInterruptVect (FILE * vFile)
   /* only if the main function exists */
   if (!(mainf = findSymWithLevel (SymbolTab, mainf)))
     {
-      if (!options.cc_only && !noAssemble)
+      if (!options.cc_only && !noAssemble && !options.c1mode)
 	werror (E_NO_MAIN);
       return;
     }
@@ -1268,7 +1329,7 @@ initialComments (FILE * afile)
   time_t t;
   time (&t);
   fprintf (afile, "%s", iComments1);
-  fprintf (afile, "; Version %s %s\n", VersionString, asctime (localtime (&t)));
+  fprintf (afile, "; Version " SDCC_VERSION_STR " %s\n", asctime (localtime (&t)));
   fprintf (afile, "%s", iComments2);
 }
 
@@ -1361,8 +1422,6 @@ emitOverlay (FILE * afile)
 	  /* print extra debug info if required */
 	  if (options.debug)
 	    {
-	      cdbSymbol (sym, cdbFile, FALSE, FALSE);
-
 	      if (!sym->level)
 		{		/* global */
 		  if (IS_STATIC (sym->etype))
@@ -1407,20 +1466,45 @@ emitOverlay (FILE * afile)
     }
 }
 
+
+/*-----------------------------------------------------------------*/
+/* spacesToUnderscores - replace spaces with underscores        */
+/*-----------------------------------------------------------------*/
+static char *
+spacesToUnderscores (char *dest, const char *src, size_t len)
+{
+  int i;
+  char *p;
+
+  assert(dest != NULL);
+  assert(src != NULL);
+  assert(len > 0);
+
+  --len;
+  for (p = dest, i = 0; *src != '\0' && i < len; ++src, ++i) {
+    *p++ = isspace(*src) ? '_' : *src;
+  }
+  *p = '\0';
+
+  return dest;
+}
+
+
 /*-----------------------------------------------------------------*/
 /* glue - the final glue that hold the whole thing together        */
 /*-----------------------------------------------------------------*/
 void 
-glue ()
+glue (void)
 {
   FILE *vFile;
   FILE *asmFile;
   FILE *ovrFile = tempfile ();
+  char moduleBuf[PATH_MAX];
 
   addSetHead (&tmpfileSet, ovrFile);
   /* print the global struct definitions */
   if (options.debug)
-    cdbStructBlock (0, cdbFile);
+    cdbStructBlock (0);
 
   vFile = tempfile ();
   /* PENDING: this isnt the best place but it will do */
@@ -1437,17 +1521,20 @@ glue ()
   /* do the overlay segments */
   emitOverlay (ovrFile);
 
+  outputDebugSymbols();
+
   /* now put it all together into the assembler file */
   /* create the assembler file name */
 
-  if (!options.c1mode)
+  /* -o option overrides default name? */
+  if ((noAssemble || options.c1mode) && fullDstFileName)
     {
-      sprintf (scratchFileName, srcFileName);
-      strcat (scratchFileName, port->assembler.file_ext);
+      strncpyz (scratchFileName, fullDstFileName, PATH_MAX);
     }
   else
     {
-      strcpy (scratchFileName, options.out_name);
+      strncpyz (scratchFileName, dstFileName, PATH_MAX);
+      strncatz (scratchFileName, port->assembler.file_ext, PATH_MAX);
     }
 
   if (!(asmFile = fopen (scratchFileName, "w")))
@@ -1460,7 +1547,8 @@ glue ()
   initialComments (asmFile);
 
   /* print module name */
-  tfprintf (asmFile, "\t!module\n", moduleName);
+  tfprintf (asmFile, "\t!module\n",
+    spacesToUnderscores (moduleBuf, moduleName, sizeof moduleBuf));
   tfprintf (asmFile, "\t!fileprelude\n");
 
   /* Let the port generate any global directives, etc. */
@@ -1485,6 +1573,26 @@ glue ()
   fprintf (asmFile, "; special function bits \n");
   fprintf (asmFile, "%s", iComments2);
   copyFile (asmFile, sfrbit->oFile);
+  
+  /*JCF: Create the areas for the register banks*/
+  if(port->general.glue_up_main &&
+     (TARGET_IS_MCS51 || TARGET_IS_DS390 || TARGET_IS_XA51 || TARGET_IS_DS400))
+  {
+	  if(RegBankUsed[0]||RegBankUsed[1]||RegBankUsed[2]||RegBankUsed[3])
+	  {
+		 fprintf (asmFile, "%s", iComments2);
+		 fprintf (asmFile, "; overlayable register banks \n");
+		 fprintf (asmFile, "%s", iComments2);
+		 if(RegBankUsed[0])
+			fprintf (asmFile, "\t.area REG_BANK_0\t(REL,OVR,DATA)\n\t.ds 8\n");
+		 if(RegBankUsed[1]||options.parms_in_bank1)
+			fprintf (asmFile, "\t.area REG_BANK_1\t(REL,OVR,DATA)\n\t.ds 8\n");
+		 if(RegBankUsed[2])
+			fprintf (asmFile, "\t.area REG_BANK_2\t(REL,OVR,DATA)\n\t.ds 8\n");
+		 if(RegBankUsed[3])
+			fprintf (asmFile, "\t.area REG_BANK_3\t(REL,OVR,DATA)\n\t.ds 8\n");
+	  }
+  }
 
   /* copy the data segment */
   fprintf (asmFile, "%s", iComments2);
@@ -1587,16 +1695,14 @@ glue ()
 		   (unsigned int) options.xdata_loc & 0xff);
 	}
 
-      /* initialise the stack pointer */
-      /* if the user specified a value then use it */
-      if (options.stack_loc)
-	fprintf (asmFile, "\tmov\tsp,#%d\n", options.stack_loc & 0xff);
-      else
-	/* no: we have to compute it */
-      if (!options.stackOnData && maxRegBank <= 3)
-	fprintf (asmFile, "\tmov\tsp,#%d\n", ((maxRegBank + 1) * 8) - 1);
-      else
-	fprintf (asmFile, "\tmov\tsp,#__start__stack\n");	/* MOF */
+	// This should probably be a port option, but I'm being lazy.
+	// on the 400, the firmware boot loader gives us a valid stack
+	// (see '400 data sheet pg. 85 (TINI400 ROM Initialization code)
+	if (!TARGET_IS_DS400)
+	{
+	    /* initialise the stack pointer.  JCF: aslink takes care of the location */
+	    fprintf (asmFile, "\tmov\tsp,#__start__stack - 1\n");	/* MOF */
+	}
 
       fprintf (asmFile, "\tlcall\t__sdcc_external_startup\n");
       fprintf (asmFile, "\tmov\ta,dpl\n");
@@ -1662,76 +1768,152 @@ glue ()
       port->genAssemblerEnd(asmFile);
   }
   fclose (asmFile);
-  applyToSet (tmpfileSet, closeTmpFiles);
-  applyToSet (tmpfileNameSet, rmTmpFiles);
-}
 
-#if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER)
-void
-rm_tmpfiles (void)
-{
-  applyToSet (tmpfileSet, closeTmpFiles);
-  applyToSet (tmpfileNameSet, rmTmpFiles);
+  rm_tmpfiles ();
 }
-#endif
 
-/** Creates a temporary file name a'la tmpnam which avoids the bugs
-    in cygwin wrt c:\tmp.
-    Scans, in order: TMP, TEMP, TMPDIR, else uses tmpfile().
+
+/** Creates a temporary file with unoque file name
+    Scans, in order:
+    - TMP, TEMP, TMPDIR env. varibles
+    - if Un*x system: /usr/tmp and /tmp
+    - root directory using mkstemp() if avaliable
+    - default location using tempnam()
 */
-char *
-tempfilename (void)
+static int
+tempfileandname(char *fname, size_t len)
 {
-#if !defined(_MSC_VER)
+#define TEMPLATE      "sdccXXXXXX"
+#define TEMPLATE_LEN  ((sizeof TEMPLATE) - 1)
+
   const char *tmpdir = NULL;
-  if (getenv ("TMP"))
-    tmpdir = getenv ("TMP");
-  else if (getenv ("TEMP"))
-    tmpdir = getenv ("TEMP");
-  else if (getenv ("TMPDIR"))
-    tmpdir = getenv ("TMPDIR");
-  if (tmpdir)
-    {
-      char *name = tempnam (tmpdir, "sdcc");
-      if (name)
-	{
-          return name;
-        }
+  int fd;
+
+  if ((tmpdir = getenv ("TMP")) == NULL)
+    if ((tmpdir = getenv ("TEMP")) == NULL)
+      tmpdir = getenv ("TMPDIR");
+
+#ifndef _WIN32
+  {
+    /* try with /usr/tmp and /tmp on Un*x systems */
+    struct stat statbuf;
+
+    if (tmpdir == NULL) {
+      if (stat("/usr/tmp", &statbuf) != -1)
+        tmpdir = "/usr/tmp";
+      else if (stat("/tmp", &statbuf) != -1)
+        tmpdir = "/tmp";
     }
+  }
 #endif
-  return tmpnam (NULL);
+
+#ifdef HAVE_MKSTEMP
+  {
+    char fnamebuf[PATH_MAX];
+    size_t name_len;
+
+    if (fname == NULL || len == 0) {
+      fname = fnamebuf;
+      len = sizeof fnamebuf;
+    }
+
+    if (tmpdir) {
+      name_len = strlen(tmpdir) + 1 + TEMPLATE_LEN;
+
+      assert(name_len < len);
+      if (!(name_len < len))  /* in NDEBUG is defined */
+        return -1;            /* buffer too small, temporary file can not be created */
+
+      sprintf(fname, "%s" DIR_SEPARATOR_STRING TEMPLATE, tmpdir);
+    }
+    else {
+      name_len = TEMPLATE_LEN;
+
+      assert(name_len < len);
+      if (!(name_len < len))  /* in NDEBUG is defined */
+        return -1;            /* buffer too small, temporary file can not be created */
+
+      strcpy(fname, TEMPLATE);
+    }
+
+    fd = mkstemp(fname);
+  }
+#else
+  {
+    char *name = tempnam(tmpdir, "sdcc");
+
+    if (name == NULL) {
+      perror("Can't create temporary file name");
+      exit(1);
+    }
+
+    assert(strlen(name) < len);
+    if (!(strlen(name) < len))  /* in NDEBUG is defined */
+      return -1;                /* buffer too small, temporary file can not be created */
+
+    strcpy(fname, name);
+#ifdef _WIN32
+    fd = open(name, O_CREAT | O_EXCL | O_RDWR, S_IREAD | S_IWRITE);
+#else
+    fd = open(name, O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
+#endif
+  }
+#endif
+
+  if (fd == -1) {
+    perror("Can't create temporary file");
+    exit(1);
+  }
+
+  return fd;
 }
 
-/** Creates a temporary file a'la tmpfile which avoids the bugs
-    in cygwin wrt c:\tmp.
-    Scans, in order: TMP, TEMP, TMPDIR, else uses tmpfile().
+
+/** Create a temporary file name
 */
-FILE *
-tempfile (void)
+char *
+tempfilename(void)
 {
-#if !defined(_MSC_VER)
-  const char *tmpdir = NULL;
-  if (getenv ("TMP"))
-    tmpdir = getenv ("TMP");
-  else if (getenv ("TEMP"))
-    tmpdir = getenv ("TEMP");
-  else if (getenv ("TMPDIR"))
-    tmpdir = getenv ("TMPDIR");
-  if (tmpdir)
-    {
-      char *name = Safe_strdup( tempnam (tmpdir, "sdcc"));
-      if (name)
-	{
-	  FILE *fp = fopen (name, "w+b");
-	  if (fp)
-	    {
-	      addSetHead (&tmpfileNameSet, name);
-	    }
-	  return fp;
-	}
-      return NULL;
-    }
-#endif
-  return tmpfile ();
+  int fd;
+  static char fnamebuf[PATH_MAX];
+
+  if ((fd = tempfileandname(fnamebuf, sizeof fnamebuf)) == -1) {
+    fprintf(stderr, "Can't create temporary file name!");
+    exit(1);
+  }
+
+  fd = close(fd);
+  assert(fd != -1);
+
+  return fnamebuf;
 }
 
+
+/** Create a temporary file and add it to tmpfileNameSet,
+    so that it is removed explicitly by rm_tmpfiles()
+    or implicitly at program extit.
+*/
+FILE *
+tempfile(void)
+{
+  int fd;
+  char *tmp;
+  FILE *fp;
+  char fnamebuf[PATH_MAX];
+
+  if ((fd = tempfileandname(fnamebuf, sizeof fnamebuf)) == -1) {
+    fprintf(stderr, "Can't create temporary file!");
+    exit(1);
+  }
+
+  tmp = Safe_strdup(fnamebuf);
+  if (tmp)
+    addSetHead(&tmpfileNameSet, tmp);
+
+  if ((fp = fdopen(fd, "w+b")) == NULL) {
+      perror("Can't create temporary file!");
+      exit(1);
+  }
+
+  return fp;
+}