X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=933da5f2bdfa2e07c9321591aacf5b2d5adeef13;hp=b6a7afe3745aca10df0829264af59157045149d9;hb=ac3149e4607a5a07b212ba85a0fe44614b9aeec4;hpb=2037569179a89c7ea99abf7c3e75f23448ff54ff diff --git a/rmac.c b/rmac.c index b6a7afe..933da5f 100644 --- a/rmac.c +++ b/rmac.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for all Atari computers // RMAC.C - Main Application Code -// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -32,7 +32,7 @@ int m6502; // 1, assembling 6502 code int as68_flag; // as68 kludge mode int glob_flag; // Assume undefined symbols are global int lsym_flag; // Include local symbols in object file -int sbra_flag; // Warn about possible short branches +int optim_warn_flag; // Warn about possible short branches int prg_flag; // !=0, produce .PRG executable (2=symbols) int prg_extend; // !=0, output extended .PRG symbols int legacy_flag; // Do stuff like insert code in RISC assembler @@ -50,12 +50,13 @@ int endian; // Host processor endianess (0 = LE, 1 = BE) char * objfname; // Object filename pointer char * firstfname; // First source filename char * cmdlnexec; // Executable name, pointer to ARGV[0] -char * searchpath; // Search path for include files +char * searchpath = NULL; // Search path for include files char defname[] = "noname.o"; // Default output filename 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) - +int org68k_active = 0; // .org switch for 68k (only with RAW output format) +uint32_t org68k_address; // .org for 68k // // Convert a string to uppercase @@ -146,12 +147,13 @@ void DisplayHelp(void) " -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" + " a: ALCYON\n" " b: BSD (use this for Jaguar)\n" " e: ELF\n" " p: P56 (use this for DSP56001 only)\n" " l: LOD (use this for DSP56001 only)\n" " x: com/exe/xex (Atari 800)\n" + " r: absolute address\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" @@ -161,23 +163,23 @@ void DisplayHelp(void) " -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" - " o4: lea size(An),An to addq #size,An (off)\n" - " o5: Absolute long base displacement 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" + " 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 displacement 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" + " op: Enforce PC relative (off)\n" " ~o[value] Turn a specific optimisation off\n" " +oall Turn all optimisations on\n" " ~oall Turn all optimisations off\n" - " -p Create an ST .prg (without symbols)\n" - " -ps Create an ST .prg (with symbols)\n" - " -px Create an ST .prg (with exsymbols)\n" - " Forces -fa\n" + " -p Create an ST .prg (without symbols). Forces -fa\n" + " -ps Create an ST .prg (with symbols). Forces -fa\n" + " -px Create an ST .prg (with exsymbols). Forces -fa\n" " -r[size] Pad segments to boundary size specified\n" " w: word (2 bytes, default alignment)\n" " l: long (4 bytes)\n" @@ -205,7 +207,7 @@ void DisplayVersion(void) "| | | | | | | | (_| | (__ \n" "|_| |_| |_| |_|\\__,_|\\___|\n" "\nReboot's Macro Assembler\n" - "Copyright (C) 199x Landon Dyer, 2011-2019 Reboot\n" + "Copyright (C) 199x Landon Dyer, 2011-2020 Reboot\n" "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM); } @@ -217,34 +219,57 @@ int ParseOptimization(char * optstring) { int onoff = 0; - if (*optstring == '+') - onoff = 1; - else if (*optstring != '~') - return ERROR; - - if ((optstring[2] == 'a' || optstring[2] == 'A') - && (optstring[3] == 'l' || optstring[3] == 'L') - && (optstring[4] == 'l' || optstring[4] == 'L')) + while (*optstring) { - memset(optim_flags, onoff, OPT_COUNT * sizeof(int)); - return OK; - } - else if (optstring[1] == 'o' || optstring[1] == 'O') // Turn on specific optimisation - { - int opt_no = atoi(&optstring[2]); + if (*optstring == '+') + onoff = 1; + else if (*optstring != '~') + return ERROR; - if ((opt_no >= 0) && (opt_no < OPT_COUNT)) + if ((optstring[2] == 'a' || optstring[2] == 'A') + && (optstring[3] == 'l' || optstring[3] == 'L') + && (optstring[4] == 'l' || optstring[4] == 'L')) { - optim_flags[opt_no] = onoff; - return OK; + memset(optim_flags, onoff, OPT_COUNT * sizeof(int)); + optstring += 5; + } + else if (optstring[1] == 'o' || optstring[1] == 'O') // Turn on specific optimisation + { + if (optstring[2] == 'p' || optstring[2] == 'P') + { + optim_flags[OPT_PC_RELATIVE] = onoff; + optstring += 3; + } + else + { + int opt_no = atoi(&optstring[2]); + + if ((opt_no >= 0) && (opt_no < OPT_COUNT)) + { + optim_flags[opt_no] = onoff; + optstring += 3; + + // If opt_no is 2 digits then consume an extra character. + // Sounds a bit sleazy but we know we're not going to hit + // more than 100 optimisation switches so this should be + // fine. If we do hit that number then it'll probably be + // time to burn the whole codebase and start from scratch. + if (opt_no > 9) + optstring++; + } + else + return ERROR; + } } else + { return ERROR; + } + + if (*optstring == ',') + optstring++; } - else - { - return ERROR; - } + return OK; } @@ -266,7 +291,7 @@ int Process(int argc, char ** argv) verb_flag = perm_verb_flag; // Initialize verbose flag as68_flag = 0; // Initialize as68 kludge mode glob_flag = 0; // Initialize .globl flag - sbra_flag = 0; // Initialize short branch flag + optim_warn_flag = 0; // Initialize short branch flag debug = 0; // Initialize debug flag searchpath = NULL; // Initialize search path objfname = NULL; // Initialize object filename @@ -368,6 +393,10 @@ int Process(int argc, char ** argv) case 'X': obj_format = XEX; break; + case 'r': // -fr = Absolute address + case 'R': + obj_format = RAW; + break; default: printf("-f: unknown object format specified\n"); errcnt++; @@ -380,8 +409,26 @@ int Process(int argc, char ** argv) break; case 'i': // Set directory search path case 'I': + { searchpath = argv[argno] + 2; + + // Check to see if include paths actually exist + if (strlen(searchpath) > 0) + { + DIR * test = opendir(searchpath); + + if (test == NULL) + { + printf("Invalid include path: %s\n", searchpath); + errcnt++; + return errcnt; + } + + closedir(test); + } + break; + } case 'l': // Produce listing file case 'L': if (*(argv[argno] + 2) == '*') @@ -491,9 +538,9 @@ int Process(int argc, char ** argv) default: segpadsize = 2; break; // Effective autoeven(); } break; - case 's': // Warn about possible short branches + case 's': // Warn about possible short branches and applied optimisations case 'S': - sbra_flag = 1; + optim_warn_flag = 1; break; case 'u': // Make undefined symbols .globl case 'U':