X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=sect.c;h=64ccb441b759cb6f212fc96faf5210bbc4ee045e;hb=c74d8ef6f193cb2be876c920c5cb7f599dd5418a;hp=1ff54b4075e50a1d0274a355546fd089f4f00480;hpb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608;p=rmac

diff --git a/sect.c b/sect.c
index 1ff54b4..64ccb44 100644
--- a/sect.c
+++ b/sect.c
@@ -3,7 +3,7 @@
 // SECT.C - Code Generation, Fixups and Section Management
 // 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 "sect.h"
@@ -80,10 +80,10 @@ void InitSection(void)
 		MakeSection(i, 0);
 
 	// Construct default sections, make TEXT the current section
-	MakeSection(ABS,   SUSED | SABS | SBSS);		// ABS
-	MakeSection(TEXT,  SUSED | TEXT       );		// TEXT
-	MakeSection(DATA,  SUSED | DATA       );		// DATA
-	MakeSection(BSS,   SUSED | BSS  | SBSS);		// BSS
+	MakeSection(ABS,  SUSED | SABS | SBSS);		// ABS
+	MakeSection(TEXT, SUSED | TEXT       );		// TEXT
+	MakeSection(DATA, SUSED | DATA       );		// DATA
+	MakeSection(BSS,  SUSED | BSS  | SBSS);		// BSS
 //	MakeSection(M6502, SUSED | TEXT       );		// 6502 code section
 
 	// Switch to TEXT for starters
@@ -274,7 +274,11 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr)
 	SECT * p;
 	// Shamus: Expression lengths are voodoo ATM (variable "i"). Need to fix
 	//         this.
-#warning "!!! AddFixup() is filled with VOODOO !!!"
+#ifndef _MSC_VER
+#pragma warning "!!! AddFixup() is filled with VOODOO !!!"
+#else
+#pragma WARNING(!!! AddFixup() is filled with VOODOO !!!)
+#endif
 	DEBUG printf("FIXUP@$%X: $%X\n", loc, attr);
 
 	// Compute length of expression (could be faster); determine if it's the
@@ -287,18 +291,21 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr)
 		// NYAN !
 		if ((attr & FUMASKRISC) == FU_JR)
 		{
+//printf("AddFixup: ((attr & FUMASKRISC) == FU_JR)\n");
 //			i = 18;
 //			i = FIXUP_BASE_SIZE + (sizeof(LONG) * 2);
 			i = FIXUP_BASE_SIZE + sizeof(SYM *) + sizeof(LONG);
 		}
 		else
 		{
+//printf("AddFixup: ((attr & FUMASKRISC) == FU_JR) ELSE\n");
 //			i = 14;
 			i = FIXUP_BASE_SIZE + sizeof(SYM *);
 		}
 	}
 	else
 	{
+//printf("AddFixup: !SYMBOL\n");
 		attr |= FU_EXPR;
 
 		for(len=0; fexpr[len]!=ENDEXPR; len++)
@@ -312,7 +319,7 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr)
 		i = FIXUP_BASE_SIZE + sizeof(WORD) + (len * sizeof(TOKEN));
 	}
 
-	// Maybe alloc another fixup chunk for this one to fit in
+	// Alloc another fixup chunk for this one to fit in if necessary
 	if ((fchalloc - fchsize) < i)
 	{
 		p = &sect[cursect];
@@ -360,6 +367,7 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr)
 	{
 //		*fchptr.lp++ = (LONG)fexpr[1];
 		*fchptr.sy++ = symbolPtr[fexpr[1]];
+//printf("AddFixup: adding symbol (%s) [%08X]\n", symbolPtr[fexpr[1]]->sname, symbolPtr[fexpr[1]]->sattr);
 	}
 
 	// SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN !
@@ -376,50 +384,29 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr)
 }
 
 
-//
-// Resolve all fixups
-//
-int ResolveAllFixups(void)
-{
-	unsigned i;
-	char buf[EBUFSIZ];
-
-	// Make undefined symbols GLOBL
-	if (glob_flag)
-		ForceUndefinedSymbolsGlobal();
-
-	DEBUG printf("Resolving TEXT sections...\n");
-	ResolveFixups(TEXT);
-	DEBUG printf("Resolving DATA sections...\n");
-	ResolveFixups(DATA);
-
-	return 0;
-}
-
-
 //
 // Resolve fixups in a section
 //
 int ResolveFixups(int sno)
 {
-	PTR fup;					// Current fixup
-	WORD * fuend;				// End of last fixup (in this chunk)
-	WORD w;						// Fixup word (type+modes+flags)
-	char * locp;				// Location to fix (in cached chunk) 
-	LONG loc;					// Location to fixup
-	VALUE eval;					// Expression value 
-	WORD eattr;					// Expression attrib
-	SYM * esym;					// External symbol involved in expr
-	SYM * sy;					// (Temp) pointer to a symbol
-	WORD i;						// (Temp) word
-	WORD tdb;					// eattr & TDB
+	PTR fup;				// Current fixup
+	WORD * fuend;			// End of last fixup (in this chunk)
+	WORD w;					// Fixup word (type+modes+flags)
+	char * locp;			// Location to fix (in cached chunk) 
+	LONG loc;				// Location to fixup
+	VALUE eval;				// Expression value 
+	WORD eattr;				// Expression attrib
+	SYM * esym;				// External symbol involved in expr
+	SYM * sy;				// (Temp) pointer to a symbol
+	WORD i;					// (Temp) word
+	WORD tdb;				// eattr & TDB
 	LONG oaddr;
 	int reg2;
 	WORD flags;
 	unsigned page_jump = 0;
 	unsigned address = 0;
-	unsigned j;
-	char buf[EBUFSIZ];
+	//unsigned j;
+	//char buf[EBUFSIZ];
 	
 	SECT * sc = &sect[sno];
 	CHUNK * ch = sc->sffix;
@@ -895,7 +882,8 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); }
 				break;
 
 			default:
-				interror(4);                                 // Bad fixup type
+				// Bad fixup type--this should *never* happen!
+				interror(4);
 				// NOTREACHED
 			}
 			continue;
@@ -910,3 +898,24 @@ range:
 	return 0;
 }
 
+//
+// Resolve all fixups
+//
+int ResolveAllFixups(void)
+{
+	//unsigned i;
+	//char buf[EBUFSIZ];
+
+	// Make undefined symbols GLOBL
+	if (glob_flag)
+		ForceUndefinedSymbolsGlobal();
+
+	DEBUG printf("Resolving TEXT sections...\n");
+	ResolveFixups(TEXT);
+	DEBUG printf("Resolving DATA sections...\n");
+	ResolveFixups(DATA);
+
+	return 0;
+}
+
+