#include <string.h>
#include "aslink.h"
+#ifdef WIN32T
+#include <time.h>
+
+void Timer(int action, char * message)
+{
+ static double start, end, total=0.0;
+ static const double secs_per_tick = 1.0 / CLOCKS_PER_SEC;
+
+ if(action==0) start=clock()*secs_per_tick;
+ else if(action==1)
+ {
+ end=clock() * secs_per_tick;
+ printf("%s \t%f seconds.\n", message, (end-start));
+ total+=end-start;
+ }
+ else
+ {
+ printf("Total time: \t%f seconds.\n", total);
+ total=0.0;
+ }
+}
+#endif
+
/* yuck - but including unistd.h causes problems on Cygwin by redefining
* Addr_T.
*/
{
char * rel[]={
"XH",
- "H 7 areas 0 global symbols",
+ "H B areas 0 global symbols",
"A _CODE size 0 flags 0", /*Each .rel has one, so...*/
"A REG_BANK_0 size 0 flags 4", /*Register banks are overlayable*/
"A REG_BANK_1 size 0 flags 4",
"A REG_BANK_3 size 0 flags 4",
"A BSEG size 0 flags 80", /*BSEG must be just before BITS*/
"A BSEG_BYTES size 0 flags 0", /*Size will be obtained from BSEG in lnkarea()*/
+ "A DSEG size 0 flags 0",
+ "A OSEG size 0 flags 4",
+ "A ISEG size 0 flags 0",
+ "A SSEG size 0 flags 4",
""
};
int j;
else if (!strcmp(ap->a_id, "REG_BANK_2")) { ap->a_addr=0x10; ap->a_type=1; }
else if (!strcmp(ap->a_id, "REG_BANK_3")) { ap->a_addr=0x18; ap->a_type=1; }
else if (!strcmp(ap->a_id, "BSEG_BYTES")) { ap->a_addr=0x20; ap->a_type=1; }
+ else if (!strcmp(ap->a_id, "SSEG"))
+ {
+ if(packflag_and_stacksize>1) ap->a_axp->a_size=packflag_and_stacksize;
+ }
}
}
register char *p;
register int c, i;
+#ifdef WIN32T
+ Timer(0, "");
+#endif
+
startp = (struct lfile *) new (sizeof (struct lfile));
pflag = 1;
/*
* Link all area addresses.
*/
- lnkarea();
+ if(!packflag_and_stacksize)
+ lnkarea();
+ else
+ lnkarea2();
/*
* Process global definitions.
*/
map();
if (sflag) /*JCF: memory usage summary output*/
- if(summary(areap))lkexit(1);
-
- if (iram_size)
+ {
+ if(!packflag_and_stacksize)
+ {
+ if(summary(areap)) lkexit(1);
+ }
+ else
+ {
+ if(summary2(areap)) lkexit(1);
+ }
+ }
+
+ if ((iram_size) && (!packflag_and_stacksize))
iramcheck();
/*
//JCF:
CreateAOMF51();
+#ifdef WIN32T
+ Timer(1, "Linker execution time");
+#endif
+
lkexit(lkerr);
return 0;
}
if ((c=endline()) == 0) { return; }
switch (c) {
+ case 'O': /*For some important sdcc options*/
+ if (pass == 0)
+ {
+ if(strlen(sdccopt)==0)
+ {
+ strcpy(sdccopt, &ip[1]);
+ strcpy(sdccopt_module, curr_module);
+ }
+ else
+ {
+ if(strcmp(sdccopt, &ip[1])!=0)
+ {
+ fprintf(stderr,
+ "?ASlink-Warning-Conflicting sdcc options:\n"
+ " \"%s\" in module \"%s\" and\n"
+ " \"%s\" in module \"%s\".\n",
+ sdccopt, sdccopt_module, &ip[1], curr_module);
+ lkerr++;
+ }
+ }
+ }
+ break;
+
case 'X':
radix = 16;
break;
sdp.s_area = NULL;
sdp.s_areax = NULL;
sdp.s_addr = 0;
- // jwk lastExtendedAddress = -1;
break;
case 'M':
if (pass == 0)
+ {
+ strcpy(curr_module, &ip[1]);
module();
+ }
break;
case 'A':
break;
case 'y': /*JCF: memory usage summary output*/
- case 'Y':
++sflag;
break;
+ case 'Y':
+ unget(getnb());
+ /*The stack segment default size is 16 bytes. Use -Yxx for xx bytes*/
+ packflag_and_stacksize=(ip && *ip)?expr(0):16;
+ break;
+
case 'j':
case 'J':
jflag = 1;
return(0);
case 'z':
- case 'Z':
+ case 'Z':
dflag = 1;
return(0);
default:
* the assembler on an open error.
*
* local variables:
- * int c character value
* char fb[] constructed file specification string
* FILE * fp filehandle for opened file
- * char * p1 pointer to filespec string fn
- * char * p2 pointer to filespec string fb
- * char * p3 pointer to filetype string ft
*
* global variables:
* int lkerr error flag
char *fn;
char *ft;
{
- register char *p1, *p2, *p3;
- register int c;
FILE *fp;
char fb[PATH_MAX];
char *omode = (wf ? (wf == 2 ? "a" : "w") : "r");
+ int i;
- p1 = fn;
- p2 = fb;
- p3 = ft;
- while ((c = *p1++) != 0 && c != FSEPX) {
- if (p2 < &fb[PATH_MAX-4])
- *p2++ = c;
- }
- *p2++ = FSEPX;
- if (*p3 == 0) {
- if (c == FSEPX) {
- p3 = p1;
- } else {
- p3 = "rel";
- }
+ /*Look backward the name path and get rid of the extension, if any*/
+ i=strlen(fn);
+ for(; (fn[i]!='.')&&(fn[i]!='\\')&&(fn[i]!='/')&&(i>=0); i--);
+ if( (fn[i]=='.') && strcmp(ft, "lnk") )
+ {
+ strncpy(fb, fn, i);
+ fb[i]=0;
}
- while ((c = *p3++) != 0) {
- if (p2 < &fb[PATH_MAX-1])
- *p2++ = c;
+ else
+ {
+ strcpy(fb, fn);
}
- *p2++ = 0;
- if ((fp = fopen(fb, omode)) == NULL) {
- if (strcmp(ft,"adb")) {
- fprintf(stderr, "%s: cannot %s.\n", fb, wf?"create":"open");
- lkerr++;
+
+ /*Add the extension*/
+ strcat(fb, ".");
+ strcat(fb, strlen(ft)?ft:"rel");
+
+ fp = fopen(fb, omode);
+ if (fp==NULL)
+ {
+ if (strcmp(ft,"adb"))/*Do not complaint for optional adb files*/
+ {
+ fprintf(stderr, "%s: cannot %s.\n", fb, wf?"create":"open");
+ lkerr++;
}
}
return (fp);
projects / fw / sdcc / blobdiff