Fixes for last commit; version is now 1.10.0.

[rmac] / eagen.c

diff --git a/eagen.c b/eagen.c
index e94c21bba0dcb7598305420dab7296d12dd74f25..197bd4e60427d97a4288a956ed14383bfa1b099c 100644 (file)
--- a/eagen.c
+++ b/eagen.c
@@ -1,35 +1,45 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // EAGEN.C - Effective Address Code Generation
-// Copyright (C) 199x Landon Dyer, 2017 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
 //
 
-#include "rmac.h"
+#include "eagen.h"
 #include "amode.h"
 #include "sect.h"
 #include "mark.h"
 #include "error.h"
 #include "mach.h"
 #include "riscasm.h"
+#include "sect.h"
+#include "token.h"
 
 #define eaNgen    ea0gen
 #define amN       am0
 #define aNexattr  a0exattr
 #define aNexval   a0exval
-#define aNexpr    a0expr
+#define aNexpr    (TOKENPTR)a0expr
 #define aNixreg   a0ixreg
 #define aNixsiz   a0ixsiz
 #define AnESYM    a0esym
+#define aNexten   a0extension
+#define aNbexpr   (TOKENPTR)a0bexpr
+#define aNbdexval a0bexval
+#define aNbdexattr a0bexattr
 #include "eagen0.c"
 
 #define eaNgen    ea1gen
 #define amN       am1
 #define aNexattr  a1exattr
 #define aNexval   a1exval
-#define aNexpr    a1expr
+#define aNexpr    (TOKENPTR)a1expr
 #define aNixreg   a1ixreg
 #define aNixsiz   a1ixsiz
 #define AnESYM    a1esym
+#define aNexten   a1extension
+#define aNbexpr   (TOKENPTR)a1bexpr
+#define aNbdexval a1bexval
+#define aNbdexattr a1bexattr
 #include "eagen0.c"