X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=risca.c;h=472e4f1e3d1da6b068b0f55959c01bebb53a6b60;hp=868e1c5c465d934406a32599e5f511e402e0cf16;hb=9fb8931331db981c04e062a3ad36c0d79acb30ae;hpb=11a78647f7f170e6ea39dd04a3734a359151debb

diff --git a/risca.c b/risca.c
index 868e1c5..472e4f1 100644
--- a/risca.c
+++ b/risca.c
@@ -200,7 +200,6 @@ int GenerateRISCCode(int state)
 	SYM * sy;
 	int i, commaFound;
 	TOKEN * t;
-	WORD tdb;
 	WORD attrflg;
 	int indexed;				// Indexed register flag
 
@@ -344,12 +343,13 @@ int GenerateRISCCode(int state)
 		else
 		{
 			if (eattr & TDB)
-				rmark(cursect, sloc + 2, tdb, MLONG | MMOVEI, NULL);
-		}	
+//{
+//printf("risca: Doing rmark for RI_MOVEI (tdb=$%X)...\n", eattr & TDB);
+				rmark(cursect, sloc + 2, (eattr & TDB), (MLONG | MMOVEI), NULL);
+//}
+		}
 
-//		val = eval;
 		val = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
-//		tok++;	// assuming a comma here? tsk tsk
 		CHECK_COMMA;
 		reg2 = GetRegister(FU_REGTWO);
 		at_eol();
@@ -768,16 +768,7 @@ int GenerateRISCCode(int state)
 			}
 			else
 			{
-#if 0
-				val = eval;
-
-				if (orgactive)
-					reg2 = ((int)(val - (orgaddr + 2))) / 2;
-				else
-					reg2 = ((int)(val - (sloc + 2))) / 2;
-#else
-				reg2 = ((int)(eval - (orgactive ? orgaddr : sloc) + 2)) / 2;
-#endif
+				reg2 = ((int)(eval - ((orgactive ? orgaddr : sloc) + 2))) / 2;
 
 				if ((reg2 < -16) || (reg2 > 15))
 					error("PC relative overflow");