Addendum for #193: Do less tokenisation processing when inside a disabled code block

[rmac] / rmac.c

diff --git a/rmac.c b/rmac.c
index b808f7560865d03d69194310fc7f6a6a5f762317..473f372cc4344f42d6c6956c41de6bb8023a7e99 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -43,7 +43,6 @@ int rgpu, rdsp;                                       // Assembling Jaguar GPU or DSP code
 int robjproc;                                  // Assembling Jaguar Object Processor 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
 int endian;                                            // Host processor endianess (0 = LE, 1 = BE)
 char * objfname;                               // Object filename pointer
@@ -52,7 +51,7 @@ char * cmdlnexec;                             // Executable name, pointer to ARGV[0]
 char searchpatha[512] = { 0 }; // Buffer to hold searchpath when specified
 char * searchpath = NULL;              // Search path for include files
 char defname[] = "noname.o";   // Default output filename
-int optim_flags[OPT_COUNT_ALL];        // Specific optimisations on/off matrix
+int optim_flags[OPT_COUNT_ALL] = { 0 };        // Specific optimisations on/off matrix
 int activecpu = CPU_68000;             // Active 68k CPU (68000 by default)
 int activefpu = FPU_NONE;              // Active FPU (none by default)
 int org68k_active = 0;                 // .org switch for 68k (only with RAW output format)
@@ -171,18 +170,20 @@ void DisplayHelp(void)
                "  -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 addresses 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: 68020+ Absolute long base/outer disp. to word (off)\n"
-               "                    o6: Null branches to NOP                          (off)\n"
-               "                    o7: clr.l Dx to moveq #0,Dx                       (off)\n"
-               "                    o8: adda.w/l #x,Dy to addq.w/l #x,Dy              (off)\n"
-               "                    o9: adda.w/l #x,Dy to lea x(Dy),Dy                (off)\n"
-               "                    o10: Enforce PC relative (alternative: op)        (off)\n"
+               "                    Available optimisation switches:\n"
+               "                    o0: Absolute long addresses to word\n"
+               "                    o1: move.l #x,dn/an to moveq\n"
+               "                    o2: Word branches to short\n"
+               "                    o3: Outer displacement 0(an) to (an)\n"
+               "                    o4: lea size(An),An to addq #size,An\n"
+               "                    o5: 68020+ Absolute long base/outer disp. to word\n"
+               "                    o6: Null branches to NOP\n"
+               "                    o7: clr.l Dx to moveq #0,Dx\n"
+               "                    o8: adda.w/l #x,Dy to addq.w/l #x,Dy\n"
+               "                    o9: adda.w/l #x,Ay to lea x(Dy),Ay\n"
+               "                    o10: 56001 Use short format for immediate values if possible\n"
+               "                    o11: 56001 Auto convert short addressing mode to long (default: on)\n"
+               "                    o30: Enforce PC relative (alternative name: op)\n"
                "  ~o[value]         Turn a specific optimisation off\n"
                "  +oall             Turn all optimisations on\n"
                "  ~oall             Turn all optimisations off\n"
@@ -314,7 +315,6 @@ int Process(int argc, char ** argv)
        rdsp = 0;                                               // Initialize DSP assembly flag
        robjproc = 0;                                   // Initialize OP assembly flag
        lsym_flag = 1;                                  // Include local symbols in object file
-       regbank = BANK_N;                               // No RISC register bank specified
        orgactive = 0;                                  // Not in RISC org section
        orgwarning = 0;                                 // No ORG warning issued
        segpadsize = 2;                                 // Initialize segment padding size
@@ -774,9 +774,7 @@ int main(int argc, char ** argv)
 {
        perm_verb_flag = 0;                             // Clobber "permanent" verbose flag
        legacy_flag = 1;                                // Default is legacy mode on (:-P)
-
-       // Set all optimisation flags to off
-       memset(optim_flags, 0, OPT_COUNT * sizeof(int));
+       optim_flags[OPT_56K_SHORT] = 1; // This ensures compatibilty with Motorola's 56k assembler
 
        cmdlnexec = argv[0];                    // Obtain executable name
        endian = GetEndianess();                // Get processor endianess