-------------------------------------------------------------------------*/
#include "common.h"
-#include "asm.h"
#include <time.h>
#include "newalloc.h"
#include <fcntl.h>
symbol *interrupts[INTNO_MAX+1];
-void printIval (symbol *, sym_link *, initList *, struct dbuf_s *);
+void printIval (symbol *, sym_link *, initList *, struct dbuf_s *, bool check);
set *publics = NULL; /* public variables */
set *externs = NULL; /* Variables that are declared as extern */
unsigned maxInterrupts = 0;
int allocInfo = 1;
symbol *mainf;
-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. */
+int noInit = 0; /* no initialization */
-/*-----------------------------------------------------------------*/
-/* 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) {
- ret = fclose (tfile);
- assert(ret == 0);
- }
-
- return 0;
-}
-
-/*-----------------------------------------------------------------*/
-/* 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) {
- ret = remove (name);
- assert(ret == 0);
- Safe_free (name);
- }
-
- return 0;
-}
char *
aopLiteralLong (value * val, int offset, int size)
if (!val) {
// assuming we have been warned before
- val=constVal("0");
+ val = constCharVal (0);
}
/* if it is a float then it gets tricky */
/* otherwise it is fairly simple */
if (!IS_FLOAT (val->type)) {
- unsigned long v = (unsigned long) floatFromVal (val);
+ unsigned long v = ulFromVal (val);
v >>= (offset * 8);
switch (size) {
case 1:
- tsprintf (buffer, sizeof(buffer),
+ tsprintf (buffer, sizeof(buffer),
"!immedbyte", (unsigned int) v & 0xff);
break;
case 2:
- tsprintf (buffer, sizeof(buffer),
+ tsprintf (buffer, sizeof(buffer),
"!immedword", (unsigned int) v & 0xffff);
break;
default:
/* it is type float */
fl.f = (float) floatFromVal (val);
#ifdef WORDS_BIGENDIAN
- tsprintf (buffer, sizeof(buffer),
+ tsprintf (buffer, sizeof(buffer),
"!immedbyte", fl.c[3 - offset]);
#else
- tsprintf (buffer, sizeof(buffer),
+ tsprintf (buffer, sizeof(buffer),
"!immedbyte", fl.c[offset]);
#endif
return Safe_strdup (buffer);
/*-----------------------------------------------------------------*/
/* emitRegularMap - emit code for maps with no special cases */
/*-----------------------------------------------------------------*/
-static void
+static void
emitRegularMap (memmap * map, bool addPublics, bool arFlag)
{
symbol *sym;
else
dbuf_tprintf (&map->oBuf, "\t!area\n", map->sname);
}
-
- for (sym = setFirstItem (map->syms); sym;
- sym = setNextItem (map->syms))
+
+ for (sym = setFirstItem (map->syms); sym; sym = setNextItem (map->syms))
{
- symbol *newSym=NULL;
+ symbol *newSym = NULL;
/* if extern then add it into the extern list */
if (IS_EXTERN (sym->etype))
continue;
/* for bitvar locals and parameters */
- if (!arFlag && !sym->allocreq && sym->level
- && !SPEC_ABSA (sym->etype)) {
- continue;
- }
+ if (!arFlag && !sym->allocreq && sym->level
+ && !SPEC_ABSA (sym->etype))
+ {
+ continue;
+ }
/* if global variable & not static or extern
and addPublics allowed then add it to the public set */
(sym->_isparm && !IS_REGPARM (sym->etype))) &&
addPublics &&
!IS_STATIC (sym->etype) &&
- (IS_FUNC(sym->type) ? (sym->used || IFFUNC_HASBODY(sym->type)) : 1))
+ (IS_FUNC (sym->type) ? (sym->used || IFFUNC_HASBODY (sym->type)) : 1))
{
addSetHead (&publics, sym);
}
}
dbuf_printf (&map->oBuf, "%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 */
- if (sym->ival && sym->level == 0) {
- if ((SPEC_OCLS(sym->etype)==xidata) && !SPEC_ABSA (sym->etype)) {
- /* create a new "XINIT (CODE)" symbol, that will be emitted later
- in the static seg */
- newSym=copySymbol (sym);
- SPEC_OCLS(newSym->etype)=xinit;
- SNPRINTF (newSym->name, sizeof(newSym->name), "__xinit_%s", sym->name);
- SNPRINTF (newSym->rname, sizeof(newSym->rname), "__xinit_%s", sym->rname);
- if (IS_SPEC (newSym->type))
- SPEC_CONST (newSym->type) = 1;
- else
- DCL_PTR_CONST (newSym->type) = 1;
- SPEC_STAT(newSym->etype)=1;
- resolveIvalSym(newSym->ival, newSym->type);
+ if (sym->ival && sym->level == 0)
+ {
+ if ((SPEC_OCLS (sym->etype) == xidata) && !SPEC_ABSA (sym->etype))
+ {
+ /* create a new "XINIT (CODE)" symbol, that will be emitted later
+ in the static seg */
+ newSym=copySymbol (sym);
+ SPEC_OCLS(newSym->etype)=xinit;
+ SNPRINTF (newSym->name, sizeof(newSym->name), "__xinit_%s", sym->name);
+ SNPRINTF (newSym->rname, sizeof(newSym->rname), "__xinit_%s", sym->rname);
+ if (IS_SPEC (newSym->type))
+ SPEC_CONST (newSym->type) = 1;
+ else
+ DCL_PTR_CONST (newSym->type) = 1;
+ SPEC_STAT(newSym->etype)=1;
+ resolveIvalSym(newSym->ival, newSym->type);
- // add it to the "XINIT (CODE)" segment
- addSet(&xinit->syms, newSym);
+ // add it to the "XINIT (CODE)" segment
+ addSet(&xinit->syms, newSym);
- if (!SPEC_ABSA (sym->etype))
+ if (!SPEC_ABSA (sym->etype))
+ {
+ struct dbuf_s tmpBuf;
+
+ dbuf_init(&tmpBuf, 4096);
+ // before allocation we must parse the sym->ival tree
+ // but without actually generating initialization code
+ ++noAlloc;
+ resolveIvalSym (sym->ival, sym->type);
+ ++noInit;
+ printIval (sym, sym->type, sym->ival, &tmpBuf, TRUE);
+ --noInit;
+ --noAlloc;
+ dbuf_destroy(&tmpBuf);
+ }
+ }
+ else
{
- struct dbuf_s tmpBuf;
+ if (IS_AGGREGATE (sym->type))
+ {
+ ival = initAggregates (sym, sym->ival, NULL);
+ }
+ else
+ {
+ if (getNelements (sym->type, sym->ival)>1)
+ {
+ werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "scalar", sym->name);
+ }
+ ival = newNode ('=', newAst_VALUE (symbolVal (sym)),
+ decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_TYPE_NONE));
+ }
+ codeOutBuf = &statsg->oBuf;
- dbuf_init(&tmpBuf, 4096);
- // before allocation we must parse the sym->ival tree
- // but without actually generating initialization code
- noAlloc++;
- resolveIvalSym (sym->ival, sym->type);
- printIval (sym, sym->type, sym->ival, &tmpBuf);
- noAlloc--;
- dbuf_destroy(&tmpBuf);
- }
- } else {
- if (IS_AGGREGATE (sym->type)) {
- ival = initAggregates (sym, sym->ival, NULL);
- } else {
- if (getNelements(sym->type, sym->ival)>1) {
- werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "scalar",
- sym->name);
- }
- ival = newNode ('=', newAst_VALUE (symbolVal (sym)),
- decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_TYPE_NONE));
- }
- codeOutBuf = &statsg->oBuf;
-
- if (ival) {
- // set ival's lineno to where the symbol was defined
- setAstLineno (ival, lineno=sym->lineDef);
- // check if this is not a constant expression
- if (!constExprTree(ival)) {
- werror (E_CONST_EXPECTED, "found expression");
- // but try to do it anyway
+ if (ival)
+ {
+ // set ival's lineno to where the symbol was defined
+ setAstFileLine (ival, filename = sym->fileDef, lineno = sym->lineDef);
+ // check if this is not a constant expression
+ if (!constExprTree (ival))
+ {
+ werror (E_CONST_EXPECTED, "found expression");
+ // but try to do it anyway
+ }
+ allocInfo = 0;
+ if (!astErrors (ival))
+ eBBlockFromiCode (iCodeFromAst (ival));
+ allocInfo = 1;
+ }
}
- allocInfo = 0;
- if (!astErrors(ival))
- eBBlockFromiCode (iCodeFromAst (ival));
- allocInfo = 1;
- }
- }
- }
+ }
/* if it has an absolute address then generate
an equate for this no need to allocate space */
if (SPEC_ABSA (sym->etype) && !sym->ival)
{
- char *equ="=";
+ char *equ = "=";
if (options.debug) {
dbuf_printf (&map->oBuf, " == 0x%04x\n", SPEC_ADDR (sym->etype));
}
- if (TARGET_IS_XA51) {
- if (map==sfr) {
- equ="sfr";
- } else if (map==bit || map==sfrbit) {
- equ="bit";
+ if (TARGET_IS_XA51)
+ {
+ if (map == sfr)
+ {
+ equ = "sfr";
+ }
+ else if (map == bit || map == sfrbit)
+ {
+ equ="bit";
+ }
}
- }
- dbuf_printf (&map->oBuf, "%s\t%s\t0x%04x\n",
- sym->rname, equ,
- SPEC_ADDR (sym->etype));
+ dbuf_printf (&map->oBuf, "%s\t%s\t0x%04x\n", sym->rname, equ, SPEC_ADDR (sym->etype));
}
else
{
int size = getSize (sym->type) + sym->flexArrayLength;
- if (size==0) {
- werrorfl (sym->fileDef, sym->lineDef, E_UNKNOWN_SIZE, sym->name);
- }
+ if (size == 0)
+ {
+ werrorfl (sym->fileDef, sym->lineDef, E_UNKNOWN_SIZE, sym->name);
+ }
/* allocate space */
- if (options.debug) {
- dbuf_printf (&map->oBuf, "==.\n");
- }
+ if (options.debug)
+ {
+ dbuf_printf (&map->oBuf, "==.\n");
+ }
if (SPEC_ABSA (sym->etype))
{
dbuf_tprintf (&map->oBuf, "\t!org\n", SPEC_ADDR (sym->etype));
if (IS_STATIC (sym->etype) || sym->level)
dbuf_tprintf (&map->oBuf, "!slabeldef\n", sym->rname);
else
- dbuf_tprintf (&map->oBuf, "!labeldef\n", sym->rname);
+ dbuf_tprintf (&map->oBuf, "!labeldef\n", sym->rname);
dbuf_tprintf (&map->oBuf, "\t!ds\n", (unsigned int) size & 0xffff);
}
sym->ival = NULL;
}
expr = list2expr (ilist);
-
+
if (!expr)
goto wrong;
-
+
/* try it the old way first */
if ((val = constExprValue (expr, FALSE)))
return val;
-
+
/* ( ptr + constant ) */
if (IS_AST_OP (expr) &&
(expr->opval.op == '+' || expr->opval.op == '-') &&
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=='&') {
DCL_TYPE (val->type) = CPOINTER;
DCL_PTR_CONST (val->type) = port->mem.code_ro;
}
+ else if (SPEC_SCLS (expr->left->etype) == S_PDATA)
+ DCL_TYPE (val->type) = PPOINTER;
else if (SPEC_SCLS (expr->left->etype) == S_XDATA)
DCL_TYPE (val->type) = FPOINTER;
else if (SPEC_SCLS (expr->left->etype) == S_XSTACK)
DCL_TYPE (val->type) = CPOINTER;
DCL_PTR_CONST (val->type) = port->mem.code_ro;
}
+ else if (SPEC_SCLS (expr->right->etype) == S_PDATA)
+ DCL_TYPE (val->type) = PPOINTER;
else if (SPEC_SCLS (expr->right->etype) == S_XDATA)
DCL_TYPE (val->type) = FPOINTER;
else if (SPEC_SCLS (expr->right->etype) == S_XSTACK)
/*-----------------------------------------------------------------*/
/* printChar - formats and prints a characater string with DB */
/*-----------------------------------------------------------------*/
-void
+void
printChar (struct dbuf_s * oBuf, char *s, int plen)
{
int i;
/*-----------------------------------------------------------------*/
/* return the generic pointer high byte for a given pointer type. */
/*-----------------------------------------------------------------*/
-int
+int
pointerTypeToGPByte (const int p_type, const char *iname, const char *oname)
{
switch (p_type)
case POINTER:
return GPTYPE_NEAR;
case GPOINTER:
- werror (E_CANNOT_USE_GENERIC_POINTER,
- iname ? iname : "<null>",
+ werror (E_CANNOT_USE_GENERIC_POINTER,
+ iname ? iname : "<null>",
oname ? oname : "<null>");
exit (1);
case FPOINTER:
/*-----------------------------------------------------------------*/
/* printPointerType - generates ival for pointer type */
/*-----------------------------------------------------------------*/
-void
+void
_printPointerType (struct dbuf_s * oBuf, const char *name)
{
if (options.model == MODEL_FLAT24)
/*-----------------------------------------------------------------*/
/* printPointerType - generates ival for pointer type */
/*-----------------------------------------------------------------*/
-void
+void
printPointerType (struct dbuf_s * oBuf, const char *name)
{
_printPointerType (oBuf, name);
/*-----------------------------------------------------------------*/
/* printGPointerType - generates ival for generic pointer type */
/*-----------------------------------------------------------------*/
-void
+void
printGPointerType (struct dbuf_s * oBuf, const char *iname, const char *oname,
const unsigned int type)
{
/*-----------------------------------------------------------------*/
/* printIvalType - generates ival for int/char */
/*-----------------------------------------------------------------*/
-void
+void
printIvalType (symbol *sym, sym_link * type, initList * ilist, struct dbuf_s * oBuf)
{
value *val;
if (!(val = list2val (ilist))) {
// assuming a warning has been thrown
- val=constVal("0");
+ val = constCharVal (0);
}
+ /* check if the literal value is within bounds */
+ if (checkConstantRange (type, val->etype, '=', FALSE) == CCR_OVL &&
+ !options.lessPedantic)
+ {
+ werror (W_LIT_OVERFLOW);
+ }
+
if (val->type != type) {
val = valCastLiteral(type, floatFromVal(val));
}
-
+
switch (getSize (type)) {
case 1:
if (!val)
/*-----------------------------------------------------------------*/
/* printIvalBitFields - generate initializer for bitfields */
/*-----------------------------------------------------------------*/
-void printIvalBitFields(symbol **sym, initList **ilist, struct dbuf_s * oBuf)
+static void
+printIvalBitFields (symbol **sym, initList **ilist, struct dbuf_s * oBuf)
{
- value *val ;
symbol *lsym = *sym;
- initList *lilist = *ilist ;
+ initList *lilist = *ilist;
unsigned long ival = 0;
- int size =0;
-
-
- do {
- unsigned long i;
- val = list2val(lilist);
- if (size) {
- if (SPEC_BLEN(lsym->etype) > 8) {
- size += ((SPEC_BLEN (lsym->etype) / 8) +
- (SPEC_BLEN (lsym->etype) % 8 ? 1 : 0));
- }
- } else {
- size = ((SPEC_BLEN (lsym->etype) / 8) +
- (SPEC_BLEN (lsym->etype) % 8 ? 1 : 0));
- }
- i = (unsigned long)floatFromVal(val);
- i <<= SPEC_BSTR (lsym->etype);
- ival |= i;
- if (! ( lsym->next &&
- (IS_BITFIELD(lsym->next->type)) &&
- (SPEC_BSTR(lsym->next->etype)))) break;
- lsym = lsym->next;
- lilist = lilist->next;
- } while (1);
- switch (size) {
- case 1:
- dbuf_tprintf (oBuf, "\t!db !constbyte\n",ival);
- break;
+ int size = 0;
- case 2:
- dbuf_tprintf (oBuf, "\t!dw !constword\n",ival);
- break;
- case 4: /* EEP: why is this db and not dw? */
- dbuf_tprintf (oBuf, "\t!db !constword,!constword\n",
- (ival >> 8) & 0xffff, (ival & 0xffff));
- break;
- }
+ while (lsym)
+ {
+
+ if (0 == SPEC_BLEN (lsym->etype))
+ {
+ /* bit-field structure member with a width of 0 */
+ lsym = lsym->next;
+ break;
+ }
+ else if (!SPEC_BUNNAMED (lsym->etype))
+ {
+ /* not an unnamed bit-field structure member */
+ value *val = list2val (lilist);
+ int bit_length = SPEC_BLEN (lsym->etype);
+
+ if (size)
+ {
+ if (bit_length > 8)
+ size += (bit_length + 7) / 8;
+ }
+ else
+ size = (bit_length + 7) / 8;
+
+ /* check if the literal value is within bounds */
+ if (val &&
+ checkConstantRange (lsym->etype, val->etype, '=', FALSE) == CCR_OVL &&
+ !options.lessPedantic)
+ {
+ werror (W_LIT_OVERFLOW);
+ }
+
+ ival |= (ulFromVal (val) & ((1ul << bit_length) - 1ul)) << SPEC_BSTR (lsym->etype);
+ lilist = lilist ? lilist->next : NULL;
+ }
+ lsym = lsym->next;
+ }
+
+ switch (size)
+ {
+ case 1:
+ dbuf_tprintf (oBuf, "\t!db !constbyte\n", ival);
+ break;
+
+ case 2:
+ dbuf_tprintf (oBuf, "\t!dw !constword\n", ival);
+ break;
+
+ case 4:
+ dbuf_tprintf (oBuf, "\t!dw !constword,!constword\n",
+ (ival >> 16) & 0xffff, (ival & 0xffff));
+ break;
+ }
*sym = lsym;
*ilist = lilist;
}
/*-----------------------------------------------------------------*/
/* printIvalStruct - generates initial value for structures */
/*-----------------------------------------------------------------*/
-void
+static void
printIvalStruct (symbol * sym, sym_link * type,
initList * ilist, struct dbuf_s * oBuf)
{
sflds = SPEC_STRUCT (type)->fields;
- if (ilist) {
- if (ilist->type != INIT_DEEP) {
- werrorfl (sym->fileDef, sym->lineDef, E_INIT_STRUCT, sym->name);
- return;
- }
+ if (ilist)
+ {
+ if (ilist->type != INIT_DEEP)
+ {
+ werrorfl (sym->fileDef, sym->lineDef, E_INIT_STRUCT, sym->name);
+ return;
+ }
- iloop = ilist->init.deep;
- }
+ iloop = ilist->init.deep;
+ }
- if (SPEC_STRUCT (type)->type == UNION) {
- printIval (sym, sflds->type, iloop, oBuf);
- iloop = iloop ? iloop->next : NULL;
- } else {
- for (; sflds; sflds = sflds->next, iloop = (iloop ? iloop->next : NULL)) {
- if (IS_BITFIELD(sflds->type)) {
- printIvalBitFields(&sflds, &iloop, oBuf);
- } else {
- printIval (sym, sflds->type, iloop, oBuf);
- }
+ if (SPEC_STRUCT (type)->type == UNION)
+ {
+ printIval (sym, sflds->type, iloop, oBuf, 1);
+ iloop = iloop ? iloop->next : NULL;
}
- }
- if (iloop) {
+ else
+ {
+ while (sflds)
+ {
+ if (IS_BITFIELD (sflds->type))
+ printIvalBitFields(&sflds, &iloop, oBuf);
+ else
+ {
+ printIval (sym, sflds->type, iloop, oBuf, 1);
+ sflds = sflds->next;
+ iloop = iloop ? iloop->next : NULL;
+ }
+ }
+ }
+
+ if (iloop)
werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "struct", sym->name);
- }
- return;
}
/*-----------------------------------------------------------------*/
/* printIvalChar - generates initital value for character array */
/*-----------------------------------------------------------------*/
-int
-printIvalChar (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s * oBuf, char *s)
+int
+printIvalChar (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s * oBuf, char *s, bool check)
{
value *val;
unsigned int size = DCL_ELEM (type);
DCL_ELEM (type) = size;
}
+ if (check && DCL_ELEM (val->type) > size)
+ werror (W_EXCESS_INITIALIZERS, "array of chars", sym->name, sym->lineDef);
+
printChar (oBuf, SPEC_CVAL (val->etype).v_char, size);
return 1;
/*-----------------------------------------------------------------*/
void
printIvalArray (symbol * sym, sym_link * type, initList * ilist,
- struct dbuf_s * oBuf)
+ struct dbuf_s * oBuf, bool check)
{
value *val;
initList *iloop;
}
if (printIvalChar (sym, type,
(ilist->type == INIT_DEEP ? ilist->init.deep : ilist),
- oBuf, SPEC_CVAL (sym->etype).v_char))
+ oBuf, SPEC_CVAL (sym->etype).v_char, check))
return;
}
/* not the special case */
werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "array", sym->name);
break;
}
- printIval (sym, type->next, iloop, oBuf);
+ printIval (sym, type->next, iloop, oBuf, TRUE);
}
}
-
+
if (DCL_ELEM(type)) {
// pad with zeros if needed
if (size<DCL_ELEM(type)) {
/*-----------------------------------------------------------------*/
/* printIvalFuncPtr - generate initial value for function pointers */
/*-----------------------------------------------------------------*/
-void
+void
printIvalFuncPtr (sym_link * type, initList * ilist, struct dbuf_s * oBuf)
{
value *val;
if (!val) {
// an error has been thrown already
- val=constVal("0");
+ val = constCharVal (0);
}
if (IS_LITERAL(val->etype)) {
/*-----------------------------------------------------------------*/
/* printIvalCharPtr - generates initial values for character pointers */
/*-----------------------------------------------------------------*/
-int
+int
printIvalCharPtr (symbol * sym, sym_link * type, value * val, struct dbuf_s * oBuf)
{
int size = 0;
}
if (port->little_endian) {
dbuf_printf (oBuf, "\t.byte %s,%s,%s\n",
- aopLiteral (val, 0),
+ aopLiteral (val, 0),
aopLiteral (val, 1),
aopLiteral (val, 2));
} else {
dbuf_printf (oBuf, "\t.byte %s,%s,%s\n",
- aopLiteral (val, 2),
+ aopLiteral (val, 2),
aopLiteral (val, 1),
aopLiteral (val, 0));
}
}
if (port->little_endian) {
dbuf_printf (oBuf, "\t.byte %s,%s,%s,%s\n",
- aopLiteral (val, 0),
- aopLiteral (val, 1),
+ aopLiteral (val, 0),
+ aopLiteral (val, 1),
aopLiteral (val, 2),
aopLiteral (val, 3));
} else {
dbuf_printf (oBuf, "\t.byte %s,%s,%s,%s\n",
- aopLiteral (val, 3),
- aopLiteral (val, 2),
+ aopLiteral (val, 3),
+ aopLiteral (val, 2),
aopLiteral (val, 1),
aopLiteral (val, 0));
}
}
}
- if (val->sym && val->sym->isstrlit && !isinSet(statsg->syms, val->sym)) {
+ if (!noInit && val->sym && val->sym->isstrlit && !isinSet(statsg->syms, val->sym)) {
addSet (&statsg->syms, val->sym);
}
/*-----------------------------------------------------------------*/
/* printIvalPtr - generates initial value for pointers */
/*-----------------------------------------------------------------*/
-void
+void
printIvalPtr (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s * oBuf)
{
value *val;
switch (getSize (type))
{
case 1:
- dbuf_tprintf (oBuf, "\t!db !constbyte\n", (unsigned int) floatFromVal (val) & 0xff);
+ dbuf_tprintf (oBuf, "\t!db !constbyte\n", (unsigned int) ulFromVal (val) & 0xff);
break;
case 2:
if (port->use_dw_for_init)
/*-----------------------------------------------------------------*/
/* printIval - generates code for initial value */
/*-----------------------------------------------------------------*/
-void
-printIval (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s * oBuf)
+void
+printIval (symbol * sym, sym_link * type, initList * ilist, struct dbuf_s * oBuf, bool check)
{
sym_link *itype;
-
+
/* if structure then */
if (IS_STRUCT (type))
{
/* if this is an array */
if (IS_ARRAY (type))
{
- printIvalArray (sym, type, ilist, oBuf);
+ printIvalArray (sym, type, ilist, oBuf, check);
return;
}
if (ilist->type!=INIT_NODE) {
// or a 1-element list
if (ilist->init.deep->next) {
- werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "scalar",
+ werrorfl (sym->fileDef, sym->lineDef, W_EXCESS_INITIALIZERS, "scalar",
sym->name);
} else {
ilist=ilist->init.deep;
/*-----------------------------------------------------------------*/
/* emitStaticSeg - emitcode for the static segment */
/*-----------------------------------------------------------------*/
-void
+void
emitStaticSeg (memmap * map, struct dbuf_s * oBuf)
{
symbol *sym;
}
/* print extra debug info if required */
- if (options.debug) {
-
- if (!sym->level)
- { /* global */
- if (IS_STATIC (sym->etype))
- dbuf_printf (oBuf, "F%s$", moduleName); /* scope is file */
- else
- dbuf_printf (oBuf, "G$"); /* scope is global */
- }
- else
- /* symbol is local */
- dbuf_printf (oBuf, "L%s$",
- (sym->localof ? sym->localof->name : "-null-"));
- dbuf_printf (oBuf, "%s$%d$%d", sym->name, sym->level, sym->block);
- }
-
+ if (options.debug)
+ {
+ if (!sym->level)
+ { /* global */
+ if (IS_STATIC (sym->etype))
+ dbuf_printf (oBuf, "F%s$", moduleName); /* scope is file */
+ else
+ dbuf_printf (oBuf, "G$"); /* scope is global */
+ }
+ else
+ {
+ /* symbol is local */
+ dbuf_printf (oBuf, "L%s$",
+ (sym->localof ? sym->localof->name : "-null-"));
+ }
+ dbuf_printf (oBuf, "%s$%d$%d", sym->name, sym->level, sym->block);
+ }
+
/* if it has an absolute address and no initializer */
if (SPEC_ABSA (sym->etype) && !sym->ival)
{
if (options.debug)
dbuf_printf (oBuf, " == 0x%04x\n", SPEC_ADDR (sym->etype));
-
+
dbuf_printf (oBuf, "%s\t=\t0x%04x\n",
sym->rname,
SPEC_ADDR (sym->etype));
{
if (options.debug)
dbuf_printf (oBuf, " == .\n");
-
+
/* if it has an initial value */
if (sym->ival)
{
dbuf_tprintf (oBuf, "\t!org\n", SPEC_ADDR (sym->etype));
}
dbuf_printf (oBuf, "%s:\n", sym->rname);
- noAlloc++;
+ ++noAlloc;
resolveIvalSym (sym->ival, sym->type);
- printIval (sym, sym->type, sym->ival, oBuf);
- noAlloc--;
- /* if sym is a simple string and sym->ival is a string,
+ printIval (sym, sym->type, sym->ival, oBuf, map != xinit);
+ --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)) &&
else {
/* allocate space */
int size = getSize (sym->type);
-
+
if (size==0) {
werrorfl (sym->fileDef, sym->lineDef, E_UNKNOWN_SIZE,sym->name);
}
/*-----------------------------------------------------------------*/
/* emitMaps - emits the code for the data portion the code */
/*-----------------------------------------------------------------*/
-void
+void
emitMaps (void)
{
int publicsfr = TARGET_IS_MCS51; /* Ideally, this should be true for all */
/* ports but let's be conservative - EEP */
-
+
inInitMode++;
/* no special considerations for the following
data, idata & bit & xdata */
/* flushStatics - flush all currently defined statics out to file */
/* and delete. Temporary function */
/*-----------------------------------------------------------------*/
-void
+void
flushStatics (void)
{
emitStaticSeg (statsg, codeOutBuf);
/*-----------------------------------------------------------------*/
/* createInterruptVect - creates the interrupt vector */
/*-----------------------------------------------------------------*/
-void
+void
createInterruptVect (struct dbuf_s *vBuf)
{
mainf = newSymbol ("main", 0);
/*-----------------------------------------------------------------*/
/* initialComments - puts in some initial comments */
/*-----------------------------------------------------------------*/
-void
+void
initialComments (FILE * afile)
{
time_t t;
time (&t);
fprintf (afile, "%s", iComments1);
fprintf (afile, "; Version " SDCC_VERSION_STR " #%s (%s) (%s)\n",
- getBuildNumber(), __DATE__, getBuildEnvironment());
+ getBuildNumber(), getBuildDate(), getBuildEnvironment());
fprintf (afile, "; This file was generated %s", asctime (localtime (&t)));
fprintf (afile, "%s", iComments2);
}
/*-----------------------------------------------------------------*/
/* printPublics - generates .global for publics */
/*-----------------------------------------------------------------*/
-void
+void
printPublics (FILE * afile)
{
symbol *sym;
/*-----------------------------------------------------------------*/
/* printExterns - generates .global for externs */
/*-----------------------------------------------------------------*/
-void
+void
printExterns (FILE * afile)
{
symbol *sym;
/*-----------------------------------------------------------------*/
/* emitOverlay - will emit code for the overlay stuff */
/*-----------------------------------------------------------------*/
-static void
+static void
emitOverlay (struct dbuf_s * aBuf)
{
set *ovrset;
sym->rname,
SPEC_ADDR (sym->etype));
}
- else {
+ else
+ {
int size = getSize(sym->type);
if (size==0) {
werrorfl (sym->fileDef, sym->lineDef, E_UNKNOWN_SIZE);
- }
+ }
if (options.debug)
dbuf_printf (aBuf, "==.\n");
-
+
/* allocate space */
dbuf_tprintf (aBuf, "!labeldef\n", sym->rname);
dbuf_tprintf (aBuf, "\t!ds\n", (unsigned int) getSize (sym->type) & 0xffff);
}
-
+
}
}
}
-
-/*-----------------------------------------------------------------*/
-/* spacesToUnderscores - replace spaces with underscores */
-/*-----------------------------------------------------------------*/
-static char *
-spacesToUnderscores (char *dest, const char *src, size_t len)
-{
- unsigned 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((unsigned char)*src) ? '_' : *src;
- }
- *p = '\0';
-
- return dest;
-}
-
-
/*-----------------------------------------------------------------*/
/* glue - the final glue that hold the whole thing together */
/*-----------------------------------------------------------------*/
-void
+void
glue (void)
{
struct dbuf_s vBuf;
struct dbuf_s ovrBuf;
FILE *asmFile;
- char moduleBuf[PATH_MAX];
int mcs51_like;
- dbuf_init(&vBuf, 4096);
- dbuf_init(&ovrBuf, 4096);
+ dbuf_init (&vBuf, 4096);
+ dbuf_init (&ovrBuf, 4096);
- if(port->general.glue_up_main &&
- (TARGET_IS_MCS51 || TARGET_IS_DS390 || TARGET_IS_XA51 || TARGET_IS_DS400))
- {
- mcs51_like=1; /*So it has bits, sfr, sbits, data, idata, etc...*/
- }
- else
- {
- mcs51_like=0;
- }
+ mcs51_like = (port->general.glue_up_main &&
+ (TARGET_IS_MCS51 || TARGET_IS_DS390 || TARGET_IS_XA51 || TARGET_IS_DS400));
/* print the global struct definitions */
if (options.debug)
/* do the overlay segments */
emitOverlay (&ovrBuf);
- outputDebugSymbols();
+ outputDebugSymbols ();
/* now put it all together into the assembler file */
/* create the assembler file name */
if (!(asmFile = fopen (scratchFileName, "w")))
{
werror (E_FILE_OPEN_ERR, scratchFileName);
- exit (1);
+ exit (EXIT_FAILURE);
}
/* initial comments */
initialComments (asmFile);
/* print module name */
- tfprintf (asmFile, "\t!module\n",
- spacesToUnderscores (moduleBuf, moduleName, sizeof moduleBuf));
- if(mcs51_like)
+ tfprintf (asmFile, "\t!module\n", moduleName);
+ if (mcs51_like)
{
fprintf (asmFile, "\t.optsdcc -m%s", port->target);
switch(options.model)
- {
+ {
case MODEL_SMALL: fprintf (asmFile, " --model-small"); break;
case MODEL_COMPACT: fprintf (asmFile, " --model-compact"); break;
case MODEL_MEDIUM: fprintf (asmFile, " --model-medium"); break;
case MODEL_FLAT24: fprintf (asmFile, " --model-flat24"); break;
case MODEL_PAGE0: fprintf (asmFile, " --model-page0"); break;
default: break;
- }
+ }
/*if(options.stackAuto) fprintf (asmFile, " --stack-auto");*/
if(options.useXstack) fprintf (asmFile, " --xstack");
/*if(options.intlong_rent) fprintf (asmFile, " --int-long-rent");*/
if(options.parms_in_bank1) fprintf (asmFile, " --parms-in-bank1");
fprintf (asmFile, "\n");
}
- else if(TARGET_Z80_LIKE || TARGET_IS_HC08)
+ else if (TARGET_Z80_LIKE || TARGET_IS_HC08)
{
fprintf (asmFile, "\t.optsdcc -m%s\n", port->target);
}
if (port->assembler.externGlobal)
printExterns (asmFile);
- if(( mcs51_like )
+ if (( mcs51_like )
||( TARGET_IS_Z80 )) /*.p.t.20030924 need to output SFR table for Z80 as well */
{
/* copy the sfr segment */
fprintf (asmFile, "%s", iComments2);
dbuf_write_and_destroy (&sfr->oBuf, asmFile);
}
-
- if(mcs51_like)
+
+ if (mcs51_like)
{
/* copy the sbit segment */
fprintf (asmFile, "%s", iComments2);
dbuf_write_and_destroy (&sfrbit->oBuf, asmFile);
/*JCF: Create the areas for the register banks*/
- if(RegBankUsed[0]||RegBankUsed[1]||RegBankUsed[2]||RegBankUsed[3])
+ 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])
+ 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)
+ 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])
+ if (RegBankUsed[2])
fprintf (asmFile, "\t.area REG_BANK_2\t(REL,OVR,DATA)\n\t.ds 8\n");
- if(RegBankUsed[3])
+ if (RegBankUsed[3])
fprintf (asmFile, "\t.area REG_BANK_3\t(REL,OVR,DATA)\n\t.ds 8\n");
}
- if(BitBankUsed)
+ if (BitBankUsed)
{
fprintf (asmFile, "%s", iComments2);
fprintf (asmFile, "; overlayable bit register bank\n");
}
/* create the stack segment MOF */
- if (mainf && IFFUNC_HASBODY(mainf->type))
+ if (mainf && IFFUNC_HASBODY (mainf->type))
{
fprintf (asmFile, "%s", iComments2);
fprintf (asmFile, "; Stack segment in internal ram \n");
}
/* create the idata segment */
- if ( (idata) && (mcs51_like) )
+ if ((idata) && (mcs51_like))
{
fprintf (asmFile, "%s", iComments2);
fprintf (asmFile, "; indirectly addressable internal ram data\n");
}
/* create the absolute idata/data segment */
- if ( (i_abs) && (mcs51_like) )
+ if ((i_abs) && (mcs51_like))
{
fprintf (asmFile, "%s", iComments2);
fprintf (asmFile, "; absolute internal ram data\n");
}
/* if external stack then reserve space for it */
- if (mainf && IFFUNC_HASBODY(mainf->type) && options.useXstack)
+ if (mainf && IFFUNC_HASBODY (mainf->type) && options.useXstack)
{
fprintf (asmFile, "%s", iComments2);
fprintf (asmFile, "; external stack \n");
/* If the port wants to generate any extra areas, let it do so. */
if (port->extraAreas.genExtraAreaDeclaration)
{
- port->extraAreas.genExtraAreaDeclaration(asmFile,
+ port->extraAreas.genExtraAreaDeclaration(asmFile,
mainf && IFFUNC_HASBODY(mainf->type));
}
-
+
/* copy the interrupt vector table */
- if (mainf && IFFUNC_HASBODY(mainf->type))
+ if (mainf && IFFUNC_HASBODY (mainf->type))
{
fprintf (asmFile, "%s", iComments2);
fprintf (asmFile, "; interrupt vector \n");
tfprintf (asmFile, "\t!area\n", port->mem.post_static_name);
tfprintf (asmFile, "\t!area\n", port->mem.static_name);
- if (mainf && IFFUNC_HASBODY(mainf->type))
+ if (mainf && IFFUNC_HASBODY (mainf->type))
{
if (port->genInitStartup)
{
- port->genInitStartup(asmFile);
+ port->genInitStartup (asmFile);
}
else
{
fprintf (asmFile, "\tmov\tsp,#__start__stack - 1\n"); /* MOF */
}
- fprintf (asmFile, "\tlcall\t__sdcc_external_startup\n");
+ fprintf (asmFile, "\t%ccall\t__sdcc_external_startup\n", options.acall_ajmp?'a':'l');
fprintf (asmFile, "\tmov\ta,dpl\n");
fprintf (asmFile, "\tjz\t__sdcc_init_data\n");
- fprintf (asmFile, "\tljmp\t__sdcc_program_startup\n");
+ fprintf (asmFile, "\t%cjmp\t__sdcc_program_startup\n", options.acall_ajmp?'a':'l');
fprintf (asmFile, "__sdcc_init_data:\n");
// if the port can copy the XINIT segment to XISEG
if (port->genXINIT)
{
- port->genXINIT(asmFile);
+ port->genXINIT (asmFile);
}
}
}
dbuf_write_and_destroy (&statsg->oBuf, asmFile);
- if (port->general.glue_up_main && mainf && IFFUNC_HASBODY(mainf->type))
+ if (port->general.glue_up_main && mainf && IFFUNC_HASBODY (mainf->type))
{
/* This code is generated in the post-static area.
* This area is guaranteed to follow the static area
* by the ugly shucking and jiving about 20 lines ago.
*/
tfprintf (asmFile, "\t!area\n", port->mem.post_static_name);
- fprintf (asmFile, "\tljmp\t__sdcc_program_startup\n");
+ fprintf (asmFile, "\t%cjmp\t__sdcc_program_startup\n", options.acall_ajmp?'a':'l');
}
fprintf (asmFile,
tfprintf (asmFile, "\t!areahome\n", HOME_NAME);
dbuf_write_and_destroy (&home->oBuf, asmFile);
- if (mainf && IFFUNC_HASBODY(mainf->type))
+ if (mainf && IFFUNC_HASBODY (mainf->type))
{
/* entry point @ start of HOME */
fprintf (asmFile, "__sdcc_program_startup:\n");
/* put in jump or call to main */
if (options.mainreturn)
{
- fprintf (asmFile, "\tljmp\t_main\n"); /* needed? */
+ fprintf (asmFile, "\t%cjmp\t_main\n", options.acall_ajmp?'a':'l'); /* needed? */
fprintf (asmFile, ";\treturn from main will return to caller\n");
}
else
{
- fprintf (asmFile, "\tlcall\t_main\n");
+ fprintf (asmFile, "\t%ccall\t_main\n", options.acall_ajmp?'a':'l');
fprintf (asmFile, ";\treturn from main will lock up\n");
fprintf (asmFile, "\tsjmp .\n");
}
if (port->genAssemblerEnd)
{
- port->genAssemblerEnd(asmFile);
+ port->genAssemblerEnd (asmFile);
}
fclose (asmFile);
}
projects / fw / sdcc / blobdiff