Code cleanup from last patch, also, version bump for same. :-)

[rmac] / rmac.c

diff --git a/rmac.c b/rmac.c
index e4bd7b78091578f475343a88806a339782210fad..de2ff3626318cd3131665162f30c50e19b1776c6 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -25,7 +25,7 @@
 
 int perm_verb_flag;                            // Permanently verbose, interactive mode
 int list_flag;                                 // "-l" listing flag on command line
-int list_pag = 1;               // Enable listing pagination by default
+int list_pag = 1;                              // Enable listing pagination by default
 int verb_flag;                                 // Be verbose about what's going on
 int m6502;                                             // 1, assembling 6502 code
 int as68_flag;                                 // as68 kludge mode
@@ -39,6 +39,7 @@ int debug;                                            // [1..9] Enable debugging levels
 int err_flag;                                  // '-e' specified
 int err_fd;                                            // File to write error messages to
 int rgpu, rdsp;                                        // Assembling Jaguar GPU or DSP code
+int dsp56001;                                  // Assembling DSP 56001 code
 int list_fd;                                   // File to write listing to
 int regbank;                                   // RISC register bank
 int segpadsize;                                        // Segment padding size
@@ -48,7 +49,10 @@ char * firstfname;                           // First source filename
 char * cmdlnexec;                              // Executable name, pointer to ARGV[0]
 char * searchpath;                             // Search path for include files
 char defname[] = "noname.o";   // Default output filename
-int optim_flags[OPT_COUNT];    // Specific optimisations on/off matrix
+int optim_flags[OPT_COUNT];            // Specific optimisations on/off matrix
+int activecpu = CPU_68000;             // Active 68k CPU (68000 by default)
+int activefpu = FPU_NONE;              // Active FPU (none by default)
+
 
 //
 // Manipulate file extension.
@@ -126,7 +130,7 @@ void DisplayHelp(void)
                "\n"
                "Options:\n"
                "  -? or -h          Display usage information\n"
-               "  -dsymbol[=value]  Define symbol\n"
+               "  -dsymbol[=value]  Define symbol (with optional value, default=0)\n"
                "  -e[errorfile]     Send error messages to file, not stdout\n"
                "  -f[format]        Output object file format\n"
                "                    a: ALCYON (use this for ST)\n"
@@ -135,15 +139,17 @@ void DisplayHelp(void)
                "                    x: com/exe/xex (Atari 800)\n"
                "  -i[path]          Directory to search for include files\n"
                "  -l[filename]      Create an output listing file\n"
-        "  -l*[filename]     Create an output listing file without pagination\n"
+               "  -l*[filename]     Create an output listing file without pagination\n"
                "  -n                Don't do things behind your back in RISC assembler\n"
                "  -o file           Output file name\n"
                "  +o[value]         Turn a specific optimisation on\n"
                "                    Available optimisation values and default settings:\n"
-               "                    o0: Absolute long adddresses to word (on)\n"
-               "                    o1: move.l #x,dn/an to moveq         (on)\n"
-               "                    o2: Word branches to short           (on)\n"
-               "                    o3: Outer displacement 0(an) to (an) (off)\n"
+               "                    o0: Absolute long adddresses to word        (on)\n"
+               "                    o1: move.l #x,dn/an to moveq                (on)\n"
+               "                    o2: Word branches to short                  (on)\n"
+               "                    o3: Outer displacement 0(an) to (an)        (off)\n"
+               "                    o4: lea size(An),An to addq #size,An        (off)\n"
+               "                    o5: Absolute long base displacement to word (off)\n"
                "  ~o[value]         Turn a specific optimisation off\n"
                "  +oall             Turn all optimisations on\n"
                "  ~oall             Turn all optimisations off\n"
@@ -255,7 +261,7 @@ int Process(int argc, char ** argv)
        orgactive = 0;                                  // Not in RISC org section
        orgwarning = 0;                                 // No ORG warning issued
        segpadsize = 2;                                 // Initialise segment padding size
-       m6502 = 0;                      // 6502 mode off by default
+       m6502 = 0;                                              // 6502 mode off by default
 
        // Initialise modules
        InitSymbolTable();                              // Symbol table
@@ -345,15 +351,16 @@ int Process(int argc, char ** argv)
                                break;
                        case 'l':                               // Produce listing file
                        case 'L':
-                if (*(argv[argno] + 2) == '*')
-                {
-                    list_fname = argv[argno] + 3;
-                    list_pag = 0;    // Special case - turn off pagination
-                }
-                else
-                {
-                    list_fname = argv[argno] + 2;
-                }
+                               if (*(argv[argno] + 2) == '*')
+                               {
+                                       list_fname = argv[argno] + 3;
+                                       list_pag = 0;    // Special case - turn off pagination
+                               }
+                               else
+                               {
+                                       list_fname = argv[argno] + 2;
+                               }
+
                                listing = 1;
                                list_flag = 1;
                                lnsave++;
@@ -621,15 +628,13 @@ int main(int argc, char ** argv)
        perm_verb_flag = 0;                             // Clobber "permanent" verbose flag
        legacy_flag = 1;                                // Default is legacy mode on (:-P)
 
-       // Set legacy optimisation flags to on
-       // and everything else to off
+       // Set legacy optimisation flags to on and everything else to off
        memset(optim_flags, 0, OPT_COUNT * sizeof(int));
        optim_flags[OPT_ABS_SHORT] =
                optim_flags[OPT_MOVEL_MOVEQ] =
                optim_flags[OPT_BSR_BCC_S] = 1;
 
        cmdlnexec = argv[0];                    // Obtain executable name
-
        endian = GetEndianess();                // Get processor endianess
 
        // If commands were passed in, process them