/* */
/* */
/* */
-/* (C) 2000 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 2000-2001 Ullrich von Bassewitz */
+/* Wacholderweg 14 */
+/* D-70597 Stuttgart */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* Dump the tables if requested */
if (Debug) {
- PrintSymTable (SymTab0, stdout, "Global symbol table");
- PrintSymTable (TagTab0, stdout, "Global tag table");
+ PrintSymTable (SymTab0, stdout, "Global symbol table");
+ PrintSymTable (TagTab0, stdout, "Global tag table");
}
/* Don't delete the symbol and struct tables! */
- SymTab0 = SymTab = 0;
- TagTab0 = TagTab = 0;
+ SymTab = 0;
+ TagTab = 0;
}
+SymEntry* FindGlobalSym (const char* Name)
+/* Find the symbol with the given name in the global symbol table only */
+{
+ return FindSymInTable (SymTab0, Name, HashStr (Name));
+}
+
+
+
SymEntry* FindLocalSym (const char* Name)
/* Find the symbol with the given name in the current symbol table only */
{
-SymEntry* AddEnumSym (const char* Name, int Val)
-/* Add an enum symbol to the symbol table and return it */
+SymEntry* AddConstSym (const char* Name, const type* Type, unsigned Flags, long Val)
+/* Add an constant symbol to the symbol table and return it */
{
/* Do we have an entry with this name already? */
SymEntry* Entry = FindSymInTable (SymTab, Name, HashStr (Name));
if (Entry) {
- if (Entry->Flags != SC_ENUM) {
+ if ((Entry->Flags & SC_CONST) != SC_CONST) {
Error ("Symbol `%s' is already different kind", Name);
} else {
Error ("Multiple definition for `%s'", Name);
}
/* Create a new entry */
- Entry = NewSymEntry (Name, SC_ENUM);
+ Entry = NewSymEntry (Name, Flags);
/* Enum values are ints */
- Entry->Type = TypeDup (type_int);
+ Entry->Type = TypeDup (Type);
/* Set the enum data */
- Entry->V.EnumVal = Val;
+ Entry->V.ConstVal = Val;
/* Add the entry to the symbol table */
AddSymEntry (SymTab, Entry);
Entry = NewSymEntry (Name, SC_LABEL | Flags);
/* Set a new label number */
- Entry->V.Label = GetLabel ();
+ Entry->V.Label = GetLocalLabel ();
/* Add the entry to the label table */
AddSymEntry (LabelTab, Entry);
SymEntry* AddGlobalSym (const char* Name, const type* Type, unsigned Flags)
/* Add an external or global symbol to the symbol table and return the entry */
{
+ /* There is some special handling for functions, so check if it is one */
+ int IsFunc = IsTypeFunc (Type);
+
/* Functions must be inserted in the global symbol table */
- SymTable* Tab = IsTypeFunc (Type)? SymTab0 : SymTab;
+ SymTable* Tab = IsFunc? SymTab0 : SymTab;
/* Do we have an entry with this name already? */
SymEntry* Entry = FindSymInTable (Tab, Name, HashStr (Name));
unsigned Size = Decode (Type + 1);
unsigned ESize = Decode (EType + 1);
- if ((Size != 0 && ESize != 0) ||
+ if ((Size != 0 && ESize != 0 && Size != ESize) ||
TypeCmp (Type+DECODE_SIZE+1, EType+DECODE_SIZE+1) < TC_EQUAL) {
/* Types not identical: Conflicting types */
Error ("Conflicting types for `%s'", Name);
* contains pointers to the new symbol tables that are needed if
* an actual function definition follows.
*/
- if (IsTypeFunc (Type)) {
- CopyEncode (Type+1, EType+1);
+ if (IsFunc) {
+ /* Get the function descriptor from the new type */
+ FuncDesc* F = GetFuncDesc (Type);
+ /* Use this new function descriptor */
+ Entry->V.F.Func = F;
+ EncodePtr (EType+1, F);
}
}
/* Create a new entry */
Entry = NewSymEntry (Name, Flags);
- /* Set the symbol attributes */
+ /* Set the symbol attributes */
Entry->Type = TypeDup (Type);
+ /* If this is a function, set the function descriptor and clear
+ * additional fields.
+ */
+ if (IsFunc) {
+ Entry->V.F.Func = GetFuncDesc (Entry->Type);
+ Entry->V.F.Seg = 0;
+ }
+
/* Add the entry to the symbol table */
AddSymEntry (Tab, Entry);
}
+SymTable* GetGlobalSymTab (void)
+/* Return the global symbol table */
+{
+ return SymTab0;
+}
+
+
+
int SymIsLocal (SymEntry* Sym)
/* Return true if the symbol is defined in the highest lexical level */
{
{
SymEntry* Entry;
- AddEmptyLine ();
-
Entry = SymTab->SymHead;
while (Entry) {
unsigned Flags = Entry->Flags;