X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=3dc0f078a2a1b17ed49045602e8849ba9b0135b4;hp=084f898aa09fd760cb89ba89315342f9230b79d2;hb=05d0350b35a6a6b255cb2a3fab7796f5d4ee4d02;hpb=f33d7fdb41ccdda027c33c5358a3826bef83967b

diff --git a/rmac.c b/rmac.c
index 084f898..3dc0f07 100644
--- a/rmac.c
+++ b/rmac.c
@@ -1,30 +1,33 @@
 //
-// 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
 //
 
 #include "rmac.h"
+#include "6502.h"
+#include "debug.h"
+#include "direct.h"
 #include "error.h"
-#include "listing.h"
-#include "procln.h"
-#include "token.h"
 #include "expr.h"
-#include "sect.h"
+#include "listing.h"
 #include "mark.h"
 #include "macro.h"
+#include "object.h"
+#include "procln.h"
 #include "riscasm.h"
-#include "direct.h"
-#include "version.h"
-#include "debug.h"
+#include "sect.h"
 #include "symbol.h"
-#include "object.h"
+#include "token.h"
+#include "version.h"
 
 int perm_verb_flag;				// Permanently verbose, interactive mode
 int list_flag;					// "-l" listing flag on command line
+int list_pag = 1;				// Enable listing pagination by default
 int verb_flag;					// Be verbose about what's going on
+int m6502;						// 1, assembling 6502 code
 int as68_flag;					// as68 kludge mode
 int glob_flag;					// Assume undefined symbols are global
 int lsym_flag;					// Include local symbols in object file
@@ -36,6 +39,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 dsp56001;					// Assembling DSP 56001 code
 int list_fd;					// File to write listing to
 int regbank;					// RISC register bank
 int segpadsize;					// Segment padding size
@@ -45,7 +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 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.
@@ -123,22 +130,26 @@ 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"
 		"                    b: BSD (use this for Jaguar)\n"
 		"                    e: ELF\n"
+		"                    x: com/exe/xex (Atari 800)\n"
 		"  -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"
 		"  -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"
+		"                    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"
 		"  ~o[value]         Turn a specific optimisation off\n"
 		"  +oall             Turn all optimisations on\n"
 		"  ~oall             Turn all optimisations off\n"
@@ -250,6 +261,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
 
 	// Initialise modules
 	InitSymbolTable();				// Symbol table
@@ -260,9 +272,10 @@ int Process(int argc, char ** argv)
 	InitMark();						// Mark tape-recorder
 	InitMacro();					// Macro processor
 	InitListing();					// Listing generator
+	Init6502();						// 6502 assembler
 
 	// Process command line arguments and assemble source files
-	for(argno=0; argno<argc; ++argno)
+	for(argno=0; argno<argc; argno++)
 	{
 		if (*argv[argno] == '-')
 		{
@@ -318,6 +331,10 @@ int Process(int argc, char ** argv)
 				case 'E':
 					obj_format = ELF;
 					break;
+				case 'x':			// -fx = COM/EXE/XEX
+				case 'X':
+					obj_format = XEX;
+					break;
 				default:
 					printf("-f: unknown object format specified\n");
 					errcnt++;
@@ -334,7 +351,16 @@ int Process(int argc, char ** argv)
 				break;
 			case 'l':				// Produce listing file
 			case 'L':
-				list_fname = argv[argno] + 2;
+				if (*(argv[argno] + 2) == '*')
+				{
+					list_fname = argv[argno] + 3;
+					list_pag = 0;    // Special case - turn off pagination
+				}
+				else
+				{
+					list_fname = argv[argno] + 2;
+				}
+
 				listing = 1;
 				list_flag = 1;
 				lnsave++;
@@ -375,7 +401,7 @@ int Process(int argc, char ** argv)
 
 					default:
 						printf("-p: syntax error\n");
-						++errcnt;
+						errcnt++;
 						return errcnt;
 				}
 
@@ -423,7 +449,7 @@ int Process(int argc, char ** argv)
 				if (pagelen < 10)
 				{
 					printf("-y: bad page length\n");
-					++errcnt;
+					errcnt++;
 					return errcnt;
 				}
 
@@ -492,6 +518,8 @@ int Process(int argc, char ** argv)
 	// o  save current section (no more code generation)
 	// o  do auto-even of all sections (or boundary alignment as requested
 	//    through '-r')
+    // o  save the last pc value for 6502 (if we used 6502 at all) and
+    //    detemine if the last section contains anything
 	// o  determine name of object file:
 	//    -  "foo.o" for linkable output;
 	//    -  "foo.prg" for GEMDOS executable (-p flag).
@@ -513,6 +541,14 @@ int Process(int argc, char ** argv)
 		SaveSection();
 	}
 
+	SwitchSection(M6502);
+
+	if (sloc != currentorg[0])
+	{
+		currentorg[1] = sloc;
+		currentorg += 2;
+	}
+
 	if (objfname == NULL)
 	{
 		if (firstfname == NULL)
@@ -592,15 +628,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