X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=symbol.h;h=9c5c26a82e08e15feef7b35a8ef64985c655e537;hp=bd32a5efc114fc8efd2dfa6f2dfea290831f4411;hb=60f204cb9e3905100da0d89f14bb40db764acd9e;hpb=1feb728a9eb579b6441daf0124d81483f600365c

diff --git a/symbol.h b/symbol.h
index bd32a5e..9c5c26a 100644
--- a/symbol.h
+++ b/symbol.h
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // SYMBOL.H - Symbol Handling
-// 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
 //
@@ -15,7 +15,7 @@
 struct LineList
 {
 	struct LineList * next;
-	char * line;
+	uint8_t * line;
 };
 
 // Symbols
@@ -25,12 +25,12 @@ SYM
 	SYM * snext;					// * -> Next symbol on hash-chain
 	SYM * sorder;					// * -> Next sym in order of reference
 	SYM * sdecl;					// * -> Next sym in order of declaration
-	uint8_t stype;					// Symbol type 
+	uint8_t stype;					// Symbol type
 	uint16_t sattr;					// Attribute bits
 	uint32_t sattre;				// Extended attribute bits
 	uint16_t senv;					// Enviroment number
 	uint32_t svalue;				// Symbol value
-	char * sname;					// * -> Symbol's print-name
+	uint8_t * sname;				// * -> Symbol's print-name
 	struct LineList * lineList;		// * -> Macro's linked list of lines
 	struct LineList * last;			// * -> end of macro linked list
 	uint32_t uid;					// Symbol's unique ID
@@ -38,18 +38,19 @@ SYM
 
 // Globals, externals, etc.
 extern int curenv;
-extern char subttl[];
-extern int eject(void);
+extern uint8_t subttl[];
+extern uint32_t firstglobal;// Index of the fist global symbol in an ELF object.
 
 // Exported functions
-SYM * lookup(char *, int, int);
+SYM * lookup(uint8_t *, int, int);
 void InitSymbolTable(void);
-SYM * NewSymbol(char *, int, int);
+SYM * NewSymbol(uint8_t *, int, int);
 void AddToSymbolDeclarationList(SYM *);
 void ForceUndefinedSymbolsGlobal(void);
 int symtable(void);
-int sy_assign(char *, char *(*)());
-char * GetSymbolNameByUID(uint32_t);
+uint32_t sy_assign(uint8_t *, uint8_t *(*)());
+uint32_t sy_assign_ELF(uint8_t *, uint8_t *(*)());
+uint8_t * GetSymbolNameByUID(uint32_t);
 
 #endif // __SYMBOL_H__