X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=4fb1582a725c603ff64663bad92b59a63d008ba9;hp=21e1fb8c0d0be275166e52a39c44a18c3c879d7f;hb=9afaf60ca24cdb08f900ae584107e29e3af46566;hpb=9153334781cd2e23750f4dc002e847606c07a1f0 diff --git a/rmac.c b/rmac.c index 21e1fb8..4fb1582 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-2018 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 // @@ -10,6 +10,7 @@ #include "6502.h" #include "debug.h" #include "direct.h" +#include "dsp56k.h" #include "error.h" #include "expr.h" #include "listing.h" @@ -31,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 @@ -40,6 +41,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 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 @@ -48,11 +50,22 @@ 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 +// +void strtoupper(char * s) +{ + while (*s) + *s++ &= 0xDF; +} // @@ -134,43 +147,39 @@ 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" " -m[cpu] Select default CPU. Available options:\n" - " 68000\n" - " 68020\n" - " 68030\n" - " 68040\n" - " 68060\n" - " 6502\n" - " tom\n" - " jerry\n" + " 68000, 68020, 68030, 68040, 68060, 6502, tom, jerry, 56001\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" - " 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" @@ -198,7 +207,7 @@ void DisplayVersion(void) "| | | | | | | | (_| | (__ \n" "|_| |_| |_| |_|\\__,_|\\___|\n" "\nReboot's Macro Assembler\n" - "Copyright (C) 199x Landon Dyer, 2011-2017 Reboot\n" + "Copyright (C) 199x Landon Dyer, 2011-2020 Reboot\n" "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM); } @@ -210,34 +219,54 @@ 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; } @@ -253,32 +282,35 @@ int Process(int argc, char ** argv) char fnbuf[FNSIZ]; // Filename buffer int i; // Iterator - errcnt = 0; // Initialise error count - listing = 0; // Initialise listing level - list_flag = 0; // Initialise listing flag - verb_flag = perm_verb_flag; // Initialise verbose flag - as68_flag = 0; // Initialise as68 kludge mode - glob_flag = 0; // Initialise .globl flag - sbra_flag = 0; // Initialise short branch flag - debug = 0; // Initialise debug flag - searchpath = NULL; // Initialise search path - objfname = NULL; // Initialise object filename - list_fname = NULL; // Initialise listing filename - err_fname = NULL; // Initialise error filename - obj_format = BSD; // Initialise object format - firstfname = NULL; // Initialise first filename - err_fd = ERROUT; // Initialise error file descriptor - err_flag = 0; // Initialise error flag - rgpu = 0; // Initialise GPU assembly flag - rdsp = 0; // Initialise DSP assembly flag + errcnt = 0; // Initialize error count + listing = 0; // Initialize listing level + list_flag = 0; // Initialize listing flag + verb_flag = perm_verb_flag; // Initialize verbose flag + as68_flag = 0; // Initialize as68 kludge mode + glob_flag = 0; // Initialize .globl flag + optim_warn_flag = 0; // Initialize short branch flag + debug = 0; // Initialize debug flag + searchpath = NULL; // Initialize search path + objfname = NULL; // Initialize object filename + list_fname = NULL; // Initialize listing filename + err_fname = NULL; // Initialize error filename + obj_format = BSD; // Initialize object format + firstfname = NULL; // Initialize first filename + err_fd = ERROUT; // Initialize error file descriptor + err_flag = 0; // Initialize error flag + rgpu = 0; // Initialize GPU assembly flag + 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; // Initialise segment padding size + segpadsize = 2; // Initialize segment padding size + dsp_orgmap[0].start = 0; // Initialize 56001 org initial address + dsp_orgmap[0].memtype = ORG_P; // Initialize 56001 org start segment m6502 = 0; // 6502 mode off by default - // Initialise modules + // Initialize modules InitSymbolTable(); // Symbol table InitTokenizer(); // Tokenizer InitLineProcessor(); // Line processor @@ -346,10 +378,22 @@ int Process(int argc, char ** argv) case 'E': obj_format = ELF; break; + case 'l': // -fl = LOD + case 'L': + obj_format = LOD; + break; + case 'p': // -fp = P56 + case 'P': + obj_format = P56; + break; case 'x': // -fx = COM/EXE/XEX 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++; @@ -362,8 +406,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) == '*') @@ -473,9 +535,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': @@ -576,6 +638,7 @@ int Process(int argc, char ** argv) // - "foo.o" for linkable output; // - "foo.prg" for GEMDOS executable (-p flag). SaveSection(); + int temp_section = cursect; for(i=TEXT; i<=BSS; i<<=1) { @@ -601,6 +664,20 @@ int Process(int argc, char ** argv) currentorg += 2; } + // This looks like an awful kludge... !!! FIX !!! + if (temp_section & (M56001P | M56001X | M56001Y)) + { + SwitchSection(temp_section); + + if (chptr != dsp_currentorg->start) + { + dsp_currentorg->end = chptr; + dsp_currentorg++; + } + } + + SwitchSection(TEXT); + if (objfname == NULL) { if (firstfname == NULL) @@ -623,7 +700,7 @@ int Process(int argc, char ** argv) if (errcnt == 0) { if ((fd = open(objfname, _OPEN_FLAGS, _PERM_MODE)) < 0) - cantcreat(objfname); + CantCreateFile(objfname); if (verb_flag) {