X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=procln.c;h=dd8980622be2eb42d4f4ebd7e3dd75ab3572c9f7;hp=e851408994f8ad788fb7539a1d9e00f4696c0cb4;hb=60f204cb9e3905100da0d89f14bb40db764acd9e;hpb=d95ee7f628ceac9af515079fb6797476557a23d2

diff --git a/procln.c b/procln.c
index e851408..dd89806 100644
--- a/procln.c
+++ b/procln.c
@@ -1,9 +1,9 @@
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // PROCLN.C - Line Processing
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "procln.h"
@@ -18,7 +18,7 @@
 #include "symbol.h"
 #include "riscasm.h"
 
-#define DEF_KW					// Declare keyword values 
+#define DEF_KW					// Declare keyword values
 #include "kwtab.h"				// Incl generated keyword tables & defs
 
 #define DEF_MN					// Incl 68k keyword definitions
@@ -34,9 +34,8 @@ IFENT * ifent;					// Current ifent
 static IFENT ifent0;			// Root ifent
 static IFENT * f_ifent;			// Freelist of ifents
 static int disabled;			// Assembly conditionally disabled
-int just_bss;					// 1, ds.b in microprocessor mode 
-VALUE pcloc;					// Value of "PC" at beginning of line 
-IFENT * ifent;					// Current ifent
+int just_bss;					// 1, ds.b in microprocessor mode
+VALUE pcloc;					// Value of "PC" at beginning of line
 SYM * lab_sym;					// Label on line (or NULL)
 
 const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
@@ -77,15 +76,15 @@ LONG amsktab[0112] = {
 	0L,												// 076
 	0L,												// 077
 	M_ABASE,										// 0100
-	M_MEMPOST,										// 0101 
-	M_MEMPRE,										// 0102 
+	M_MEMPOST,										// 0101
+	M_MEMPRE,										// 0102
 	M_PCBASE,										// 0103
 	M_PCMPOST,										// 0104
 	M_PCMPRE,										// 0105
 	M_AM_USP,										// 0106
-	M_AM_SR,										// 0107 
+	M_AM_SR,										// 0107
 	M_AM_CCR,										// 0110
-	M_AM_NONE										// 0111 
+	M_AM_NONE										// 0111
 };													// 0112 length
 
 
@@ -94,7 +93,7 @@ int HandleLabel(char *, int);
 
 
 //
