X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=9dd75fdb86f8efabe6f92c990fd6a278c4e4c3da;hp=57c3b376810851818a1b9d281a1fd7af70d469af;hb=66b362fa203d0850e8dce8045adb454e354c22ce;hpb=76299dcc588e5f5ba7270fd4bacc5872152f088e diff --git a/rmac.c b/rmac.c index 57c3b37..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 // @@ -40,6 +40,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 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 @@ -55,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. // @@ -198,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); } @@ -271,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 @@ -323,7 +335,7 @@ int Process(int argc, char ** argv) } sy->sattr = DEFINED | EQUATED | ABS; - sy->svalue = (*s ? (uint32_t)atoi(s) : 0); + sy->svalue = (*s ? (uint64_t)atoi(s) : 0); break; case 'e': // Redirect error message output case 'E':