.incbin now uses the same directory sets as .include. Also some small cosmetic fixes.

[rmac] / direct.c

diff --git a/direct.c b/direct.c
index 89e4ee0149855e7c7b7031422058eee2d5a10559..dc9747ba9174fd05d3bf61d3a21955aa00ab5fc2 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -88,6 +88,7 @@ int (*dirtab[])() = {
        d_nojpad,                       // 55 .nojpad (deprecated)
        d_gpumain,                      // 56 .gpumain (deprecated)
        d_prgflags,                     // 57 .prgflags
+       d_opt,                          // 58 .opt
 };
 
 
@@ -349,6 +350,8 @@ int d_incbin(void)
        int bytes = 0;
        long pos, size, bytesRead;
        char msg[256];
+       char buf1[256];
+       int i;
 
        // Check to see if we're in BSS, and, if so, throw an error
        if (scattr & SBSS)
@@ -363,12 +366,30 @@ int d_incbin(void)
                return ERROR;
        }
 
-       if ((fd = open(string[tok[1]],  _OPEN_INC)) < 0)
+       // Attempt to open the include file in the current directory, then (if that
+       // failed) try list of include files passed in the enviroment string or by
+       // the "-d" option.
+       if ((fd = open(string[tok[1]], _OPEN_INC)) < 0)
        {
-               errors("cannot open include binary file (%s)", string[tok[1]]);
-               return ERROR;
+               for (i = 0; nthpath("RMACPATH", i, buf1) != 0; i++)
+               {
+                       fd = strlen(buf1);
+
+                       if (fd > 0 && buf1[fd - 1] != SLASHCHAR)        // Append path char if necessary
+                               strcat(buf1, SLASHSTRING);
+
+                       strcat(buf1, string[tok[1]]);
+
+                       if ((fd = open(buf1, _OPEN_INC)) >= 0)
+                               goto allright;
+               }
+
+               return errors("cannot open: \"%s\"", string[tok[1]]);
        }
 
+allright:
+
+
        size = lseek(fd, 0L, SEEK_END);
        pos = lseek(fd, 0L, SEEK_SET);
        chcheck(size);
@@ -814,8 +835,7 @@ int d_bss(void)
 //
 int d_ds(WORD siz)
 {
-if (debug)
-       printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc);
+       DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
        VALUE eval;
 
@@ -832,9 +852,14 @@ if (debug)
        if (abs_expr(&eval) != OK)
                return 0;
 
+       // Check to see if the value being passed in is negative (who the hell does
+       // that?--nobody does; it's the code gremlins, or rum, that does it)
+       if (eval < 0)
+               return error("negative sizes not allowed");
+
        // In non-TDB section (BSS, ABS and M6502) just advance the location
        // counter appropriately. In TDB sections, deposit (possibly large) chunks
-       //of zeroed memory....
+       // of zeroed memory....
        if (scattr & SBSS)
        {
                listvalue(eval);
@@ -997,7 +1022,8 @@ int d_dcb(WORD siz)
        VALUE evalc, eval;
        WORD eattr;
 
-printf("dcb: section is %s%s%s (scattr=$%X)\n", (cursect & TEXT ? "TEXT" : ""), (cursect & DATA ? " DATA" : ""), (cursect & BSS ? "BSS" : ""), scattr);
+       DEBUG { printf("dcb: section is %s%s%s (scattr=$%X)\n", (cursect & TEXT ? "TEXT" : ""), (cursect & DATA ? " DATA" : ""), (cursect & BSS ? "BSS" : ""), scattr); }
+
        if ((scattr & SBSS) != 0)
                return error("illegal initialization of section");
 
@@ -1584,3 +1610,30 @@ int d_gpumain(void)
        return error("What the hell? Do you think we adhere to the Goof standard?");
 }
 
+
+//
+// .opt - turn a specific (or all) optimisation on or off
+//
+int d_opt(void)
+{
+       while (*tok != EOL)
+       {
+               if (*tok == STRING)
+               {
+                       tok++;
+                       char * tmpstr = string[*tok++];
+
+                       if (ParseOptimization(tmpstr) != OK)
+                       {
+                               char temperr[256];
+                               sprintf(temperr, "unknown optimisation flag '%s'", tmpstr);
+                               return error(temperr);
+                       }
+               }
+               else
+                       return error(".opt directive needs every switch enclosed inside quotation marks");
+       }
+
+       return OK;
+}
+