-// Initialize Line Processor
+// Initialize line processor
 //
 void InitLineProcessor(void)
 {
@@ -106,7 +105,7 @@ void InitLineProcessor(void)
 
 
 //
-// Line Processor
+// Line processor
 //
 void Assemble(void)
 {
@@ -137,7 +136,7 @@ loop:							// Line processing loop label
 	// Get another line of tokens
 	if (TokenizeLine() == TKEOF)
 	{
-if (verb_flag) printf("Assemble: Found TKEOF flag...\n");
+if (debug) printf("Assemble: Found TKEOF flag...\n");
 		if (list_flag && listflag)			// Flush last line of source
 			listeol();
 
@@ -252,7 +251,7 @@ as68label:
 	// Check for ".b" ".w" ".l" after directive, macro or mnemonic.
 	siz = SIZN;
 
-	if (*tok == DOTW) 
+	if (*tok == DOTW)
 		siz = SIZW, tok++;
 	else if (*tok == DOTL)
 		siz = SIZL, tok++;
@@ -265,13 +264,13 @@ as68label:
 		switch (state)
 		{
 		case MN_IF:
-			d_if ();
+			d_if();
 		goto loop;
 		case MN_ELSE:
 			d_else();
 			goto loop;
 		case MN_ENDIF:
-			d_endif ();
+			d_endif();
 			goto loop;
 		case MN_IIF:						// .iif --- immediate if
 			if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)
@@ -369,9 +368,9 @@ normal:
 		{
 			if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
 			{
-//REALLY?				sy->sattre |= ~UNDEF_EQUR; 
-				sy->sattre &= ~UNDEF_EQUR; 
-				sy->svalue  = 0;
+//REALLY?				sy->sattre |= ~UNDEF_EQUR;
+				sy->sattre &= ~UNDEF_EQUR;
+				sy->svalue = 0;
 			}
 			else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
 			{
@@ -386,9 +385,8 @@ normal:
 			}
 		}
 
-		// Put symbol in "order of definition" list
-		if (!(sy->sattr & SDECLLIST))
-			AddToSymbolOrderList(sy);
+		// Put symbol in "order of definition" list if it's not already there
+		AddToSymbolDeclarationList(sy);
 
 		// Parse value to equate symbol to;
 		// o  .equr
@@ -396,13 +394,13 @@ normal:
 		// o  everything else
 		if (equtyp == EQUREG)
 		{
-//Linko's request to issue a warning on labels that equated to the same register
-//would go here. Not sure how to implement it though. :-/
+//Linko's request to issue a warning on labels that equated to the same
+//register would go here. Not sure how to implement it though. :-/
 /*
 Maybe like this way:
 have an array of bools with 64 entries. Whenever a register is equated, set the
-corresponding register bool to true. Whenever it's undef'ed, set it to false. When
-checking to see if it's already been equated, issue a warning.
+corresponding register bool to true. Whenever it's undef'ed, set it to false.
+When checking to see if it's already been equated, issue a warning.
 */
 			// Check that we are in a RISC section
 			if (!rgpu && !rdsp)
@@ -604,7 +602,7 @@ checking to see if it's already been equated, issue a warning.
 	// Invoke macro or complain about bad mnemonic
 	if (state < 0)
 	{
-		if ((sy = lookup(opname, MACRO, 0)) != NULL) 
+		if ((sy = lookup(opname, MACRO, 0)) != NULL)
 			InvokeMacro(sy, siz);
 		else
 			errors("unknown op '%s'", opname);
@@ -630,10 +628,10 @@ checking to see if it's already been equated, issue a warning.
 		goto loop;
 	}
 
-	if (sloc & 1)							// Automatic .even
+	if (sloc & 1)					// Automatic .even
 		auto_even();
 
-	if (challoc - ch_size < 18)				// Make sure have space in current chunk
+	if (challoc - ch_size < 18)		// Make sure have space in current chunk
 		chcheck(0);
 
 	m = &machtab[state - 1000];
@@ -645,7 +643,7 @@ checking to see if it's already been equated, issue a warning.
 		goto loop;
 	}
 
-	if (amode(1) < 0)						// Parse 0, 1 or 2 addr modes
+	if (amode(1) < 0)				// Parse 0, 1 or 2 addr modes
 		goto loop;
 
 	if (*tok != EOL)
@@ -662,6 +660,9 @@ checking to see if it's already been equated, issue a warning.
 		goto loop;
 	}
 
+	// Keep a backup of chptr (used for optimisations during codegen)
+	chptr_opcode = chptr;
+
 	for(;;)
 	{
 		if ((m->mnattr & siz) && (amsk0 & m->mn0) != 0 && (amsk1 & m->mn1) != 0)
@@ -694,9 +695,8 @@ int HandleLabel(char * label, int labelType)
 	else if (symbol->sattr & DEFINED)
 		return errors("multiply-defined label '%s'", label);
 
-	// Put symbol in "order of definition" list
-	if (!(symbol->sattr & SDECLLIST))
-		AddToSymbolOrderList(symbol);
+	// Put symbol in "order of definition" list if it's not already in it
+	AddToSymbolDeclarationList(symbol);
 
 	if (orgactive)
 	{
@@ -727,8 +727,8 @@ int HandleLabel(char * label, int labelType)
 }
 
 
-// 
-// .if, Start Conditional Assembly
+//
+// .if, Start conditional assembly
 //
 int d_if(void)
 {
@@ -762,8 +762,8 @@ int d_if(void)
 }
 
 
-// 
-// .else, Do Alternate Case For .if
+//
+// .else, Do alternate case for .if
 //
 int d_else(void)
 {