#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
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 */
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 */
/*-----------------------------------------------------------------*/
char *
aopLiteralLong (value * val, int offset, int size)
{
- char *rs;
union {
float f;
unsigned char c[4];
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 */
/* 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);
}
/*-----------------------------------------------------------------*/
// 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);
if ((val = constExprValue (expr, FALSE)))
return val;
+ /* ( ptr + constant ) */
+ if (IS_AST_OP (expr) &&
+ (expr->opval.op == '+' || expr->opval.op == '-') &&
+ IS_AST_SYM_VALUE (expr->left) &&
+ (IS_ARRAY(expr->left->ftype) || IS_PTR(expr->left->ftype)) &&
+ compareType(toType, expr->left->ftype) &&
+ IS_AST_LIT_VALUE (expr->right)) {
+ return valForCastAggr (expr->left, expr->left->ftype,
+ expr->right,
+ expr->opval.op);
+ }
+
/* (char *)&a */
if (IS_AST_OP(expr) && expr->opval.op==CAST &&
IS_AST_OP(expr->right) && expr->right->opval.op=='&') {
/* 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;
+ DCL_TYPE (val->type) = port->mem.code_ro;
}
else if (SPEC_SCLS (expr->left->etype) == S_XDATA)
DCL_TYPE (val->type) = FPOINTER;
expr->right, expr->opval.op);
}
-
/* case 4. (char *)(array type) */
if (IS_CAST_OP(expr) && IS_AST_SYM_VALUE (expr->right) &&
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;
return val;
}
wrong:
- werror (W_INIT_WRONG);
+ werror (E_INCOMPAT_PTYPES);
return NULL;
}
{
case IPOINTER:
case POINTER:
- return 0;
+ return GPTYPE_NEAR;
case GPOINTER:
- /* hack - if we get a generic pointer, we just assume
- * it's an FPOINTER (i.e. in XDATA space).
- */
- werror (E_CANNOT_USE_GENERIC_POINTER, iname, oname);
+ werror (E_CANNOT_USE_GENERIC_POINTER,
+ iname ? iname : "<null>",
+ oname ? oname : "<null>");
exit (1);
- // fall through
case FPOINTER:
- return 1;
+ return GPTYPE_FAR;
case CPOINTER:
- return 2;
+ return GPTYPE_CODE;
case PPOINTER:
- return 3;
+ return GPTYPE_XSTACK;
default:
fprintf (stderr, "*** internal error: unknown pointer type %d in GPByte.\n",
p_type);
/*-----------------------------------------------------------------*/
/* 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 */
/* by a string */
if (IS_CHAR (type->next)) {
if (!IS_LITERAL(list2val(ilist)->etype)) {
- werror (W_INIT_WRONG);
+ werror (E_CONST_EXPECTED);
return;
}
if (printIvalChar (type,
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 (;;)
{
return;
/* check the type */
- if (compareType (type, val->type) == 0)
+ if (compareType (type, val->type) == 0) {
werror (W_INIT_WRONG);
+ printFromToType (val->type, type);
+ }
/* if val is literal */
if (IS_LITERAL (val->etype))
else
tfprintf (oFile, "\t.byte %s,%s\n", aopLiteral (val, 0), aopLiteral (val, 1));
break;
- case 3:
- fprintf (oFile, "\t.byte %s,%s,#0x02\n",
- aopLiteral (val, 0), aopLiteral (val, 1));
+ case 3: // how about '390??
+ fprintf (oFile, "\t.byte %s,%s,#0x%d\n",
+ aopLiteral (val, 0), aopLiteral (val, 1), GPTYPE_CODE);
}
return;
}
if (!ilist)
return;
+ /* update line number for error msgs */
+ lineno=sym->lineDef;
+
/* if structure then */
if (IS_STRUCT (type))
{
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 */
/* emitMaps - emits the code for the data portion the code */
/*-----------------------------------------------------------------*/
void
-emitMaps ()
+emitMaps (void)
{
inInitMode++;
/* no special considerations for the following
/* 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;
}
/* glue - the final glue that hold the whole thing together */
/*-----------------------------------------------------------------*/
void
-glue ()
+glue (void)
{
FILE *vFile;
FILE *asmFile;
/* 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")))
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))
+ {
+ 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);
(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 */
+ /* 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");
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;
+}
projects / fw / sdcc / blobdiff