X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=debug.c;h=28784bfe5b4cbae1d5fe36da3e0eb71207bd7061;hp=0488aff4d6c2eee0658f0190bebfe408fe0ca6b2;hb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c;hpb=f7f625cf6c2f4b96854ac0e911ca2b1c249f4e05

diff --git a/debug.c b/debug.c
index 0488aff..28784bf 100644
--- a/debug.c
+++ b/debug.c
@@ -15,6 +15,7 @@
 
 
 static int siztab[4] = { 3, 5, 9, 9 };
+static PTR tp;
 
 
 //
@@ -34,33 +35,35 @@ int visprt(char c)
 //
 // Print expression, return ptr to just past the ENDEXPR
 //
-TOKEN * printexpr(TOKEN * tp)
+TOKEN * printexpr(TOKEN * tokenptr)
 {
-	if (tp != NULL)
+	if (tokenptr != NULL)
 	{
-		while (*tp != ENDEXPR)
+		while (*tokenptr != ENDEXPR)
 		{
-			switch ((int)*tp++)
+			switch ((int)*tokenptr++)
 			{
 			case SYMBOL:
-				printf("'%s' ", symbolPtr[*tp]->sname);
-				tp++;
+				printf("'%s' ", symbolPtr[*tokenptr]->sname);
+				tokenptr++;
 				break;
 			case CONST:
-				printf("$%X ", *tp++);
+				tp.u32 = tokenptr;
+				printf("$%lX ", *tp.u64++);
+				tokenptr = tp.u32;
 				break;
 			case ACONST:
-				printf("ACONST=($%X,$%X) ", *tp, tp[1]);
-				tp += 2;
+				printf("ACONST=($%X,$%X) ", *tokenptr, tokenptr[1]);
+				tokenptr += 2;
 				break;
 			default:
-				printf("%c ", (char)tp[-1]);
+				printf("%c ", (char)tokenptr[-1]);
 				break;
 			}
 		}
 	}
 
-	return tp + 1;
+	return tokenptr + 1;
 }
 
 
@@ -218,16 +221,16 @@ int mdump(char * start, LONG count, int flg, LONG base)
 		switch (flg & 3)
 		{
 		case 0:
-			printf("%02X ", start[i] & 0xff);
+			printf("%02X ", start[i] & 0xFF);
 			i++;
 			break;
 		case 1:
-			printf("%02X%02X ", start[i] & 0xff, start[i+1] & 0xff);
+			printf("%02X%02X ", start[i] & 0xFF, start[i+1] & 0xFF);
 			i += 2;
 			break;
 		case 2:
-			printf("%02X%02X%02X%02X ", start[i] & 0xff, start[i+1] & 0xff,
-				start[i+2] & 0xff, start[i+3] & 0xff);
+			printf("%02X%02X%02X%02X ", start[i] & 0xFF, start[i+1] & 0xFF,
+				start[i+2] & 0xFF, start[i+3] & 0xFF);
 			i += 4;
 			break;
 		case 3:
@@ -280,7 +283,9 @@ int dumptok(TOKEN * tk)
 		switch ((int)*tk++)
 		{
 		case CONST:                                        // CONST <value>
-			printf("CONST=%u", *tk++);
+			tp.u32 = tk;
+			printf("CONST=%lu", *tp.u64++);
+			tk = tp.u32;
 			break;
 		case STRING:                                       // STRING <address>
 			printf("STRING='%s'", string[*tk++]);
@@ -337,8 +342,9 @@ void DumpTokens(TOKEN * tokenBuffer)
 			printf("[COLON]");
 		else if (*t == CONST)
 		{
-			t++;
-			printf("[CONST: $%X]", (uint32_t)*t);
+			tp.u32 = t + 1;
+			printf("[CONST: $%lX]", *tp.u64);
+			t += 2;
 		}
 		else if (*t == ACONST)
 		{