X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=9dd75fdb86f8efabe6f92c990fd6a278c4e4c3da;hp=739925ca7d23a40d3da27749abc62141d83049f6;hb=66b362fa203d0850e8dce8045adb454e354c22ce;hpb=03dd34951a331e0b8971195ccef1600fffaea2e6 diff --git a/rmac.c b/rmac.c index 739925c..9dd75fd 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-2017 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -33,12 +33,14 @@ 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 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 @@ -54,6 +56,16 @@ int activecpu = CPU_68000; // Active 68k CPU (68000 by default) int activefpu = FPU_NONE; // Active FPU (none by default) +// +// Convert a string to uppercase +// +void strtoupper(char * s) +{ + while (*s) + *s++ &= 0xDF; +} + + // // Manipulate file extension. // @@ -140,6 +152,15 @@ 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" @@ -150,11 +171,16 @@ void DisplayHelp(void) " 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" @@ -183,7 +209,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-2018 Reboot\n" "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM); } @@ -256,6 +282,7 @@ int Process(int argc, char ** argv) err_flag = 0; // Initialise error flag rgpu = 0; // Initialise GPU assembly flag rdsp = 0; // Initialise DSP assembly flag + robjproc = 0; // Initialise 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 @@ -308,7 +335,7 @@ int Process(int argc, char ** argv) } sy->sattr = DEFINED | EQUATED | ABS; - sy->svalue = (*s ? (VALUE)atoi(s) : 0); + sy->svalue = (*s ? (uint64_t)atoi(s) : 0); break; case 'e': // Redirect error message output case 'E': @@ -365,6 +392,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) @@ -386,7 +444,8 @@ int Process(int argc, char ** argv) case 'P': /* * -p .PRG generation w/o symbols - * -ps .PRG generation with symbols + * -ps .PRG generation with symbols + * -px .PRG generation with extended symbols */ switch (argv[argno][2]) { @@ -399,9 +458,14 @@ int Process(int argc, char ** argv) prg_flag = 2; break; + case 'x': + case 'X': + prg_flag = 3; + break; + default: printf("-p: syntax error\n"); - ++errcnt; + errcnt++; return errcnt; } @@ -449,7 +513,7 @@ int Process(int argc, char ** argv) if (pagelen < 10) { printf("-y: bad page length\n"); - ++errcnt; + errcnt++; return errcnt; }