X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fld65%2Fexports.h;h=170f80978fa7b57cffdc9512f520f90d68733432;hb=c9b90692080a21fd4e78e5cd1871c35935d5d997;hp=075c5ca489029429cf233b68df5c0af9d2f11610;hpb=097a01094eedd3b030c2c7a26ddc2ac5067ead28;p=cc65 diff --git a/src/ld65/exports.h b/src/ld65/exports.h index 075c5ca48..170f80978 100644 --- a/src/ld65/exports.h +++ b/src/ld65/exports.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 1998-2000 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 1998-2010, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -41,12 +41,14 @@ #include /* common */ +#include "cddefs.h" #include "exprdefs.h" #include "filepos.h" - + /* ld65 */ -#include "objdata.h" #include "config.h" +#include "memarea.h" +#include "objdata.h" @@ -57,32 +59,33 @@ /* Import symbol structure */ -typedef struct Import_ Import; -struct Import_ { - Import* Next; /* Single linked list */ - ObjData* Obj; /* Object file that imports the name */ - FilePos Pos; /* File position of reference */ - union { - struct Export_* Exp; /* Matching export for this import */ - const char* Name; /* Name if not in table */ - } V; - unsigned char Type; /* Type of import */ +typedef struct Import Import; +struct Import { + Import* Next; /* Single linked list */ + ObjData* Obj; /* Object file that imports the name */ + FilePos Pos; /* File position of reference */ + struct Export* Exp; /* Matching export for this import */ + unsigned Name; /* Name if not in table */ + unsigned char Flags; /* Generic flags */ + unsigned char AddrSize; /* Address size of import */ }; /* Export symbol structure */ -typedef struct Export_ Export; -struct Export_ { +typedef struct Export Export; +struct Export { + unsigned Name; /* Name */ Export* Next; /* Hash table link */ - unsigned Flags; /* Generic flags */ - ObjData* Obj; /* Object file that exports the name */ - unsigned ImpCount; /* How many imports for this symbol? */ - Import* ImpList; /* List of imports for this symbol */ - FilePos Pos; /* File position of definition */ + unsigned Flags; /* Generic flags */ + ObjData* Obj; /* Object file that exports the name */ + unsigned ImpCount; /* How many imports for this symbol? */ + Import* ImpList; /* List of imports for this symbol */ + FilePos Pos; /* File position of definition */ ExprNode* Expr; /* Expression (0 if not def'd) */ unsigned char Type; /* Type of export */ - char* Name; /* Name - dynamically allocated */ + unsigned char AddrSize; /* Address size of export */ + unsigned char ConDes[CD_TYPE_COUNT]; /* Constructor/destructor decls */ }; @@ -93,7 +96,7 @@ struct Export_ { * resolved, or a value != zero if the symbol could be resolved. The * CheckExports routine will print out the missing symbol in the first case. */ -typedef int (*ExpCheckFunc) (const char* Name, void* Data); +typedef int (*ExpCheckFunc) (unsigned Name, void* Data); @@ -103,11 +106,26 @@ typedef int (*ExpCheckFunc) (const char* Name, void* Data); +void FreeImport (Import* I); +/* Free an import. NOTE: This won't remove the import from the exports table, + * so it may only be called for unused imports (imports from modules that + * aren't referenced). + */ + Import* ReadImport (FILE* F, ObjData* Obj); /* Read an import from a file and insert it into the table */ -void InsertImport (Import* I); -/* Insert an import into the table */ +Import* GenImport (unsigned Name, unsigned char AddrSize); +/* Generate a new import with the given name and address size and return it */ + +Import* InsertImport (Import* I); +/* Insert an import into the table, return I */ + +void FreeExport (Export* E); +/* Free an export. NOTE: This won't remove the export from the exports table, + * so it may only be called for unused exports (exports from modules that + * aren't referenced). + */ Export* ReadExport (FILE* F, ObjData* Obj); /* Read an export from a file */ @@ -115,23 +133,42 @@ Export* ReadExport (FILE* F, ObjData* Obj); void InsertExport (Export* E); /* Insert an exported identifier and check if it's already in the list */ -Export* CreateConstExport (const char* Name, long Value); +Export* CreateConstExport (unsigned Name, long Value); /* Create an export for a literal date */ -Export* CreateMemExport (const char* Name, Memory* Mem, unsigned long Offs); +Export* CreateMemoryExport (unsigned Name, MemoryArea* Mem, unsigned long Offs); /* Create an relative export for a memory area offset */ -int IsUnresolved (const char* Name); +Export* CreateSegmentExport (unsigned Name, Segment* Seg, unsigned long Offs); +/* Create a relative export to a segment */ + +Export* CreateSectionExport (unsigned Name, Section* S, unsigned long Offs); +/* Create a relative export to a section */ + +Export* FindExport (unsigned Name); +/* Check for an identifier in the list. Return 0 if not found, otherwise + * return a pointer to the export. + */ + +int IsUnresolved (unsigned Name); /* Check if this symbol is an unresolved export */ +int IsUnresolvedExport (const Export* E); +/* Return true if the given export is unresolved */ + int IsConstExport (const Export* E); /* Return true if the expression associated with this export is const */ long GetExportVal (const Export* E); /* Get the value of this export */ -void CheckExports (ExpCheckFunc F, void* Data); -/* Check if there are any unresolved symbols. On unresolved symbols, F is +void CheckExports (void); +/* Setup the list of all exports and check for export/import symbol type + * mismatches. + */ + +void CheckUnresolvedImports (ExpCheckFunc F, void* Data); +/* Check if there are any unresolved imports. On unresolved imports, F is * called (see the comments on ExpCheckFunc in the data section). */ @@ -164,3 +201,4 @@ void CircularRefError (const Export* E); +