ELF support for RMAC.

[rmac] / direct.c

diff --git a/direct.c b/direct.c
index 70f4469602278ad708811706181f5a37146a2c3f..b2e67998e863a7a216e16b8b8b4f2bd8dd39599d 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // DIRECT.C - Directive Handling
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // DIRECT.C - Directive Handling

-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends

 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //


@@ -77,8 +77,8 @@ int (*dirtab[])() = {
        d_title,                        // 44 title
        d_subttl,                       // 45 subttl
        eject,                          // 46 eject
        d_title,                        // 44 title
        d_subttl,                       // 45 subttl
        eject,                          // 46 eject

-       d_error,                        // 47 error 
-       d_warn,                         // 48 warn 
+       d_error,                        // 47 error
+       d_warn,                         // 48 warn

        d_noclear,                      // 49 .noclear
        d_equrundef,            // 50 .equrundef/.regundef
        d_ccundef,                      // 51 .ccundef
        d_noclear,                      // 49 .noclear
        d_equrundef,            // 50 .equrundef/.regundef
        d_ccundef,                      // 51 .ccundef


@@ -88,6 +88,7 @@ int (*dirtab[])() = {
        d_nojpad,                       // 55 .nojpad (deprecated)
        d_gpumain,                      // 56 .gpumain (deprecated)
        d_prgflags,                     // 57 .prgflags
        d_nojpad,                       // 55 .nojpad (deprecated)
        d_gpumain,                      // 56 .gpumain (deprecated)
        d_prgflags,                     // 57 .prgflags

+       d_opt,                          // 58 .opt

 };
 
 
 };
 
 


@@ -140,7 +141,7 @@ int d_org(void)
 {
        VALUE address;
 
 {
        VALUE address;
 

-       if (!rgpu && !rdsp) 
+       if (!rgpu && !rdsp)

                return error(".org permitted only in gpu/dsp section");
 
        orgaddr = 0;
                return error(".org permitted only in gpu/dsp section");
 
        orgaddr = 0;


@@ -183,7 +184,7 @@ int d_print(void)
                        sprintf(prntstr, "%s", string[tok[1]]);
                        printf("%s", prntstr);
 
                        sprintf(prntstr, "%s", string[tok[1]]);
                        printf("%s", prntstr);
 

-                       if (list_fd) 
+                       if (list_fd)

                                unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
                        tok += 2;
                                unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
                        tok += 2;


@@ -221,9 +222,9 @@ int d_print(void)
                        {
                                switch(outtype)
                                {
                        {
                                switch(outtype)
                                {

-                               case 0: strcpy(format, "%X"); break; 
-                               case 1: strcpy(format, "%d" ); break; 
-                               case 2: strcpy(format, "%u" ); break; 
+                               case 0: strcpy(format, "%X"); break;
+                               case 1: strcpy(format, "%d" ); break;
+                               case 2: strcpy(format, "%u" ); break;

                                }
 
                                if (wordlong)
                                }
 
                                if (wordlong)


@@ -233,7 +234,7 @@ int d_print(void)
 
                                printf("%s", prntstr);
 
 
                                printf("%s", prntstr);
 

-                               if (list_fd) 
+                               if (list_fd)

                                        unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
                                formatting = 0;
                                        unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
                                formatting = 0;


@@ -340,7 +341,7 @@ int d_noclear(void)
 }
 
 
 }
 
 

-// 
+//

 // Include binary file
 //
 int d_incbin(void)
 // Include binary file
 //
 int d_incbin(void)


@@ -349,6 +350,8 @@ int d_incbin(void)
        int bytes = 0;
        long pos, size, bytesRead;
        char msg[256];
        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)
 
        // 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;
        }
 
                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);
+
+                       // Append path char if necessary
+                       if (fd > 0 && buf1[fd - 1] != SLASHCHAR)
+                               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);
        size = lseek(fd, 0L, SEEK_END);
        pos = lseek(fd, 0L, SEEK_SET);
        chcheck(size);


@@ -399,7 +420,7 @@ int d_incbin(void)
 }
 
 
 }
 
 

-// 
+//

 // Set RISC register banks
 //
 int d_regbank0(void)
 // Set RISC register banks
 //
 int d_regbank0(void)


