X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=16af05ca6dfec465cf0a8b2feb9d975990041541;hp=6bf5a5060fb8a23e109d308bc0a0109e9a1992ed;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=052be802baa4836564801c780b1d432cfe17c576 diff --git a/rmac.c b/rmac.c index 6bf5a50..16af05c 100644 --- a/rmac.c +++ b/rmac.c @@ -1,29 +1,31 @@ // -// 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 - 2016 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 // #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 @@ -37,6 +39,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 dsp56001; // Assembling DSP 56001 code int list_fd; // File to write listing to int regbank; // RISC register bank int segpadsize; // Segment padding size @@ -46,7 +49,10 @@ char * firstfname; // First source filename char * cmdlnexec; // Executable name, pointer to ARGV[0] 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 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. @@ -124,23 +130,26 @@ 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" + " 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" + " 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" @@ -252,7 +261,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 + m6502 = 0; // 6502 mode off by default // Initialise modules InitSymbolTable(); // Symbol table @@ -263,10 +272,10 @@ int Process(int argc, char ** argv) InitMark(); // Mark tape-recorder InitMacro(); // Macro processor InitListing(); // Listing generator - Init6502(); // 6502 assembler + 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': @@ -322,10 +331,10 @@ int Process(int argc, char ** argv) case 'E': obj_format = ELF; break; - case 'x': // -fx = COM/EXE/XEX - case 'X': - obj_format = XEX; - break; + case 'x': // -fx = COM/EXE/XEX + case 'X': + obj_format = XEX; + break; default: printf("-f: unknown object format specified\n"); errcnt++; @@ -342,7 +351,16 @@ 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++; @@ -383,7 +401,7 @@ int Process(int argc, char ** argv) default: printf("-p: syntax error\n"); - ++errcnt; + errcnt++; return errcnt; } @@ -431,7 +449,7 @@ int Process(int argc, char ** argv) if (pagelen < 10) { printf("-y: bad page length\n"); - ++errcnt; + errcnt++; return errcnt; } @@ -523,12 +541,13 @@ int Process(int argc, char ** argv) SaveSection(); } - SwitchSection(M6502); - if (sloc != currentorg[0]) - { - currentorg[1] = sloc; - currentorg += 2; - } + SwitchSection(M6502); + + if (sloc != currentorg[0]) + { + currentorg[1] = sloc; + currentorg += 2; + } if (objfname == NULL) { @@ -609,15 +628,13 @@ int main(int argc, char ** argv) perm_verb_flag = 0; // Clobber "permanent" verbose flag legacy_flag = 1; // Default is legacy mode on (:-P) - // Set legacy optimisation flags to on - // and everything else to off + // 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