Fixes for last commit; version is now 1.10.0.

[rmac] / direct.h

diff --git a/direct.h b/direct.h
index 8bcc3516bf396de1a194a84b06b01236f9f169cb..3c884dc5a4b34b03cbbd531b8c15d9a4306910ab 100644 (file)
--- a/direct.h
+++ b/direct.h
@@ -1,71 +1,39 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // DIRECT.H - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-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
 //
 
 #ifndef __DIRECT_H__
 #define __DIRECT_H__
 
 #include "rmac.h"
+#include "token.h"
 
-// Globals, Externals etc
-extern TOKEN exprbuf[];
-extern int (*dirtab[])();
+// Exported variables
+extern TOKENPTR exprbuf;
+extern SYM * symbolPtr[];
+extern int (* dirtab[])();
+extern int largestAlign[];
 
-// Prototypes
-int d_even(void);
+// Exported functions
 void auto_even(void);
-int dep_block(VALUE, WORD, VALUE, WORD, TOKEN *);
-int d_unimpl(void);
-int d_even(void);
-int d_6502(void);
-int d_68000(void);
-int d_bss(void);
-int d_data(void);
-int d_text(void);
-int d_abs(void);
-int d_comm(void);
-int d_dc(WORD);
-int d_ds(WORD);
-int d_dcb(WORD);
-int d_globl(void);
-int d_gpu(void);
-int d_dsp(void);
-int d_assert(void);
-int d_if(void);
-int d_endif(void);
-int d_include(void);
-int exitmac(void);
-int d_list(void);
-int d_nlist(void);
-int d_title(void);
-int d_subttl(void);  
+int dep_block(uint32_t, WORD, uint32_t, WORD, TOKENPTR);
 int eject(void);
-int d_error(char *);
-int d_warn(char *);
-int d_org(void);
-int d_init(WORD);
-int d_cargs(void);
-int d_undmac(void);
-int d_regbank0(void);
-int d_regbank1(void);
+int abs_expr(uint64_t *);
+int symlist(int(*)());
+
+int d_even(void);
 int d_long(void);
 int d_phrase(void);
 int d_dphrase(void);
 int d_qphrase(void);
-int d_incbin(void);
-int d_noclear(void);
-int d_equrundef(void);
-int d_ccundef(void);
-int d_print(void);
-int d_gpumain(void);
-int d_jpad(void);
-int d_nojpad(void);
-int d_fail(void);
-int symlist(int(*)());
-int abs_expr(VALUE *);
+
+int d_if(void);
+int d_else(void);
+int d_endif(void);
 
 #endif // __DIRECT_H__
+