@@ -447,7 +468,7 @@ static inline void SkipBytes(unsigned bytesToSkip)
 int d_even(void)
 {
        unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
 int d_even(void)
 {
        unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;

-       
+

        if (skip)
        {
                if ((scattr & SBSS) == 0)
        if (skip)
        {
                if ((scattr & SBSS) == 0)


@@ -560,7 +581,7 @@ int d_unimpl(void)
 }
 
 
 }
 
 

-// 
+//

 // Return absolute (not TDB) and defined expression or return an error
 //
 int abs_expr(VALUE * a_eval)
 // Return absolute (not TDB) and defined expression or return an error
 //
 int abs_expr(VALUE * a_eval)


@@ -621,7 +642,7 @@ int d_include(void)
        char buf[128];
        char buf1[128];
 
        char buf[128];
        char buf1[128];
 

-       if (*tok == STRING)                     // Leave strings ALONE 
+       if (*tok == STRING)                     // Leave strings ALONE

                fn = string[*++tok];
        else if (*tok == SYMBOL)        // Try to append ".s" to symbols
        {
                fn = string[*++tok];
        else if (*tok == SYMBOL)        // Try to append ".s" to symbols
        {


@@ -629,7 +650,7 @@ int d_include(void)
                fext(buf, ".s", 0);
                fn = &buf[0];
        }
                fext(buf, ".s", 0);
                fn = &buf[0];
        }

-       else                                            // Punt if no STRING or SYMBOL 
+       else                                            // Punt if no STRING or SYMBOL

                return error("missing filename");
 
        // Make sure the user didn't try anything like:
                return error("missing filename");
 
        // Make sure the user didn't try anything like:


@@ -639,14 +660,15 @@ int d_include(void)
 
        // 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
 
        // 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.
+       // the "-i" option.

        if ((j = open(fn, 0)) < 0)
        {
                for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
                {
                        j = strlen(buf1);
 
        if ((j = open(fn, 0)) < 0)
        {
                for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
                {
                        j = strlen(buf1);
 

-                       if (j > 0 && buf1[j - 1] != SLASHCHAR)  // Append path char if necessary 
+                       // Append path char if necessary
+                       if (j > 0 && buf1[j - 1] != SLASHCHAR)

                                strcat(buf1, SLASHSTRING);
 
                        strcat(buf1, fn);
                                strcat(buf1, SLASHSTRING);
 
                        strcat(buf1, fn);


@@ -706,7 +728,7 @@ int globl1(char * p)
                sy->sattr = GLOBAL;
 //printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname);
        }
                sy->sattr = GLOBAL;
 //printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname);
        }

-       else 
+       else

                sy->sattr |= GLOBAL;
 
        return OK;
                sy->sattr |= GLOBAL;
 
        return OK;


@@ -825,7 +847,7 @@ int d_ds(WORD siz)
        if (as68_flag == 0 && (scattr & SBSS) == 0)
                return error(".ds permitted only in BSS");
 
        if (as68_flag == 0 && (scattr & SBSS) == 0)
                return error(".ds permitted only in BSS");
 

-       if (siz != SIZB && (sloc & 1))                            // Automatic .even 
+       if ((siz != SIZB) && (sloc & 1))        // Automatic .even

                auto_even();
 
        if (abs_expr(&eval) != OK)
                auto_even();
 
        if (abs_expr(&eval) != OK)


@@ -844,7 +866,7 @@ int d_ds(WORD siz)
                listvalue(eval);
                eval *= siz;
                sloc += eval;
                listvalue(eval);
                eval *= siz;
                sloc += eval;

-               just_bss = 1;                                         // No data deposited (8-bit CPU mode)
+               just_bss = 1;                                   // No data deposited (8-bit CPU mode)

        }
        else
        {
        }
        else
        {


@@ -857,17 +879,13 @@ int d_ds(WORD siz)
 
 
 //
 
 
 //

-// dc.b, dc.w / dc, dc.l
+// dc.b, dc.w / dc, dc.l, dc.i

 //
 int d_dc(WORD siz)
 {
        WORD eattr;
        VALUE eval;
 //
 int d_dc(WORD siz)
 {
        WORD eattr;
        VALUE eval;

-       WORD tdb;
-       WORD defined;
-       LONG i;
-       char * p;
-       int movei = 0; // movei flag for dc.i
+       uint8_t * p;

 
        if ((scattr & SBSS) != 0)
                return error("illegal initialization of section");
 
        if ((scattr & SBSS) != 0)
                return error("illegal initialization of section");


@@ -883,24 +901,26 @@ int d_dc(WORD siz)
                || (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF))))
                warn("depositing LONGs on a non-long address in local RAM");
 
                || (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF))))
                warn("depositing LONGs on a non-long address in local RAM");
 

