X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=procln.c;h=8739ce6db05630d2a1726efb0efdae67f9042c12;hp=727b9dbb5f5cb630544c4c95435b4a3387248572;hb=d0c28c349ddfb8393568037f68bddbe8979ce0df;hpb=bcd800a128cf43be03cf6a7ea54b4fc404b3ed8d

diff --git a/procln.c b/procln.c
index 727b9db..8739ce6 100644
--- a/procln.c
+++ b/procln.c
@@ -3,7 +3,7 @@
 // PROCLN.C - Line Processing
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "procln.h"
@@ -94,7 +94,7 @@ int HandleLabel(char *, int);
 
 
 //
-// Initialize Line Processor
+// Initialize line processor
 //
 void InitLineProcessor(void)
 {
@@ -106,7 +106,7 @@ void InitLineProcessor(void)
 
 
 //
-// Line Processor
+// Line processor
 //
 void Assemble(void)
 {
@@ -127,7 +127,6 @@ void Assemble(void)
 	SYM * sy, * sy2;			// Symbol (temp usage)
 	char * opname = NULL;		// Name of dirctve/mnemonic/macro
 	int listflag;				// 0: Don't call listeol()
-//	int as68mode = 0;			// 1: Handle multiple labels
 	WORD rmask;					// Register list, for REG
 	int registerbank;			// RISC register bank
 	int riscreg;				// RISC register
@@ -172,10 +171,9 @@ loop1:										// Internal line processing loop
 	if (*tok == EOL)						// Restart loop if end-of-line
 		goto loop;
 
-	// First token MUST be a symbol
+	// First token MUST be a symbol (Shamus: not sure why :-/)
 	if (*tok != SYMBOL)
 	{
-//		error(syntax_error);
 		error("syntax error; expected symbol");
 		goto loop;
 	}
@@ -194,28 +192,19 @@ loop1:										// Internal line processing loop
 	if (j == ':' || j == DCOLON)
 	{
 as68label:
-//		label = (char *)tok[1];				// Get label name
 		label = string[tok[1]];				// Get label name
 		labtyp = tok[2];					// Get label type
 		tok += 3;							// Go to next line token
 
-		// Handle multiple labels; if there's another label, go process it, 
-		// and come back at `as68label' above.
-		if (as68_flag)
+		// AS68 MODE:
+		// Looks like another label follows the previous one, so handle
+		// the previous one until there aren't any more
+		if (as68_flag && (*tok == SYMBOL && tok[2] == ':'))
 		{
-//			as68mode = 0;
-
-			// Looks like another label follows the previous one, so handle
-			// the previous one
-			if (*tok == SYMBOL && tok[2] == ':')
-			{
-//				as68mode = 1;
-//				goto do_label;
-				if (HandleLabel(label, labtyp) != 0)
-					goto loop;
+			if (HandleLabel(label, labtyp) != 0)
+				goto loop;
 
-				goto as68label;
-			}
+			goto as68label;
 		}
 	}
 
@@ -226,19 +215,11 @@ as68label:
 	// Next token MUST be a symbol
 	if (*tok++ != SYMBOL)
 	{
-//		error(syntax_error);
 		error("syntax error; expected symbol");
 		goto loop;
 	}
 
-// This is the problem here: On 64-bit platforms, this cuts the native pointer
-// in half. We need to figure out how to fix this.
-//#warning "!!! Bad pointer !!!"
-#if 0
-	opname = p = (char *)*tok++;			// Store opcode name here
-#else
 	opname = p = string[*tok++];
-#endif
 
 	// Check to see if the SYMBOL is a keyword (a mnemonic or directive).
 	// On output, `state' will have one of the values:
@@ -315,6 +296,7 @@ as68label:
 		case MN_MACRO:						// .macro --- macro definition
 			if (!disabled)
 			{
+				// Label on a macro definition is bad mojo... Warn the user
 				if (label != NULL)
 					warn(lab_ignored);
 
@@ -326,7 +308,6 @@ as68label:
 		case MN_ENDM:						// .endm --- same as .exitm
 			if (!disabled)
 			{
-				// Label on a macro definition is bad mojo... Warn the user
 				if (label != NULL)
 					warn(lab_ignored);
 
@@ -337,17 +318,12 @@ as68label:
 		case MN_REPT:
 			if (!disabled)
 			{
-#if 0
-				if (label != NULL)
-					warn(lab_ignored);
-#else
 				// Handle labels on REPT directive lines...
 				if (label)
 				{
 					if (HandleLabel(label, labtyp) != 0)
 						goto loop;
 				}
-#endif
 
 				defrept();
 			}
@@ -369,14 +345,7 @@ normal:
 	if (equate != NULL)
 	{
 		// Pick global or local symbol enviroment
-#if 0
-		j = 0;
-
-		if (*equate == '.')
-			j = curenv;
-#else
 		j = (*equate == '.' ? curenv : 0);
-#endif
 		sy = lookup(equate, LABEL, j);
 
 		if (sy == NULL)
@@ -402,7 +371,7 @@ normal:
 			{
 //REALLY?				sy->sattre |= ~UNDEF_EQUR; 
 				sy->sattre &= ~UNDEF_EQUR; 
-				sy->svalue  = 0;
+				sy->svalue = 0;
 			}
 			else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
 			{
@@ -417,9 +386,8 @@ normal:
 			}
 		}
 
-		// Put symbol in "order of definition" list
-		if (!(sy->sattr & SDECLLIST))
-			sym_decl(sy);
+		// Put symbol in "order of definition" list if it's not already there
+		AddToSymbolDeclarationList(sy);
 
 		// Parse value to equate symbol to;
 		// o  .equr
@@ -445,7 +413,8 @@ checking to see if it's already been equated, issue a warning.
 			// Check for register to equate to
 			if ((*tok >= KW_R0) && (*tok <= KW_R31))
 			{
-				sy->sattre  = EQUATEDREG | RISCSYM;	// Mark as equated register
+//				sy->sattre  = EQUATEDREG | RISCSYM;	// Mark as equated register
+				sy->sattre  = EQUATEDREG;	// Mark as equated register
 				riscreg = (*tok - KW_R0);
 //is there any reason to do this, since we're putting this in svalue?
 //i'm thinking, no. Let's test that out! :-D
@@ -480,9 +449,9 @@ checking to see if it's already been equated, issue a warning.
 // What needs to happen here is to prime registerbank with regbank, then use
 // registerbank down below for the bank marking.
 #warning "!!! regbank <-> registerbank confusion here !!!"
-// The question here is why, if we're allowed to override the ".regbankN" rules above,
-// then why is it using the one set by the directive in the extended attributes and
-// not in what ends up in symbol->svalue?
+// The question here is why, if we're allowed to override the ".regbankN" rules
+// above, then why is it using the one set by the directive in the extended
+// attributes and not in what ends up in symbol->svalue?
 // ".regbankN" is not an original Madmac directive, so it's suspect
 				sy->sattre |= regbank;		// Store register bank
 #endif
@@ -576,76 +545,22 @@ checking to see if it's already been equated, issue a warning.
 			goto loop;
 		}
 
-		sy->sattr |= eattr | EQUATED;		// Symbol inherits value and attributes
+		sy->sattr |= eattr | EQUATED;	// Symbol inherits value and attributes
 		sy->svalue = eval;
 
-		if (list_flag)						// Put value in listing
+		if (list_flag)					// Put value in listing
 			listvalue(eval);
 
-		at_eol();							// Must be at EOL now
+		at_eol();						// Must be at EOL now
 		goto loop;
 	}
 
 	// Do labels
 	if (label != NULL)
 	{
-do_label:
-#if 0
-		// Check for dot in front of label; means this is a local label if present
-		j = (*label == '.' ? curenv : 0);
-		sy = lookup(label, LABEL, j);
-
-		if (sy == NULL)
-		{
-			sy = NewSymbol(label, LABEL, j);
-			sy->sattr = 0;
-			sy->sattre = RISCSYM;
-		}
-		else if (sy->sattr & DEFINED)
-		{
-			errors("multiply-defined label '%s'", label);
-			goto loop;
-		}
-
-		// Put symbol in "order of definition" list
-		if (!(sy->sattr & SDECLLIST))
-			sym_decl(sy);
-
-		if (orgactive)
-		{
-			sy->svalue = orgaddr;
-			sy->sattr |= ABS | DEFINED | EQUATED;
-		}
-		else
-		{
-			sy->svalue = sloc;
-			sy->sattr |= DEFINED | cursect;
-		}
-
-		lab_sym = sy;
-
-		if (!j)
-			curenv++;
-
-		// Make label global
-		if (labtyp == DCOLON)
-		{
-			if (j)
-			{
-				error(locgl_error);
-				goto loop;
-			}
-
-			sy->sattr |= GLOBAL;
-		}
-#else
 		// Non-zero == error occurred
 		if (HandleLabel(label, labtyp) != 0)
 			goto loop;
-#endif
-		// If we're in as68 mode, and there's another label, go back and handle it
-//		if (as68_flag && as68mode)
-//			goto as68label;
 	}
 
 	// Punt on EOL
@@ -714,10 +629,10 @@ do_label:
 		goto loop;
 	}
 
-	if (sloc & 1)							// Automatic .even
+	if (sloc & 1)					// Automatic .even
 		auto_even();
 
-	if (challoc - ch_size < 18)				// Make sure have space in current chunk
+	if (challoc - ch_size < 18)		// Make sure have space in current chunk
 		chcheck(0);
 
 	m = &machtab[state - 1000];
@@ -729,7 +644,7 @@ do_label:
 		goto loop;
 	}
 
-	if (amode(1) < 0)						// Parse 0, 1 or 2 addr modes
+	if (amode(1) < 0)				// Parse 0, 1 or 2 addr modes
 		goto loop;
 
 	if (*tok != EOL)
@@ -765,45 +680,45 @@ do_label:
 int HandleLabel(char * label, int labelType)
 {
 	// Check for dot in front of label; means this is a local label if present
-	int j = (*label == '.' ? curenv : 0);
-	SYM * sy = lookup(label, LABEL, j);
+	int environment = (*label == '.' ? curenv : 0);
+	SYM * symbol = lookup(label, LABEL, environment);
 
-	if (sy == NULL)
+	if (symbol == NULL)
 	{
-		sy = NewSymbol(label, LABEL, j);
-		sy->sattr = 0;
-		sy->sattre = RISCSYM;
+		symbol = NewSymbol(label, LABEL, environment);
+		symbol->sattr = 0;
+//		symbol->sattre = RISCSYM;
+		symbol->sattre = 0;
 	}
-	else if (sy->sattr & DEFINED)
+	else if (symbol->sattr & DEFINED)
 		return errors("multiply-defined label '%s'", label);
 
-	// Put symbol in "order of definition" list
-	if (!(sy->sattr & SDECLLIST))
-		sym_decl(sy);
+	// Put symbol in "order of definition" list if it's not already in it
+	AddToSymbolDeclarationList(symbol);
 
 	if (orgactive)
 	{
-		sy->svalue = orgaddr;
-		sy->sattr |= ABS | DEFINED | EQUATED;
+		symbol->svalue = orgaddr;
+		symbol->sattr |= ABS | DEFINED | EQUATED;
 	}
 	else
 	{
-		sy->svalue = sloc;
-		sy->sattr |= DEFINED | cursect;
+		symbol->svalue = sloc;
+		symbol->sattr |= DEFINED | cursect;
 	}
 
-	lab_sym = sy;
+	lab_sym = symbol;
 
-	if (!j)
+	if (0 == environment)
 		curenv++;
 
 	// Make label global if it has a double colon
 	if (labelType == DCOLON)
 	{
-		if (j)
+		if (environment != 0)
 			return error(locgl_error);
 
-		sy->sattr |= GLOBAL;
+		symbol->sattr |= GLOBAL;
 	}
 
 	return 0;
@@ -811,7 +726,7 @@ int HandleLabel(char * label, int labelType)
 
 
 // 
-// .if, Start Conditional Assembly
+// .if, Start conditional assembly
 //
 int d_if(void)
 {
@@ -846,7 +761,7 @@ int d_if(void)
 
 
 // 
-// .else, Do Alternate Case For .if
+// .else, Do alternate case for .if
 //
 int d_else(void)
 {
@@ -883,3 +798,4 @@ int d_endif (void)
 	f_ifent = rif;
 	return 0;
 }
+