X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.h;h=e20402bfd59db523f888ba41ad9a241c1e173f5d;hp=52ff8cb2d39154791fbc7b6351dfb65e87427613;hb=66b362fa203d0850e8dce8045adb454e354c22ce;hpb=c9541a9d4f01e190ffefc20ce07896c7f04d9557

diff --git a/token.h b/token.h
index 52ff8cb..e20402b 100644
--- a/token.h
+++ b/token.h
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // TOKEN.H - Token Handling
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// 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
 //
@@ -34,6 +34,7 @@
 // (Normally) non-printable tokens
 #define COLON           ':'			// : (grumble: GNUmacs hates ':')
 #define CONST           'a'			// CONST <value>
+#define FCONST          'r'			// Floating CONST <value>
 #define ACONST          'A'			// ACONST <value> <attrib>
 #define STRING          'b'			// STRING <address>
 #define STRINGA8        'S'			// Atari 800 internal STRING <address>
@@ -84,6 +85,9 @@
 #define MULTX           64			// Multiple-character tokens
 #define DOT             128			// [bwlsBWSL] for what follows a '.'
 
+// Macro to check for specific optimizations or override
+#define CHECK_OPTS(x)	(optim_flags[x] && !optimizeOff)
+
 // Conditional assembly structures
 IFENT {
 	IFENT * if_prev;		// Ptr prev .if state block (or NULL)
@@ -128,13 +132,12 @@ TOKENSTREAM {
 // Information about a macro invocation
 IMACRO {
 	IMACRO * im_link;		// Pointer to ancient IMACROs
-	LLIST * im_nextln;	// Next line to include
+	LLIST * im_nextln;		// Next line to include
 	WORD im_nargs;			// # of arguments supplied on invocation
 	WORD im_siz;			// Size suffix supplied on invocation
 	LONG im_olduniq;		// Old value of 'macuniq'
 	SYM * im_macro;			// Pointer to macro we're in
 	char im_lnbuf[LNSIZ];	// Line buffer
-	uint32_t argBase;		// Base in argPtrs[] for current macro
 	TOKENSTREAM argument[20];	// Assume no more than 20 arguments in an invocation
 };
 
@@ -142,7 +145,8 @@ IMACRO {
 IREPT {
 	LLIST * ir_firstln;		// Pointer to first line
 	LLIST * ir_nextln;		// Pointer to next line
-	VALUE ir_count;			// Repeat count (decrements)
+	uint32_t ir_count;		// Repeat count (decrements)
+	uint32_t lineno;		// Repeat line number (Convert this to global instead of putting it here?)
 };
 
 // Exported variables
@@ -157,6 +161,7 @@ extern char tolowertab[];
 extern INOBJ * cur_inobj;
 extern int mjump_align;
 extern char * string[];
+extern int optimizeOff;
 
 // Exported functions
 int include(int, char *);
@@ -166,6 +171,7 @@ int TokenizeLine(void);
 int fpop(void);
 int d_goto(WORD);
 INOBJ * a_inobj(int);
+void DumpToken(TOKEN);
 void DumpTokenBuffer(void);
 
 #endif // __TOKEN_H__