X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=21e1fb8c0d0be275166e52a39c44a18c3c879d7f;hp=2e6baf3dcf47495eb170f158f8677c2409740edb;hb=9153334781cd2e23750f4dc002e847606c07a1f0;hpb=2ede3731285f3bc20f5493de593442e872db4d32

diff --git a/rmac.c b/rmac.c
index 2e6baf3..21e1fb8 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,6 +33,7 @@ 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
@@ -161,11 +162,14 @@ void DisplayHelp(void)
 		"                    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"
@@ -319,7 +323,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':
@@ -378,31 +382,31 @@ int Process(int argc, char ** argv)
 				break;
 			case 'm':
 			case 'M':
-				if ((*(argv[argno] + 2) == '6') && (*(argv[argno] + 3) == '8') && (*(argv[argno] + 4) == '0') && (*(argv[argno] + 5) == '0') && (*(argv[argno] + 6) == '0'))
+				if (strcmp(argv[argno] + 2, "68000") == 0)
 					d_68000();
-				else if ((*(argv[argno] + 2) == '6')&&(*(argv[argno] + 3) == '8')&&(*(argv[argno] + 4) == '0')&&(*(argv[argno] + 5) == '2')&&(*(argv[argno] + 6) == '0'))
+				else if (strcmp(argv[argno] + 2, "68020") == 0)
 					d_68020();
-				else if ((*(argv[argno] + 2) == '6')&&(*(argv[argno] + 3) == '8')&&(*(argv[argno] + 4) == '0')&&(*(argv[argno] + 5) == '3')&&(*(argv[argno] + 6) == '0'))
+				else if (strcmp(argv[argno] + 2, "68030") == 0)
 					d_68030();
-				else if ((*(argv[argno] + 2) == '6')&&(*(argv[argno] + 3) == '8')&&(*(argv[argno] + 4) == '0')&&(*(argv[argno] + 5) == '4')&&(*(argv[argno] + 6) == '0'))
+				else if (strcmp(argv[argno] + 2, "68040") == 0)
 					d_68040();
-				else if ((*(argv[argno] + 2) == '6')&&(*(argv[argno] + 3) == '8')&&(*(argv[argno] + 4) == '0')&&(*(argv[argno] + 5) == '6')&&(*(argv[argno] + 6) == '0'))
+				else if (strcmp(argv[argno] + 2, "68060") == 0)
 					d_68060();
-				else if ((*(argv[argno] + 2) == '6')&&(*(argv[argno] + 3) == '8')&&(*(argv[argno] + 4) == '8')&&(*(argv[argno] + 5) == '8')&&(*(argv[argno] + 6) == '1'))
+				else if (strcmp(argv[argno] + 2, "68881") == 0)
 					d_68881();
-				else if ((*(argv[argno] + 2) == '6')&&(*(argv[argno] + 3) == '8')&&(*(argv[argno] + 4) == '8')&&(*(argv[argno] + 5) == '8')&&(*(argv[argno] + 6) == '2'))
+				else if (strcmp(argv[argno] + 2, "68882") == 0)
 					d_68882();
-				else if ((*(argv[argno] + 2) == '5')&&(*(argv[argno] + 3) == '6')&&(*(argv[argno] + 4) == '0')&&(*(argv[argno] + 5) == '0')&&(*(argv[argno] + 6) == '1'))
+				else if (strcmp(argv[argno] + 2, "56001") == 0)
 					d_56001();
-				else if ((*(argv[argno] + 2) == '6')&&(*(argv[argno] + 3) == '5')&&(*(argv[argno] + 4) == '0')&&(*(argv[argno] + 5) == '2'))
+				else if (strcmp(argv[argno] + 2, "6502") == 0)
 					d_6502();
-				else if ((*(argv[argno] + 2) == 't')&&(*(argv[argno] + 3) == 'o')&&(*(argv[argno] + 4) == 'm'))
+				else if (strcmp(argv[argno] + 2, "tom") == 0)
 					d_gpu();
-				else if ((*(argv[argno] + 2) == 'j')&&(*(argv[argno] + 3) == 'e')&&(*(argv[argno] + 4) == 'r')&&(*(argv[argno] + 5) == 'r')&&(*(argv[argno] + 6) == 'y'))
+				else if (strcmp(argv[argno] + 2, "jerry") == 0)
 					d_dsp();
 				else
 				{
-					printf("Unrecognised CPU");
+					printf("Unrecognized CPU '%s'\n", argv[argno] + 2);
 					errcnt++;
 					return errcnt;
 				}
@@ -428,7 +432,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])
 				{
@@ -441,6 +446,11 @@ 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++;