X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=amode.c;h=175fe73fdaf79cd27012da9d48445bc58c2e4bef;hp=7ba585349883a49b2fa1e897dd7060882f3a0e80;hb=0951a3e28907fbaf89a10c5201b71d8080ffe5a8;hpb=eace4e1b294ccec54a5c476619f616f5da0bf8a9

diff --git a/amode.c b/amode.c
index 7ba5853..175fe73 100644
--- a/amode.c
+++ b/amode.c
@@ -61,7 +61,6 @@ WORD a1extension;			// 020+ extension address word
 WORD am1_030;				// ea bits for 020+ addressing modes
 
 int a2reg;					// Register for div.l (68020+)
-WORD mulmode;				// to distinguish between 32 and 64 bit multiplications (68020+)
 
 int bfparam1;				// bfxxx / fmove instruction parameter 1
 int bfparam2;				// bfxxx / fmove instruction parameter 2
@@ -186,25 +185,20 @@ int amode(int acount)
 
 		if ((*tok >= KW_D0) && (*tok <= KW_D7))
 		{
-			a2reg = (*tok - KW_D0);
-			mulmode = 1 << 10;
+			a2reg = (*tok++) & 7;
 		}
 		else if ((*tok >= KW_FP0) && (*tok <= KW_FP7))
 		{
-			a2reg = (*tok - KW_FP0);
-			mulmode = 1 << 10;
+			a2reg = (*tok++) & 7;
 		}
 		else
 			return error("a data or FPU register must follow a :");
-
-		*tok++;
 	}
 	else
 	{
 		// If no ':' is present then maybe we have something like divs.l d0,d1
 		// which sould translate to divs.l d0,d1:d1
 		a2reg = a1reg;
-		mulmode = 0;
 	}
 
 	nmodes = 2;
@@ -330,8 +324,8 @@ int fpu_reglist_left(WORD * a_rmask)
 int fpu_reglist_right(WORD * a_rmask)
 {
 	static WORD msktab_plus[] = {
-		0x0001, 0x0002, 0x0004, 0x0008,
-		0x0010, 0x0020, 0x0040, 0x0080
+		0x0080, 0x0040, 0x0020, 0x0010,
+		0x0008, 0x0004, 0x0002, 0x0001
 	};
 
 	WORD rmask = 0;