X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.c;h=6dd9475d7db3b7a7aa848820977d45f2e78bdf75;hp=eab212522bc526d46346baa01c2c4de910fb607d;hb=82307651be6db411532b317a5ebc6edd933eea8d;hpb=d16b8ea0ee65b2ad901ca6b0624c07e6e4930cc4

diff --git a/rmac.c b/rmac.c
index eab2125..6dd9475 100644
--- a/rmac.c
+++ b/rmac.c
@@ -15,7 +15,7 @@
 #include "sect.h"
 #include "mark.h"
 #include "macro.h"
-#include "risca.h"
+#include "riscasm.h"
 #include "direct.h"
 #include "version.h"
 #include "debug.h"
@@ -37,7 +37,6 @@ int rgpu, rdsp;						// Assembling Jaguar GPU or DSP code
 int list_fd;						// File to write listing to
 int regbank;						// RISC register bank
 int segpadsize;						// Segment padding size
-int in_main;						// In main memory flag for GPUMAIN
 int endian;							// Host processor endianess
 char * objfname;					// Object filename pointer
 char * firstfname;					// First source filename
@@ -66,7 +65,8 @@ static int qsz;                                             // Size of each reco
 static int thresh;                                          // THRESHold in chars 
 static int mthresh;                                         // MTHRESHold in chars
 
-
+// This is unused BOLLOCKS
+#if 0
 //
 // qst: Do a quicksort. First, find the median element, and put that one in the
 // first place as the discriminator. (This "median" is just the median of the
@@ -299,8 +299,9 @@ int rmac_qsort(char * base, int n, int size, int (*compar)())
 
 	return 0;
 }
+#endif
 
-
+#if 0
 //
 // Allocate memory; Panic and Quit if we Run Out
 //
@@ -338,6 +339,7 @@ char * amem(LONG amount)
 
 	return p;
 }
+#endif
 
 
 //
@@ -560,7 +562,6 @@ int process(int argc, char ** argv)
 	orgwarning = 0;					// No ORG warning issued
 	a_amount = 0;
 	segpadsize = 2;					// Initialise segment padding size
-	in_main = 0;
 
 	// Initialise modules
 	InitSymbolTable();				// Symbol table
@@ -569,11 +570,11 @@ int process(int argc, char ** argv)
 	init_expr();					// Expression analyzer
 	init_sect();					// Section manager / code generator
 	init_mark();					// Mark tape-recorder
-	init_macro();					// Macro processor
+	InitMacro();					// Macro processor
 	init_list();					// Listing generator
 
 	// Process command line arguments and assemble source files
-	for(argno = 0; argno < argc; ++argno)
+	for(argno=0; argno<argc; ++argno)
 	{
 		if (*argv[argno] == '-')
 		{
@@ -628,7 +629,7 @@ int process(int argc, char ** argv)
 					break;
 				default:
 					printf("-f: unknown object format specified\n");
-					++errcnt;
+					errcnt++;
 					return errcnt;
 				}
 				break;
@@ -645,7 +646,7 @@ int process(int argc, char ** argv)
 				list_fname = argv[argno] + 2;
 				listing = 1;
 				list_flag = 1;
-				++lnsave;
+				lnsave++;
 				break;
 			case 'o':                                       // Direct object file output
 			case 'O':
@@ -656,7 +657,7 @@ int process(int argc, char ** argv)
 					if (++argno >= argc)
 					{
 						printf("Missing argument to -o");
-						++errcnt;
+						errcnt++;
 						return errcnt;
 					}
 					objfname = argv[argno];
@@ -713,20 +714,20 @@ int process(int argc, char ** argv)
 					firstfname = defname;
 
 				include(0, "(stdin)");
-				assemble();
+				Assemble();
 				break;
 			case 'h':                                       // Display command line usage
 			case 'H':
 			case '?':
 				display_version();
 				display_help();
-				++errcnt;
+				errcnt++;
 				break;
 			default:
 				display_version();
 				printf("Unknown switch: %s\n\n", argv[argno]);
 				display_help();
-				++errcnt;
+				errcnt++;
 				break;
 			}
 		}
@@ -743,12 +744,12 @@ int process(int argc, char ** argv)
 			if (fd < 0)
 			{
 				printf("Cannot open: %s\n", fnbuf);
-				++errcnt;
+				errcnt++;
 				continue;
 			}
 
 			include(fd, fnbuf);
-			assemble();
+			Assemble();
 		}
 	}
 
@@ -853,27 +854,19 @@ int get_endianess(void)
 //
 int main(int argc, char ** argv)
 {
-	int status;
-	int i;
-
 	perm_verb_flag = 0;				// Clobber "permanent" verbose flag
 	cmdlnexec = argv[0];			// Obtain executable name
 
 	endian = get_endianess();		// Get processor endianess
 
-	for(i=0; i<MAXFWDJUMPS; i++)
-		fwdjump[i] = 0;
-
-	// Full command line passed
+	// If commands were passed in, process them
 	if (argc > 1)
 	{
-		status = process(argc - 1, argv + 1);              
-	}
-	else
-	{
-		display_version();
-		display_help();
+		return process(argc - 1, argv + 1);              
 	}
 
-	return status;
+	display_version();
+	display_help();
+
+	return 0;
 }