X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=57c3b376810851818a1b9d281a1fd7af70d469af;hp=b2b2610d62c96bfaeef2da0feda1851b03329664;hb=76299dcc588e5f5ba7270fd4bacc5872152f088e;hpb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608 diff --git a/rmac.c b/rmac.c index b2b2610..57c3b37 100644 --- a/rmac.c +++ b/rmac.c @@ -1,49 +1,58 @@ // -// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System +// RMAC - Reboot's Macro Assembler for all Atari computers // RMAC.C - Main Application Code -// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 -// Source Utilised with the Kind Permission of Landon Dyer +// Source utilised with the kind permission of Landon Dyer // #include "rmac.h" +#include "6502.h" +#include "debug.h" +#include "direct.h" #include "error.h" -#include "listing.h" -#include "procln.h" -#include "token.h" #include "expr.h" -#include "sect.h" +#include "listing.h" #include "mark.h" #include "macro.h" +#include "object.h" +#include "procln.h" #include "riscasm.h" -#include "direct.h" -#include "version.h" -#include "debug.h" +#include "sect.h" #include "symbol.h" -#include "object.h" +#include "token.h" +#include "version.h" 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 verb_flag; // Be verbose about what's going on +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 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 int obj_format; // Object format flag int debug; // [1..9] Enable debugging levels int err_flag; // '-e' specified -int err_fd; // File to write error messages to +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 -int endian; // Host processor endianess +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; // 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) // @@ -66,7 +75,7 @@ char * fext(char * name, char * extension, int stripp) // Clobber any old extension, if requested if (stripp) { - for(s=beg; *s && *s!='.'; ++s) + for(s=beg; *s && *s!='.'; ++s) ; *s = '\0'; @@ -83,7 +92,7 @@ char * fext(char * name, char * extension, int stripp) // Return 'item'nth element of semicolon-seperated pathnames specified in the // enviroment string 's'. Copy the pathname to 'buf'. Return 0 if the 'item' // nth path doesn't exist. -// +// // ['item' ranges from 0 to N-1, where N = #elements in search path] // int nthpath(char * env_var, int itemno, char * buf) @@ -122,14 +131,46 @@ 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" " b: BSD (use this for Jaguar)\n" + " e: ELF\n" + " 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" + " -m[cpu] Select default CPU. Available options:\n" + " 68000\n" + " 68020\n" + " 68030\n" + " 68040\n" + " 68060\n" + " 6502\n" + " tom\n" + " jerry\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" + " ~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" " -r[size] Pad segments to boundary size specified\n" " w: word (2 bytes, default alignment)\n" " l: long (4 bytes)\n" @@ -137,8 +178,10 @@ void DisplayHelp(void) " d: double phrase (16 bytes)\n" " q: quad phrase (32 bytes)\n" " -s Warn about possible short branches\n" + " and applied optimisations\n" " -u Force referenced and undefined symbols global\n" " -v Set verbose mode\n" + " -x Turn on debugging mode\n" " -y[pagelen] Set page line length (default: 61)\n" "\n", cmdlnexec); } @@ -149,13 +192,56 @@ void DisplayHelp(void) // void DisplayVersion(void) { - printf("\nReboot's Macro Assembler for Atari Jaguar\n" - "Copyright (C) 199x Landon Dyer, 2011 Reboot\n" + printf("\n" + " _ __ _ __ ___ __ _ ___ \n" + "| '__| '_ ` _ \\ / _` |/ __|\n" + "| | | | | | | | (_| | (__ \n" + "|_| |_| |_| |_|\\__,_|\\___|\n" + "\nReboot's Macro Assembler\n" + "Copyright (C) 199x Landon Dyer, 2011-2017 Reboot\n" "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM); } -// +// +// Parse optimisation options +// +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')) + { + 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 ((opt_no >= 0) && (opt_no < OPT_COUNT)) + { + optim_flags[opt_no] = onoff; + return OK; + } + else + return ERROR; + } + else + { + return ERROR; + } +} + + +// // Process command line arguments and do an assembly // int Process(int argc, char ** argv) @@ -164,7 +250,7 @@ int Process(int argc, char ** argv) SYM * sy; // Pointer to a symbol record char * s; // String pointer int fd; // File descriptor - char fnbuf[FNSIZ]; // Filename buffer + char fnbuf[FNSIZ]; // Filename buffer int i; // Iterator errcnt = 0; // Initialise error count @@ -190,6 +276,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 // Initialise modules InitSymbolTable(); // Symbol table @@ -200,9 +287,10 @@ int Process(int argc, char ** argv) InitMark(); // Mark tape-recorder InitMacro(); // Macro processor InitListing(); // Listing generator + Init6502(); // 6502 assembler // Process command line arguments and assemble source files - for(argno=0; argnosattr = DEFINED | EQUATED | ABS; - sy->svalue = (*s ? (VALUE)atoi(s) : 0); + sy->svalue = (*s ? (uint32_t)atoi(s) : 0); break; case 'e': // Redirect error message output case 'E': @@ -246,10 +334,22 @@ int Process(int argc, char ** argv) switch (argv[argno][2]) { case EOS: - case 'b': // -fb = BSD (Jaguar Recommended) + case 'a': // -fa = Alcyon [the default] + case 'A': + obj_format = ALCYON; + break; + case 'b': // -fb = BSD (Jaguar Recommended: 3 out 4 jaguars recommend it!) case 'B': obj_format = BSD; break; + case 'e': // -fe = ELF + case 'E': + obj_format = ELF; + break; + case 'x': // -fx = COM/EXE/XEX + case 'X': + obj_format = XEX; + break; default: printf("-f: unknown object format specified\n"); errcnt++; @@ -266,11 +366,51 @@ int Process(int argc, char ** argv) break; case 'l': // Produce listing file case 'L': - 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++; break; + case 'm': + case 'M': + if (strcmp(argv[argno] + 2, "68000") == 0) + d_68000(); + else if (strcmp(argv[argno] + 2, "68020") == 0) + d_68020(); + else if (strcmp(argv[argno] + 2, "68030") == 0) + d_68030(); + else if (strcmp(argv[argno] + 2, "68040") == 0) + d_68040(); + else if (strcmp(argv[argno] + 2, "68060") == 0) + d_68060(); + else if (strcmp(argv[argno] + 2, "68881") == 0) + d_68881(); + else if (strcmp(argv[argno] + 2, "68882") == 0) + d_68882(); + else if (strcmp(argv[argno] + 2, "56001") == 0) + d_56001(); + else if (strcmp(argv[argno] + 2, "6502") == 0) + d_6502(); + else if (strcmp(argv[argno] + 2, "tom") == 0) + d_gpu(); + else if (strcmp(argv[argno] + 2, "jerry") == 0) + d_dsp(); + else + { + printf("Unrecognized CPU '%s'\n", argv[argno] + 2); + errcnt++; + return errcnt; + } + break; case 'o': // Direct object file output case 'O': if (argv[argno][2] != EOS) @@ -283,15 +423,49 @@ int Process(int argc, char ** argv) errcnt++; return errcnt; } + objfname = argv[argno]; } + break; + case 'p': /* -p: generate ".PRG" executable output */ + case 'P': + /* + * -p .PRG generation w/o symbols + * -ps .PRG generation with symbols + * -px .PRG generation with extended symbols + */ + switch (argv[argno][2]) + { + case EOS: + prg_flag = 1; + break; + + case 's': + case 'S': + prg_flag = 2; + break; + + case 'x': + case 'X': + prg_flag = 3; + break; + + default: + printf("-p: syntax error\n"); + errcnt++; + return errcnt; + } + + // Enforce Alcyon object format - kind of silly + // to ask for .prg output without it! + obj_format = ALCYON; break; case 'r': // Pad seg to requested boundary size case 'R': switch(argv[argno][2]) { - case 'w': case 'W': segpadsize = 2; break; + case 'w': case 'W': segpadsize = 2; break; case 'l': case 'L': segpadsize = 4; break; case 'p': case 'P': segpadsize = 8; break; case 'd': case 'D': segpadsize = 16; break; @@ -327,7 +501,7 @@ int Process(int argc, char ** argv) if (pagelen < 10) { printf("-y: bad page length\n"); - ++errcnt; + errcnt++; return errcnt; } @@ -359,6 +533,17 @@ int Process(int argc, char ** argv) break; } } + else if (*argv[argno] == '+' || *argv[argno] == '~') + { + if (ParseOptimization(argv[argno]) != OK) + { + DisplayVersion(); + printf("Unknown switch: %s\n\n", argv[argno]); + DisplayHelp(); + errcnt++; + break; + } + } else { // Record first filename. @@ -385,6 +570,8 @@ int Process(int argc, char ** argv) // o save current section (no more code generation) // o do auto-even of all sections (or boundary alignment as requested // through '-r') + // o save the last pc value for 6502 (if we used 6502 at all) and + // detemine if the last section contains anything // o determine name of object file: // - "foo.o" for linkable output; // - "foo.prg" for GEMDOS executable (-p flag). @@ -406,14 +593,21 @@ int Process(int argc, char ** argv) SaveSection(); } + SwitchSection(M6502); + + if (sloc != currentorg[0]) + { + currentorg[1] = sloc; + currentorg += 2; + } + if (objfname == NULL) { if (firstfname == NULL) firstfname = defname; strcpy(fnbuf, firstfname); - //fext(fnbuf, prg_flag ? ".prg" : ".o", 1); - fext(fnbuf, ".o", 1); + fext(fnbuf, (prg_flag ? ".prg" : ".o"), 1); objfname = fnbuf; } @@ -433,7 +627,7 @@ int Process(int argc, char ** argv) if (verb_flag) { - s = "object"; + s = (prg_flag ? "executable" : "object"); printf("[Writing %s file: %s]\n", s, objfname); } @@ -485,13 +679,19 @@ int main(int argc, char ** argv) { perm_verb_flag = 0; // Clobber "permanent" verbose flag legacy_flag = 1; // Default is legacy mode on (:-P) - cmdlnexec = argv[0]; // Obtain executable name + // 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 if (argc > 1) - return Process(argc - 1, argv + 1); + return Process(argc - 1, argv + 1); DisplayVersion(); DisplayHelp();