* link/z80/lkmain.c (afile): allow periods in directory names

[fw/sdcc] / link / z80 / lkmain.c

diff --git a/link/z80/lkmain.c b/link/z80/lkmain.c
index 681c790200afed5bad43d4e19eaa7a7de6e2cab3..624d4a793a0ff9ca4cc355eb85748e3b37c5ceb6 100644 (file)
--- a/link/z80/lkmain.c
+++ b/link/z80/lkmain.c
@@ -16,6 +16,7 @@
 #include <string.h>
 //#include <alloc.h>
 #include "aslink.h"
+#include <stdlib.h>
 
 #ifndef SDK_VERSION_STRING
 #define SDK_VERSION_STRING     "3.0.0"
@@ -24,6 +25,29 @@
 #define TARGET_STRING          "gbz80"
 #endif
 
+#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
+
 /*)Module      lkmain.c
  *
  *     The module lkmain.c contains the functions which
@@ -164,6 +188,10 @@ char *argv[];
        register char *p;
        register int c, i;
 
+#ifdef WIN32T
+    Timer(0, "");
+#endif
+
 #ifdef GAMEBOY
        nb_rom_banks = 2;
        nb_ram_banks = 0;
@@ -243,7 +271,7 @@ char *argv[];
                        }
                }
        }
-       if (startp->f_type == NULL)
+       if (startp->f_type == F_INV)
                usage();
        if (startp->f_type == F_LNK && startp->f_idp == NULL)
                usage();
@@ -261,7 +289,7 @@ char *argv[];
                        break;
                if (pflag && sfp != stdin)
                        fprintf(stdout, "%s\n", ip);
-               if (*ip == NULL || parse())
+               if (*ip == '\0' || parse())
                        break;
        }
        if (sfp)
@@ -375,7 +403,13 @@ char *argv[];
                        reloc('E');
                }
        }
+#ifdef WIN32T
+    Timer(1, "Linker time");
+#endif
        lkexit(lkerr);
+
+        /* Never get here. */
+        return 0;
 }
 
 /*)Function    VOID    lkexit(i)
@@ -454,6 +488,29 @@ link()
        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;
@@ -483,7 +540,10 @@ link()
 
        case 'M':
                if (pass == 0)
+        {
+            strcpy(curr_module, &ip[1]);
                        module();
+        }
                break;
 
        case 'A':
@@ -771,6 +831,9 @@ VOID map()
 #endif /* MLH_MAP */
 
 #ifdef SDK
+/* PENDING */
+VOID lstareatosym(struct area *xp);
+
 VOID sym()
 {
        /*
@@ -848,6 +911,8 @@ parse()
        char fid[NINPUT];
 
        while ((c = getnb()) != 0) {
+               if (c == ';')
+                       return(0);
                if ( c == '-') {
                        while (ctype[c=get()] & LETTER) {
                                switch(c) {
@@ -886,8 +951,6 @@ parse()
                                                        while(get() != '"')
                                                                ;
                                        } else if(c == 'P' || c == 'p') {
-                                               unsigned int addr;
-                                               unsigned char value;
                                                patch *p = patches;
 
                                                patches = (patch *)malloc(sizeof(patch));
@@ -979,6 +1042,8 @@ parse()
                                        lkexit(1);
                                }
                        }
+                       if (c == ';')
+                               return(0);
                } else
                if (ctype[c] != ILL) {
                        if (linkp == NULL) {
@@ -1274,11 +1339,16 @@ afile(fn, ft, wf)
 char *fn;
 char *ft;
 {
+#if 0
        register char *p1, *p2, *p3;
        register int c;
+#else
+       int i;
+#endif 
        FILE *fp;
        char fb[FILSPC];
 
+#if 0  
        p1 = fn;
        p2 = fb;
        p3 = ft;
@@ -1303,6 +1373,32 @@ char *ft;
                        *p2++ = c;
        }
        *p2++ = 0;
+#else
+       /*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]=='.') && *ft && strcmp(ft, "lnk") )
+       {
+               strncpy(fb, fn, i);
+               fb[i]=0;
+       }
+       else
+       {
+               strcpy(fb, fn);
+       }
+
+       /*Add the extension*/
+       if (fb[i] != '.')
+       {
+               strcat(fb, ".");
+#ifdef SDK
+               strcat(fb, strlen(ft)?ft:"rel");
+#else
+               strcat(fb, strlen(ft)?ft:"REL");
+#endif
+       }
+#endif
+
 #ifdef SDK
        if ((fp = fopen(fb, wf?(binary?"wb":"w"):(binary?"rb":"r"))) == NULL) {
 #else /* SDK */