X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=6502.c;h=5978240a5bfe53be35059fb0b6820c78e6653532;hp=099c89d115f2ab208560b8705c2c0fb38ca02e5b;hb=66b362fa203d0850e8dce8045adb454e354c22ce;hpb=2161b198b7b333147c89ef0346d8e9bb6ab9ffd9

diff --git a/6502.c b/6502.c
index 099c89d..5978240 100644
--- a/6502.c
+++ b/6502.c
@@ -1,5 +1,9 @@
 //
-// 6502 Assembler
+// RMAC - Reboot's Macro Assembler for all Atari computers
+// 6502.C - 6502 Assembler
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
+// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
+// Source utilised with the kind permission of Landon Dyer
 //
 //    Init6502	initialization
 //    d_6502    handle ".6502" directive
@@ -162,8 +166,9 @@ static char a8internal[] =
     'y', 121, 'z', 122
 };
 
+
 //
-//  initialize 6502 assembler
+// Initialize 6502 assembler
 //
 void Init6502()
 {
@@ -203,26 +208,26 @@ void Init6502()
 	// Set up first org section (set to zero)
 	orgmap[0][0] = 0;
 
-    SwitchSection(M6502);	// Switch to 6502 section
-    //
-    // Initialise string conversion table(s)
-    //
-
-    char *p = a8internal;
-    memset(strtoa8, 31, 128);   // 31=fallback value ("?")
-    for (; p < a8internal + sizeof(a8internal); p += 2)
-    {
-        strtoa8[p[0]] = p[1];
-    }
-
-    if (challoc == 0) {
-        // Allocate and clear 64K of space for the 6502 section
-        chcheck(UPSEG_SIZE);
-        memset(sect[M6502].scode->chptr, 0, UPSEG_SIZE);
-    }
-    SwitchSection(TEXT);    // Go back to TEXT
+	SwitchSection(M6502);	// Switch to 6502 section
+
+	// Initialise string conversion table(s)
+	char * p = a8internal;
+	memset(strtoa8, 31, 128);   // 31=fallback value ("?")
+
+	for(; p<a8internal+sizeof(a8internal); p+=2)
+		strtoa8[p[0]] = p[1];
+
+	if (challoc == 0)
+	{
+		// Allocate and clear 64K of space for the 6502 section
+		chcheck(UPSEG_SIZE);
+		memset(sect[M6502].scode->chptr, 0, UPSEG_SIZE);
+	}
+
+	SwitchSection(TEXT);    // Go back to TEXT
 }
 
+
 //
 // .6502 --- enter 6502 mode
 //
@@ -242,7 +247,7 @@ void m6502cg(int op)
 {
 	register int amode;		// (Parsed) addressing mode
 	register int i;
-	VALUE eval;				// Expression value
+	uint64_t eval;			// Expression value
 	WORD eattr;				// Expression attributes
 	int zpreq;				// 1, optimize instr to zero-page form
 	register char * p;		// (Temp) string usage
@@ -253,7 +258,7 @@ void m6502cg(int op)
 	//
 	zpreq = 0;
 
-	switch ((int)*tok)
+	switch (tok[0])
 	{
 	case EOL:
 		amode = A65_IMPL;
@@ -265,6 +270,7 @@ void m6502cg(int op)
 		if (*tok == '>')
 		{
 			tok++;
+
 			if (expr(exprbuf, &eval, &eattr, NULL) < 0)
 				return;
 
@@ -274,6 +280,7 @@ void m6502cg(int op)
 		else if (*tok == '<')
 		{
 			tok++;
+
 			if (expr(exprbuf, &eval, &eattr, NULL) < 0)
 				return;
 
@@ -302,7 +309,8 @@ void m6502cg(int op)
 				tok++;
 				p = string[tok[1]];
 
-				if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'y') // Sleazo tolower()
+				// Sleazo tolower() -----------------vvvvvvvvvvv
+				if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'y')
 					goto badmode;
 
 				tok += 2;
@@ -317,7 +325,8 @@ void m6502cg(int op)
 			tok++;
 			p = string[tok[1]];
 
-			if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'x') // Sleazo tolower()
+			// Sleazo tolower() -----------------vvvvvvvvvvv
+			if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'x')
 				goto badmode;
 
 			tok += 2;