X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=3f021e7c495713f187d4193fd25a18bc5d191d7d;hp=615d84d7cdec1eea5d9c013093e4c85d501ed9b5;hb=29fa5dcf504b966803063a1c2891f58f97126d04;hpb=b57de9c1d9a47f152b590f1cdbd05a2910667ce4

diff --git a/rmac.c b/rmac.c
index 615d84d..3f021e7 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-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -10,6 +10,7 @@
 #include "6502.h"
 #include "debug.h"
 #include "direct.h"
+#include "dsp56k.h"
 #include "error.h"
 #include "expr.h"
 #include "listing.h"
@@ -33,12 +34,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 +57,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.
 //
@@ -136,6 +149,8 @@ void DisplayHelp(void)
 		"                    a: ALCYON (use this for ST)\n"
 		"                    b: BSD (use this for Jaguar)\n"
 		"                    e: ELF\n"
+		"                    p: P56 (use this for DSP56001 only)\n"
+		"                    l: LOD (use this for DSP56001 only)\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"
@@ -149,6 +164,7 @@ void DisplayHelp(void)
 		"                    6502\n"
 		"                    tom\n"
 		"                    jerry\n"
+		"                    56001\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"
@@ -168,6 +184,7 @@ void DisplayHelp(void)
 		"  ~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"
@@ -196,7 +213,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);
 }
 
@@ -269,6 +286,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
@@ -321,7 +339,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':
@@ -344,6 +362,14 @@ int Process(int argc, char ** argv)
 				case 'E':
 					obj_format = ELF;
 					break;
+                case 'l':           // -fl = LOD
+                case 'L':
+                    obj_format = LOD;
+                    break;
+                case 'p':           // -fp = P56
+                case 'P':
+                    obj_format = P56;
+					break;
 				case 'x':			// -fx = COM/EXE/XEX
 				case 'X':
 					obj_format = XEX;
@@ -430,7 +456,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])
 				{
@@ -443,6 +470,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++;
@@ -568,6 +600,7 @@ int Process(int argc, char ** argv)
 	//    -  "foo.o" for linkable output;
 	//    -  "foo.prg" for GEMDOS executable (-p flag).
 	SaveSection();
+	int temp_section = cursect;
 
 	for(i=TEXT; i<=BSS; i<<=1)
 	{
@@ -593,6 +626,20 @@ int Process(int argc, char ** argv)
 		currentorg += 2;
 	}
 
+	// This looks like an awful kludge...  !!! FIX !!!
+	if (temp_section & (M56001P | M56001X | M56001Y))
+	{
+		SwitchSection(temp_section);
+
+		if (chptr != dsp_currentorg->start)
+		{
+			dsp_currentorg->end = chptr;
+			dsp_currentorg++;
+		}
+	}
+
+	SwitchSection(TEXT);
+
 	if (objfname == NULL)
 	{
 		if (firstfname == NULL)
@@ -615,7 +662,7 @@ int Process(int argc, char ** argv)
 	if (errcnt == 0)
 	{
 		if ((fd = open(objfname, _OPEN_FLAGS, _PERM_MODE)) < 0)
-			cantcreat(objfname);
+			CantCreateFile(objfname);
 
 		if (verb_flag)
 		{