X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=a4b6b42f74e5c9b37c1117dcd2c48d8902e54cd2;hp=de2ff3626318cd3131665162f30c50e19b1776c6;hb=3b063cd8b11b5e868efec02f9e281a1e04f2707b;hpb=5f23454f7155f0c77ea1bede3f9e60b39da99fa8

diff --git a/rmac.c b/rmac.c
index de2ff36..a4b6b42 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
 //
@@ -140,6 +140,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,6 +159,8 @@ 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"
 		"  ~o[value]         Turn a specific optimisation off\n"
 		"  +oall             Turn all optimisations on\n"
 		"  ~oall             Turn all optimisations off\n"
@@ -308,7 +319,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':
@@ -365,6 +376,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)
@@ -401,7 +443,7 @@ int Process(int argc, char ** argv)
 
 					default:
 						printf("-p: syntax error\n");
-						++errcnt;
+						errcnt++;
 						return errcnt;
 				}
 
@@ -449,7 +491,7 @@ int Process(int argc, char ** argv)
 				if (pagelen < 10)
 				{
 					printf("-y: bad page length\n");
-					++errcnt;
+					errcnt++;
 					return errcnt;
 				}