X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=symbol.c;h=80d2b3b52e13048f91f8c6f28cf579629659d95a;hp=b89cd8091587571de30190d93d932a025fe6ce36;hb=582df8950c285e1746d0c4a9e3ead6545c962dc8;hpb=ba392fd1c677a8aeb55cbaf81bc529f16c02e804

diff --git a/symbol.c b/symbol.c
index b89cd80..80d2b3b 100644
--- a/symbol.c
+++ b/symbol.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // SYMBOL.C - Symbol Handling
-// Copyright (C) 199x Landon Dyer, 2011-2012 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
 //
@@ -260,22 +260,6 @@ uint32_t sy_assign(uint8_t * buf, uint8_t *(* construct)())
 		}
 	}
 
-	// For ELF object mode run through all symbols in reference order
-	// and export all global-referenced labels. Not sure if this is
-	// required but it's here nonetheless
-/* why?? when you have sy_assign_ELF ???
-	if (obj_format == ELF)
-	{
-		for(sy=sdecl; sy!=NULL; sy=sy->sorder)
-		{
-			if ((sy->sattr == (GLOBAL | REFERENCED)) && (buf != NULL))
-			{
-				buf = (*construct)(buf, sy, 0);
-				scount++;
-			}
-		}
-	}*/
-
 	return scount;
 }
 
@@ -305,27 +289,12 @@ uint32_t sy_assign_ELF(uint8_t * buf, uint8_t *(* construct)())
 	// them. We also pick which symbols should be global or not here.
 	for(SYM * sy=sdecl; sy!=NULL; sy=sy->sdecl)
 	{
-		// Export or import external references, and export COMMON blocks.
-		//if ((sy->stype == LABEL)
-		//	&& ((sy->sattr & (GLOBAL | DEFINED)) == (GLOBAL | DEFINED)
-		//	|| (sy->sattr & (GLOBAL | REFERENCED)) == (GLOBAL | REFERENCED))
-		//	|| (sy->sattr & COMMON))
-		//{
-		//	sy->senv = (WORD)scount++;
-        //
-		//	if (buf != NULL)
-		//		buf = (*construct)(buf, sy, 1);
-		//}
 		// Export vanilla labels (but don't make them global). An exception is
 		// made for equates, which are not exported unless they are referenced.
 		if (sy->stype == LABEL && lsym_flag
 			&& (sy->sattr & (DEFINED | REFERENCED)) != 0
 			&& (*sy->sname != '.')
 			&& (sy->sattr & GLOBAL) == 0)
-		//if (sy->stype == 0)
-		//	if (lsym_flag)
-		//		if ((sy->sattr & (DEFINED | REFERENCED)) != 0)
-		//			if ((!as68_flag || *sy->sname != 'L'))
 		{
 			sy->senv = scount++;
 
@@ -382,7 +351,6 @@ void ToUppercase(uint8_t * s)
 //
 int symtable(void)
 {
-	extern int pagelen;
 	int i;
 	int j;
 	SYM * q = NULL;
@@ -390,8 +358,8 @@ int symtable(void)
 	SYM * r;
 	SYM * k;
 	SYM * colptr[4];
-	char ln[200];
-	char ln1[200];
+	char ln[1024];
+	char ln1[1024];
 	char ln2[20];
 	char c, c1;
 	WORD w;