-       for(;; ++tok)
+       for(;; tok++)

        {
                // dc.b 'string' [,] ...
                if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL))
                {
        {
                // dc.b 'string' [,] ...
                if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL))
                {

-                       i = strlen(string[tok[1]]);
+                       uint32_t i = strlen(string[tok[1]]);

 
 

-                       if ((challoc - ch_size) < i) 
+                       if ((challoc - ch_size) < i)

                                chcheck(i);
 
                                chcheck(i);
 

-                       for(p=string[tok[1]]; *p!=EOS; ++p)
+                       for(p=string[tok[1]]; *p!=EOS; p++)

                                D_byte(*p);
 
                        tok += 2;
                        goto comma;
                }
 
                                D_byte(*p);
 
                        tok += 2;
                        goto comma;
                }
 

-               if (*tok == 'I')
+               int movei = 0; // MOVEI flag for dc.i
+
+               if (*tok == DOTI)

                {
                        movei = 1;
                        tok++;
                {
                        movei = 1;
                        tok++;


@@ -908,11 +928,13 @@ int d_dc(WORD siz)
                }
 
                // dc.x <expression>
                }
 
                // dc.x <expression>

-               if (expr(exprbuf, &eval, &eattr, NULL) != OK)
+               SYM * esym = 0;
+
+               if (expr(exprbuf, &eval, &eattr, &esym) != OK)

                        return 0;
 
                        return 0;
 

-               tdb = (WORD)(eattr & TDB);
-               defined = (WORD)(eattr & DEFINED);
+               uint16_t tdb = eattr & TDB;
+               uint16_t defined = eattr & DEFINED;

 
                if ((challoc - ch_size) < 4)
                        chcheck(4);
 
                if ((challoc - ch_size) < 4)
                        chcheck(4);


@@ -927,15 +949,15 @@ int d_dc(WORD siz)
                        }
                        else
                        {
                        }
                        else
                        {

-                               if (tdb)
-                                       return error("non-absolute byte value");
-

                                if (eval + 0x100 >= 0x200)
                                {
                                        sprintf(buffer, "%s (value = $%X)", range_error, eval);
                                        return error(buffer);
                                }
 
                                if (eval + 0x100 >= 0x200)
                                {
                                        sprintf(buffer, "%s (value = $%X)", range_error, eval);
                                        return error(buffer);
                                }
 

+                               if (tdb)
+                                       return error("non-absolute byte value");
+

                                D_byte(eval);
                        }
 
                                D_byte(eval);
                        }
 


@@ -949,13 +971,13 @@ int d_dc(WORD siz)
                        }
                        else
                        {
                        }
                        else
                        {

-                               if (tdb)
-                                       rmark(cursect, sloc, tdb, MWORD, NULL);
-

                                if (eval + 0x10000 >= 0x20000)
                                        return error(range_error);
 
                                if (eval + 0x10000 >= 0x20000)
                                        return error(range_error);
 

-                               // Deposit 68000 or 6502 (byte-reversed) word 
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
+
+                               // Deposit 68000 or 6502 (byte-reversed) word

                                D_word(eval);
                        }
 
                                D_word(eval);
                        }
 


@@ -973,16 +995,16 @@ int d_dc(WORD siz)
                        else
                        {
                                if (tdb)
                        else
                        {
                                if (tdb)

-                                       rmark(cursect, sloc, tdb, MLONG, NULL);
+                                       MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);

 
 

-                               if (movei) 
-                                       eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
+                               if (movei)
+                                       eval = WORDSWAP32(eval);

 
                                D_long(eval);
                        }
                        break;
                }
 
                                D_long(eval);
                        }
                        break;
                }

-               
+

 comma:
                if (*tok != ',')
                        break;
 comma:
                if (*tok != ',')
                        break;


@@ -1025,9 +1047,9 @@ int d_dcb(WORD siz)
 
 //
 // Generalized initialization directive
 
 //
 // Generalized initialization directive

-// 
+//

 // .init[.siz] [#count,] expression [.size] , ...
 // .init[.siz] [#count,] expression [.size] , ...

-// 
+//

 // The size suffix on the ".init" directive becomes the default size of the
 // objects to deposit. If an item is preceeded with a sharp (immediate) sign
 // and an expression, it specifies a repeat count. The value to be deposited
 // The size suffix on the ".init" directive becomes the default size of the
 // objects to deposit. If an item is preceeded with a sharp (immediate) sign
 // and an expression, it specifies a repeat count. The value to be deposited


