X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=symbol.c;h=9ba661fc3fa931609a7f34eb1c95c5aa84d33d6c;hp=2edf9fd2f564066ee0324a4fca2a6909aaae4475;hb=d0c28c349ddfb8393568037f68bddbe8979ce0df;hpb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608

diff --git a/symbol.c b/symbol.c
index 2edf9fd..9ba661f 100644
--- a/symbol.c
+++ b/symbol.c
@@ -3,7 +3,7 @@
 // SYMBOL.C - Symbol Handling
 // Copyright (C) 199x Landon Dyer, 2011-2012 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 "symbol.h"
@@ -170,20 +170,23 @@ SYM * lookup(char * name, int type, int envno)
 //
 // Put symbol on "order-of-declaration" list of symbols
 //
-//void sym_decl(SYM * symbol)
-void AddToSymbolOrderList(SYM * symbol)
+void AddToSymbolDeclarationList(SYM * symbol)
 {
-	if (symbol->sattr & SDECLLIST)
-		return;								// Already on list
+	// Don't add if already on list, or it's an equated register/CC
+	if ((symbol->sattr & SDECLLIST)
+		|| (symbol->sattre & (EQUATEDREG | UNDEF_EQUR | EQUATEDCC | UNDEF_CC)))
+		return;
 
-	symbol->sattr |= SDECLLIST;				// Mark "already on list"
+	// Mark as "on .sdecl list"
+	symbol->sattr |= SDECLLIST;
 
 	if (sdecl == NULL)
-		sdecl = symbol;						// First on decl-list
+		sdecl = symbol;				// First on decl-list
 	else 
-		sdecltail->sdecl = symbol;			// Add to end of list
+		sdecltail->sdecl = symbol;	// Add to end of list
 
-	symbol->sdecl = NULL;					// Fix up list's tail
+	// Fix up list's tail
+	symbol->sdecl = NULL;
 	sdecltail = symbol;
 }
 
@@ -238,33 +241,18 @@ int sy_assign(char * buf, char *(* constr)())
 		// Append all symbols not appearing on the .sdecl list to the end of
 		// the .sdecl list
 		for(sy=sorder; sy!=NULL; sy=sy->sorder)
-		{
-			// Essentially the same as 'sym_decl()' above:
-			if (sy->sattr & SDECLLIST)
-				continue;				// Already on list 
-
-			sy->sattr |= SDECLLIST;		// Mark "on the list"
-
-			if (sdecl == NULL)
-				sdecl = sy;				// First on decl-list 
-			else
-				sdecltail->sdecl = sy;	// Add to end of list
-
-			sy->sdecl = NULL;			// Fix up list's tail
-			sdecltail = sy;
-		}
+			AddToSymbolDeclarationList(sy);
 	}
 
 	// Run through all symbols (now on the .sdecl list) and assign numbers to
 	// them. We also pick which symbols should be global or not here.
 	for(sy=sdecl; sy!=NULL; sy=sy->sdecl)
 	{
-		if (sy->sattre & UNDEF_EQUR)
-			continue;                 // Don't want undefined on our list
+		// Don't want register/CC or undefined on our list
+//these should already be rejected above...
+//		if (sy->sattre & (EQUATEDREG | UNDEF_EQUR | EQUATEDCC | UNDEF_CC)))
+//			continue;
 
-		if (sy->sattre & UNDEF_CC)
-			continue;                   
-		
 		// Export or import external references, and export COMMON blocks.
 		if ((sy->stype == LABEL)
 			&& ((sy->sattr & (GLOBAL | DEFINED)) == (GLOBAL | DEFINED)
@@ -283,7 +271,9 @@ int sy_assign(char * buf, char *(* constr)())
 			&& (!as68_flag || *sy->sname != 'L'))
 		{
 			sy->senv = (WORD)scount++;
-			if (buf != NULL) buf = (*constr)(buf, sy, 0);
+
+			if (buf != NULL)
+				buf = (*constr)(buf, sy, 0);
 		}
 	}