X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=a24b61473ccdb2085213c0e39ec4b1b8fd3a9c62;hp=b2b2610d62c96bfaeef2da0feda1851b03329664;hb=5cd8a4814b805f1ef8ce689423eb5eeba12573c5;hpb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608 diff --git a/rmac.c b/rmac.c index b2b2610..a24b614 100644 --- a/rmac.c +++ b/rmac.c @@ -1,50 +1,57 @@ // // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System // RMAC.C - Main Application Code -// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011 - 2016 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 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) // // Manipulate file extension. @@ -66,7 +73,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 +90,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) @@ -125,11 +132,29 @@ void DisplayHelp(void) " -dsymbol[=value] Define symbol\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" " -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" + " ~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" + " 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 +162,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 +176,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 +234,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 +260,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 +271,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; argno 1) - return Process(argc - 1, argv + 1); + return Process(argc - 1, argv + 1); DisplayVersion(); DisplayHelp();