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

diff --git a/amode.c b/amode.c
index 70b30e1..7ba5853 100644
--- a/amode.c
+++ b/amode.c
@@ -32,7 +32,7 @@ WORD a0exattr;				// Expression's attribute
 int a0ixreg;				// Index register
 int a0ixsiz;				// Index register size (and scale)
 TOKEN a0oexpr[EXPRSIZE];	// Outer displacement expression
-uint32_t a0oexval;			// Outer displacement value
+uint64_t a0oexval;			// Outer displacement value
 WORD a0oexattr;				// Outer displacement attribute
 SYM * a0esym;				// External symbol involved in expr
 TOKEN a0bexpr[EXPRSIZE];	// Base displacement expression
@@ -50,7 +50,7 @@ WORD a1exattr;				// Expression's attribute
 int a1ixreg;				// Index register
 int a1ixsiz;				// Index register size (and scale)
 TOKEN a1oexpr[EXPRSIZE];	// Outer displacement expression
-uint32_t a1oexval;			// Outer displacement value
+uint64_t a1oexval;			// Outer displacement value
 WORD a1oexattr;				// Outer displacement attribute
 SYM * a1esym;				// External symbol involved in expr
 TOKEN a1bexpr[EXPRSIZE];	// Base displacement expression
@@ -65,8 +65,8 @@ 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
-int bfval1;					//bfxxx / fmove value 1
-int bfval2;					//bfxxx / fmove value 2
+int bfval1;					// bfxxx / fmove value 1
+int bfval2;					// bfxxx / fmove value 2
 TOKEN bf0expr[EXPRSIZE];	// Expression
 uint64_t bf0exval;			// Expression's value
 WORD bf0exattr;				// Expression's attribute
@@ -88,7 +88,8 @@ int amode(int acount)
 	a0exattr = a0oexattr = a1exattr = a1oexattr = 0;
 	a0esym = a1esym = NULL;
 	a0bexpr[0] = a1bexpr[0] = ENDEXPR;
-	a0bexval = a0bsize = a0extension = a1bexval = a1bsize = a1extension = 0;
+	a0bexval = a1bexval = 0;
+	a0bsize = a0extension = a1bsize = a1extension = 0;
 	am0_030 = am1_030 = 0;
 	bfparam1 = bfparam2 = 0;
 	bf0expr[0] = ENDEXPR;
@@ -383,18 +384,18 @@ int fpu_reglist_right(WORD * a_rmask)
 //
 int check030bf(void)
 {
+	PTR tp;
 	CHECK00;
 	tok++;
 
 	if (*tok == CONST)
 	{
-		tok++;	// Skip the HI LONG
-		tok++;
-		bfval1 = *(int *)tok;
+		tp.u32 = tok + 1;
+		bfval1 = (int)*tp.u64++;
+		tok = tp.u32;
 
 		// Do=0, offset=immediate - shift it to place
 		bfparam1 = (0 << 11);
-		tok++;
 	}
 	else if (*tok == SYMBOL)
 	{
@@ -404,7 +405,7 @@ int check030bf(void)
 		if (!(bf0exattr & DEFINED))
 			return error("bfxxx offset: immediate value must evaluate");
 
-		bfval1 = bf0exval;
+		bfval1 = (int)bf0exval;
 
 		// Do=0, offset=immediate - shift it to place
 		bfparam1 = (0 << 11);
@@ -419,8 +420,9 @@ int check030bf(void)
 	else
 		return ERROR;
 
-	if (*tok==':')
-		tok++;	//eat the ':'
+	// Eat the ':', if any
+	if (*tok == ':')
+		tok++;
 
 	if (*tok == '}' && tok[1] == EOL)
 	{
@@ -431,20 +433,19 @@ int check030bf(void)
 
 	if (*tok == CONST)
 	{
-		tok++;	// Skip the HI LONG
-		tok++;
-		bfval2 = *(int *)tok;
+		tp.u32 = tok + 1;
+		bfval2 = (int)*tp.u64++;
+		tok = tp.u32;
 
 		// Do=0, offset=immediate - shift it to place
 		bfparam2 = (0 << 5);
-		tok++;
 	}
 	else if (*tok == SYMBOL)
 	{
 		if (expr(bf0expr, &bf0exval, &bf0exattr, &bf0esym) != OK)
 			return ERROR;
 
-		bfval2 = bf0exval;
+		bfval2 = (int)bf0exval;
 
 		if (!(bf0exattr & DEFINED))
 			return error("bfxxx width: immediate value must evaluate");
@@ -455,7 +456,7 @@ int check030bf(void)
 	else if ((*tok >= KW_D0) && (*tok <= KW_D7))
 	{
 		// Do=1, offset=data register - shift it to place
-		bfval2 = ((*(int *)tok - 128));
+		bfval2 = (*(int *)tok - 128);
 		bfparam2 = (1 << 5);
 		tok++;
 	}