X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=procln.c;h=79c0db26f107627ab0826f7dc7b1169e945e6773;hp=600aaa0e9685438bdf0504032ac73fe7f8ef7a53;hb=05d0350b35a6a6b255cb2a3fab7796f5d4ee4d02;hpb=c3bb316d42b8471dbe87fa4b8c9787265e7b01da

diff --git a/procln.c b/procln.c
index 600aaa0..79c0db2 100644
--- a/procln.c
+++ b/procln.c
@@ -36,8 +36,8 @@
 
 IFENT * ifent;					// Current ifent
 static IFENT ifent0;			// Root ifent
-static IFENT * f_ifent;			// Freelist of ifents
-static int disabled;			// Assembly conditionally disabled
+IFENT * f_ifent;				// Freelist of ifents
+int disabled;					// Assembly conditionally disabled
 int just_bss;					// 1, ds.b in microprocessor mode
 VALUE pcloc;					// Value of "PC" at beginning of line
 SYM * lab_sym;					// Label on line (or NULL)
@@ -95,7 +95,7 @@ LONG amsktab[0124] = {
 	0L,				// 0115
 	0L,				// 0116
 	0L,				// 0117
-	M_CREG,			// 0120 (caches - TODO: is this correct or does it need its own bitfield?)
+    M_CACHE40,									    // 0120
 	M_CREG,			// 0121
 	M_FREG,			// 0122
 	M_FPSCR			// 0123
@@ -269,22 +269,17 @@ as68label:
 	// Check for ".b" ".w" ".l" after directive, macro or mnemonic.
 	siz = SIZN;
 
-	if (*tok == DOTW)
-		siz = SIZW, tok++;
-	else if (*tok == DOTL)
-		siz = SIZL, tok++;
-	else if (*tok == DOTB)
-		siz = SIZB, tok++;
-	else if(*tok == DOTD)
-		siz = SIZD, tok++;
-	else if(*tok == DOTP)
-		siz = SIZP, tok++;
-	else if(*tok == DOTQ)
-		siz = SIZQ, tok++;
-	else if(*tok == DOTS)
-		siz = SIZS, tok++;
-	else if(*tok == DOTX)
-		siz = SIZX, tok++;
+    switch (*tok)
+    {
+    case DOTW: siz = SIZW, tok++; break;
+    case DOTL: siz = SIZL, tok++; break;
+    case DOTB: siz = SIZB, tok++; break;
+    case DOTD: siz = SIZD, tok++; break;
+    case DOTP: siz = SIZP, tok++; break;
+    case DOTQ: siz = SIZQ, tok++; break;
+    case DOTS: siz = SIZS, tok++; break;
+    case DOTX: siz = SIZX, tok++; break;
+    }
 
 
 	// Do special directives (500..999) (These must be handled in "real time")
@@ -294,13 +289,16 @@ as68label:
 		{
 		case MN_IF:
 			d_if();
-		goto loop;
+			goto loop;
+
 		case MN_ELSE:
 			d_else();
 			goto loop;
+
 		case MN_ENDIF:
 			d_endif();
 			goto loop;
+
 		case MN_IIF:						// .iif --- immediate if
 			if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)
 				goto loop;
@@ -321,6 +319,7 @@ as68label:
 				goto loop;
 
 			goto loop1;
+
 		case MN_MACRO:						// .macro --- macro definition
 			if (!disabled)
 			{
@@ -332,6 +331,7 @@ as68label:
 			}
 
 			goto loop;
+
 		case MN_EXITM:						// .exitm --- exit macro
 		case MN_ENDM:						// .endm --- same as .exitm
 			if (!disabled)
@@ -343,6 +343,7 @@ as68label:
 			}
 
 			goto loop;
+
 		case MN_REPT:
 			if (!disabled)
 			{
@@ -353,10 +354,11 @@ as68label:
 						goto loop;
 				}
 
-				DefineRept();
+				HandleRept();
 			}
 
 			goto loop;
+
 		case MN_ENDR:
 			if (!disabled)
 				error("mis-nested .endr");
@@ -775,6 +777,8 @@ int HandleLabel(char * label, int labelType)
 
 	lab_sym = symbol;
 
+	// Yes, our CS professors told us to write checks for equality this way,
+	// but damn, it hurts my brain every time I look at it. :-/
 	if (0 == environment)
 		curenv++;
 
@@ -791,77 +795,3 @@ int HandleLabel(char * label, int labelType)
 }
 
 
-//
-// .if, Start conditional assembly
-//
-int d_if(void)
-{
-	IFENT * rif;
-	WORD eattr;
-	VALUE eval;
-	SYM * esym;
-
-	// Alloc an IFENTRY
-	if ((rif = f_ifent) == NULL)
-		rif = (IFENT *)malloc(sizeof(IFENT));
-	else
-		f_ifent = rif->if_prev;
-
-	rif->if_prev = ifent;
-	ifent = rif;
-
-	if (!disabled)
-	{
-		if (expr(exprbuf, &eval, &eattr, &esym) != OK)
-			return 0;
-
-		if ((eattr & DEFINED) == 0)
-			return error(undef_error);
-
-		disabled = !eval;
-	}
-
-	rif->if_state = (WORD)disabled;
-	return 0;
-}
-
-
-//
-// .else, Do alternate case for .if
-//
-int d_else(void)
-{
-	IFENT * rif = ifent;
-
-	if (rif->if_prev == NULL)
-		return error("mismatched .else");
-
-	if (disabled)
-		disabled = rif->if_prev->if_state;
-	else
-		disabled = 1;
-
-	rif->if_state = (WORD)disabled;
-	return 0;
-}
-
-
-//
-// .endif, End of conditional assembly block
-// This is also called by fpop() to pop levels of IFENTs in case a macro or
-// include file exits early with `exitm' or `end'.
-//
-int d_endif (void)
-{
-	IFENT * rif = ifent;
-
-	if (rif->if_prev == NULL)
-		return error("mismatched .endif");
-
-	ifent = rif->if_prev;
-	disabled = rif->if_prev->if_state;
-	rif->if_prev = f_ifent;
-	f_ifent = rif;
-	return 0;
-}
-