X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.c;h=619c1632b00879c72eda8bd132fa55a9c9e0a3f4;hp=7331cb3d765c4e867ce727cb39bce3b9e0c711d1;hb=66be644c3e5fbd7446d86c79e9e51b75c0442b49;hpb=d0c28c349ddfb8393568037f68bddbe8979ce0df

diff --git a/sect.c b/sect.c
index 7331cb3..619c163 100644
--- a/sect.c
+++ b/sect.c
@@ -36,6 +36,7 @@ CHUNK * scode;			// Current (last) code chunk
 LONG challoc;			// # bytes alloc'd to code chunk 
 LONG ch_size;			// # bytes used in code chunk 
 char * chptr;			// Deposit point in code chunk buffer 
+char * chptr_opcode;	// Backup of chptr, updated before entering code generators
 
 CHUNK * sfix;			// Current (last) fixup chunk
 LONG fchalloc;			// # bytes alloc'd to fixup chunk
@@ -274,7 +275,7 @@ 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 !!!"
+WARNING(!!! AddFixup() is filled with VOODOO !!!)
 	DEBUG printf("FIXUP@$%X: $%X\n", loc, attr);
 
 	// Compute length of expression (could be faster); determine if it's the
@@ -380,27 +381,6 @@ 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
 //
@@ -422,8 +402,8 @@ int ResolveFixups(int sno)
 	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;
@@ -630,45 +610,6 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); }
 					else
 						reg2 = (signed)((eval - (loc + 2)) / 2);// & 0x1F;
 
-#if 0
-					if ((w & 0x0F00) == FU_MJR)
-					{
-						// Main code destination alignment checking here for
-						// forward declared labels
-						address = (oaddr) ? oaddr : loc;
-
-						if (((address >= 0xF03000) && (address < 0xF04000)
-							&& (eval < 0xF03000)) || ((eval >= 0xF03000)
-							&& (eval < 0xF04000) && (address < 0xF03000)))
-						{
-							warni("* \'jr\' at $%08X - cannot jump relative between "
-								"main memory and local gpu ram", address);
-						}
-						else
-						{
-							page_jump = (address & 0xFFFFFF00) - (eval & 0xFFFFFF00);
-
-							if (page_jump)
-							{
-								// This jump is to a page outside of the
-								// current 256 byte page
-								if (eval % 4)
-								{
-									warni("* \'jr\' at $%08X - destination address not aligned for long page jump, insert a \'nop\' before the destination address", address);
-								}
-							}
-							else
-							{
-								// This jump is in the current 256 byte page
-								if ((eval - 2) % 4)
-								{
-									warni("* \'jr\' at $%08X - destination address not aligned for short page jump, insert a \'nop\' before the destination address", address);
-								}
-							}
-						}
-					}
-#endif
-
 					if ((reg2 < -16) || (reg2 > 15))
 					{
 						error("relative jump out of range");
@@ -795,58 +736,6 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); }
 			case FU_LONG:
 				if ((w & FUMASKRISC) == FU_MOVEI)
 				{
-#if 0
-					address = loc + 4;
-
-					if (eattr & DEFINED)
-					{
-						for(j=0; j<fwindex; j++)
-						{
-							if (fwdjump[j] == address)
-							{
-								page_jump = (address & 0xFFFFFF00) - (eval & 0xFFFFFF00);
-
-								if (page_jump)
-								{
-									if (eval % 4)
-									{
-										err_setup();
-										sprintf(buf, "* \'jump\' at $%08X - destination address not aligned for long page jump, insert a \'nop\' before the destination address", address);
-
-										if (listing > 0)
-											ship_ln(buf);
-
-										if (err_flag)
-											write(err_fd, buf, (LONG)strlen(buf));
-										else
-											printf("%s\n", buf);
-									}          
-								}
-								else
-								{
-									if (!(eval & 0x0000000F) || ((eval - 2) % 4))
-									{
-										err_setup();
-										sprintf(buf, "* \'jump\' at $%08X - destination address not aligned for short page jump, insert a \'nop\' before the destination address", address);
-
-										if (listing > 0)
-											ship_ln(buf);
-
-										if (err_flag)
-											write(err_fd, buf, (LONG)strlen(buf));
-										else
-											printf("%s\n", buf);
-									}          
-								}
-
-								// Clear this jump as it has been checked
-								fwdjump[j] = 0;
-								j = fwindex;
-							}
-						}
-					}
-#endif
-
 					// Long constant in MOVEI # is word-swapped, so fix it here
 					eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
 					flags = (MLONG | MMOVEI);
@@ -915,3 +804,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;
+}
+
+