X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=e7a23bd615bd6e45fb8e86309298e38a73f0ba15;hp=efec94a2f438fd63d3a3931f14567cfea8efa690;hb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608;hpb=062214e62031c26d372edc2e68473ebb64f6a506

diff --git a/direct.c b/direct.c
index efec94a..e7a23bd 100644
--- a/direct.c
+++ b/direct.c
@@ -108,26 +108,27 @@ int d_org(void)
 	}
 
 	orgaddr = address;
-	orgactive = 1;  
+	orgactive = 1;
+//printf("ORG: address = $%08X...\n", orgaddr);
 
 	return 0;
 }
 
 
 //
-// Print Directive
+// Print directive
 //
 int d_print(void)
 {
-	char prntstr[LNSIZ];					// String for PRINT directive
-	char format[LNSIZ];						// Format for PRINT directive
-	int formatting = 0;						// Formatting on/off
-	int wordlong = 0;						// WORD = 0, LONG = 1
-	int outtype = 0;						// 0:hex, 1:decimal, 2:unsigned
-
-	VALUE eval;								// Expression value
-	WORD eattr;								// Expression attributes
-	SYM * esym;								// External symbol involved in expr.
+	char prntstr[LNSIZ];		// String for PRINT directive
+	char format[LNSIZ];			// Format for PRINT directive
+	int formatting = 0;			// Formatting on/off
+	int wordlong = 0;			// WORD = 0, LONG = 1
+	int outtype = 0;			// 0:hex, 1:decimal, 2:unsigned
+
+	VALUE eval;					// Expression value
+	WORD eattr;					// Expression attributes
+	SYM * esym;					// External symbol involved in expr.
 	TOKEN r_expr[EXPRSIZE];
 
 	while (*tok != EOL)
@@ -213,7 +214,7 @@ token_err:
 
 
 //
-// Undefine an Equated Condition Code
+// Undefine an equated condition code
 //
 int d_ccundef(void)
 {
@@ -250,7 +251,7 @@ int d_ccundef(void)
 
 
 //
-// Undefine an Equated Register
+// Undefine an equated register
 //
 int d_equrundef(void)
 {
@@ -274,7 +275,12 @@ int d_equrundef(void)
 		regname = lookup(string[tok[1]], LABEL, 0);
 
 		if (regname && (regname->sattre & EQUATEDREG))
+		{
+			// Reset the attributes of this symbol...
+			regname->sattr = 0;
+			regname->sattre &= ~(EQUATEDREG | BANK_0 | BANK_1);
 			regname->sattre |= UNDEF_EQUR;
+		}
 
 		// Skip over symbol token and address
 		tok += 2;
@@ -285,7 +291,7 @@ int d_equrundef(void)
 
 
 //
-// Do Not Allow the Use of the CLR.L Opcode
+// Do not allow use of the CLR.L opcode
 //
 int d_noclear(void)
 {
@@ -294,7 +300,7 @@ int d_noclear(void)
 
 
 // 
-// Include Binary File
+// Include binary file
 //
 int d_incbin(void)
 {
@@ -312,7 +318,6 @@ int d_incbin(void)
 
 	if (*tok != STRING)
 	{
-//		error(syntax_error);
 		error("syntax error; string missing");
 		return ERROR;
 	}
@@ -339,7 +344,6 @@ int d_incbin(void)
 		return ERROR;
 	}
 
-//#define D_byte(b)    {*chptr++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;}
 	memcpy(chptr, fileBuffer, size);
 	chptr += size;
 	sloc += size;
@@ -355,7 +359,7 @@ int d_incbin(void)
 
 
 // 
-// Set RISC Register Banks
+// Set RISC register banks
 //
 int d_regbank0(void)
 {
@@ -374,11 +378,37 @@ int d_regbank1(void)
 
 
 //
-// Adjust Location to an EVEN Value
+// Helper function, to cut down on mistakes & typing
+//
+static inline void SkipBytes(unsigned bytesToSkip)
+{
+	if (!bytesToSkip)
+		return;
+
+	if ((scattr & SBSS) == 0)
+	{
+		chcheck(bytesToSkip);
+		D_ZEROFILL(bytesToSkip);
+	}
+	else
+	{
+		sloc += bytesToSkip;
+
+		if (orgactive)
+			orgaddr += bytesToSkip;
+	}
+}
+
+
+//
+// Adjust location to an EVEN value
 //
 int d_even(void)
 {
-	if (sloc & 1)
+	unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
+	
+//	if (sloc & 1)
+	if (skip)
 	{
 		if ((scattr & SBSS) == 0)
 		{
@@ -387,7 +417,10 @@ int d_even(void)
 		}
 		else
 		{
-			++sloc;
+			sloc++;
+
+			if (orgactive)
+				orgaddr++;
 		}
 	}
 
@@ -396,137 +429,61 @@ int d_even(void)
 
 
 //
-// Adjust Location to an LONG Value
+// Adjust location to a LONG value
 //
 int d_long(void)
 {
-	unsigned i;
-	unsigned val = 4;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
+	unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
 
 
 //
-// Adjust Location to an PHRASE Value
+// Adjust location to a PHRASE value
+//
+// N.B.: We have to handle the GPU/DSP cases separately because you can embed
+//       RISC code in the middle of a regular 68K section. Also note that all
+//       of the alignment pseudo-ops will have to be fixed this way.
+//
+// This *must* behave differently when in a RISC section, as following sloc
+// (instead of orgaddr) will fuck things up royally. Note that we do it this
+// way because you can embed RISC code in a 68K section, and have the origin
+// pointing to a different alignment in the RISC section than the 68K section.
 //
 int d_phrase(void)
 {
-	unsigned i;
-	unsigned val = 8;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
+	unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
 
 
 //
-// Adjust Location to an DPHRASE Value
+// Adjust location to a DPHRASE value
 //
 int d_dphrase(void)
 {
-	unsigned i;
-	unsigned val = 16;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
+	unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
 
 
 //
-// Adjust Location to an QPHRASE Value
+// Adjust location to a QPHRASE value
 //
 int d_qphrase(void)
 {
-	unsigned i;
-	unsigned val = 32;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			SaveSection();
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
+	unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
@@ -540,20 +497,22 @@ int d_qphrase(void)
 // which is OK since multiple labels are only allowed in AS68 kludge mode, and
 // the C compiler is VERY paranoid and uses ".even" whenever it can
 //
+// N.B.: This probably needs the same fixes as above...
+//
 void auto_even(void)
 {
 	if (scattr & SBSS)
-		++sloc;                                               // Bump BSS section
+		sloc++;				// Bump BSS section
 	else
-		D_byte(0)                                             // Deposit 0.b in non-BSS
+		D_byte(0);			// Deposit 0.b in non-BSS
 
-	if (lab_sym != NULL)                                      // Bump label if we have to
-		++lab_sym->svalue;
+	if (lab_sym != NULL)	// Bump label if we have to
+		lab_sym->svalue++;
 }
 
 
 //
-// Unimplemened Directive Error
+// Unimplemened directive error
 //
 int d_unimpl(void)
 {
@@ -750,9 +709,8 @@ int d_abs(void)
 
 
 //
-// Switch Segments
+// Switch segments
 //
-
 int d_text(void)
 {
 	if (rgpu || rdsp)
@@ -1225,7 +1183,7 @@ int d_68000(void)
 
 
 //
-// .gpu - Switch to GPU Assembler
+// .gpu - Switch to GPU assembler
 //
 int d_gpu(void)
 {
@@ -1238,9 +1196,11 @@ int d_gpu(void)
 	// If previous section was dsp or 68000 then we need to reset ORG'd Addresses
 	if (!rgpu)
 	{
+//printf("Resetting ORG...\n");
 		orgactive = 0;
 		orgwarning = 0;
 	}
+//else printf("NOT resetting ORG!\n");
 
 	rgpu = 1;			// Set GPU assembly
 	rdsp = 0;			// Unset DSP assembly
@@ -1250,7 +1210,7 @@ int d_gpu(void)
 
 
 //
-// .dsp - Switch to DSP Assembler
+// .dsp - Switch to DSP assembler
 //
 int d_dsp(void)
 {