@@ -1071,9 +1093,9 @@ int d_init(WORD def_siz)
                case DOTB: siz = SIZB; break;
                case DOTW: siz = SIZB; break;
                case DOTL: siz = SIZL; break;
                case DOTB: siz = SIZB; break;
                case DOTW: siz = SIZB; break;
                case DOTL: siz = SIZL; break;

-               default: 
+               default:

                        siz = def_siz;
                        siz = def_siz;

-                       --tok;
+                       tok--;

                        break;
                }
 
                        break;
                }
 


@@ -1084,7 +1106,7 @@ int d_init(WORD def_siz)
                case EOL:
                        return 0;
                case ',':
                case EOL:
                        return 0;
                case ',':

-                       ++tok;
+                       tok++;

                        continue;
                default:
                        return error(comma_error);
                        continue;
                default:
                        return error(comma_error);


@@ -1139,7 +1161,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
                        else
                        {
                                if (tdb)
                        else
                        {
                                if (tdb)

-                                       rmark(cursect, sloc, tdb, MWORD, NULL);
+                                       MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);

 
                                if (eval + 0x10000 >= 0x20000)
                                        return error(range_error);
 
                                if (eval + 0x10000 >= 0x20000)
                                        return error(range_error);


@@ -1158,7 +1180,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
                        else
                        {
                                if (tdb)
                        else
                        {
                                if (tdb)

-                                       rmark(cursect, sloc, tdb, MLONG, NULL);
+                                       MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);

 
                                D_long(eval);
                        }
 
                                D_long(eval);
                        }


@@ -1242,7 +1264,7 @@ int d_68000(void)
 {
        rgpu = rdsp = 0;
        // Switching from gpu/dsp sections should reset any ORG'd Address
 {
        rgpu = rdsp = 0;
        // Switching from gpu/dsp sections should reset any ORG'd Address

-       orgactive = 0;                               
+       orgactive = 0;

        orgwarning = 0;
        SaveSection();
        SwitchSection(TEXT);
        orgwarning = 0;
        SaveSection();
        SwitchSection(TEXT);


@@ -1304,12 +1326,12 @@ int d_dsp(void)
 
 //
 // .cargs [#offset], symbol[.size], ...
 
 //
 // .cargs [#offset], symbol[.size], ...

-// 
+//

 // Lists of registers may also be mentioned; they just take up space. Good for
 // "documentation" purposes:
 // Lists of registers may also be mentioned; they just take up space. Good for
 // "documentation" purposes:

-// 
+//

 // .cargs a6, .arg1, .arg2, .arg3...
 // .cargs a6, .arg1, .arg2, .arg3...

-// 
+//

 // Symbols thus created are ABS and EQUATED.
 //
 int d_cargs(void)
 // Symbols thus created are ABS and EQUATED.
 //
 int d_cargs(void)


@@ -1417,12 +1439,12 @@ int d_cargs(void)
 
 //
 // .cstruct [#offset], symbol[.size], ...
 
 //
 // .cstruct [#offset], symbol[.size], ...

-// 
+//

 // Lists of registers may also be mentioned; they just take up space. Good for
 // "documentation" purposes:
 // Lists of registers may also be mentioned; they just take up space. Good for
 // "documentation" purposes:

-// 
+//

 // .cstruct a6, .arg1, .arg2, .arg3...
 // .cstruct a6, .arg1, .arg2, .arg3...

-// 
+//

 // Symbols thus created are ABS and EQUATED. Note that this is for
 // compatibility with VBCC and the Remover's library. Thanks to GroovyBee for
 // the suggestion.
 // Symbols thus created are ABS and EQUATED. Note that this is for
 // compatibility with VBCC and the Remover's library. Thanks to GroovyBee for
 // the suggestion.


@@ -1555,7 +1577,6 @@ int undmac1(char * p)
        SYM * symbol = lookup(p, MACRO, 0);
 
        // If the macro symbol exists, cause it to disappear
        SYM * symbol = lookup(p, MACRO, 0);
 
        // If the macro symbol exists, cause it to disappear

-//     if ((sy = lookup(p, MACRO, 0)) != NULL)

        if (symbol != NULL)
                symbol->stype = (BYTE)SY_UNDEF;
 
        if (symbol != NULL)
                symbol->stype = (BYTE)SY_UNDEF;
 


@@ -1589,3 +1610,30 @@ int d_gpumain(void)
        return error("What the hell? Do you think we adhere to the Goof standard?");
 }
 
        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 optimization flag '%s'", tmpstr);
+                               return error(temperr);
+                       }
+               }
+               else
+                       return error(".opt directive needs every switch enclosed inside quotation marks");
+       }
+
+       return OK;
+}
+