X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=615d84d7cdec1eea5d9c013093e4c85d501ed9b5;hp=a24b61473ccdb2085213c0e39ec4b1b8fd3a9c62;hb=b57de9c1d9a47f152b590f1cdbd05a2910667ce4;hpb=5cd8a4814b805f1ef8ce689423eb5eeba12573c5 diff --git a/rmac.c b/rmac.c index a24b614..615d84d 100644 --- a/rmac.c +++ b/rmac.c @@ -1,7 +1,7 @@ // -// 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 // @@ -49,9 +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 activecpu=CPU_68000; // Active 68k CPU (68000 by default) -int activefpu=FPU_NONE; // Active FPU (none by default) +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. @@ -129,7 +130,7 @@ 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" @@ -139,16 +140,29 @@ void DisplayHelp(void) " -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" + " 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" @@ -260,7 +274,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 @@ -307,7 +321,7 @@ int Process(int argc, char ** argv) } sy->sattr = 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': @@ -364,6 +378,37 @@ int Process(int argc, char ** argv) 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) @@ -400,7 +445,7 @@ int Process(int argc, char ** argv) default: printf("-p: syntax error\n"); - ++errcnt; + errcnt++; return errcnt; } @@ -448,7 +493,7 @@ int Process(int argc, char ** argv) if (pagelen < 10) { printf("-y: bad page length\n"); - ++errcnt; + errcnt++; return errcnt; } @@ -627,15 +672,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