#include <errno.h>
/* common */
+#include "addrsize.h"
#include "bitops.h"
#include "check.h"
#include "print.h"
#define SA_START 0x0080
#define SA_OPTIONAL 0x0100
+/* Symbol types used in the CfgSymbol structure */
+typedef enum {
+ CfgSymExport, /* Not really used in struct CfgSymbol */
+ CfgSymImport, /* Dito */
+ CfgSymWeak, /* Like export but weak */
+ CfgSymO65Export, /* An o65 export */
+ CfgSymO65Import, /* An o65 import */
+} CfgSymType;
+
/* Symbol structure. It is used for o65 imports and exports, but also for
* symbols from the SYMBOLS sections (symbols defined in the config file or
* forced imports).
*/
-typedef struct Symbol Symbol;
-struct Symbol {
+typedef struct CfgSymbol CfgSymbol;
+struct CfgSymbol {
+ CfgSymType Type; /* Type of symbol */
FilePos Pos; /* Config file position */
unsigned Name; /* Symbol name */
- unsigned Flags; /* Symbol flags */
- long Val; /* Symbol value if any */
+ ExprNode* Value; /* Symbol value if any */
+ unsigned AddrSize; /* Address size of symbol */
};
/* Collections with symbols */
-static Collection O65Imports = STATIC_COLLECTION_INITIALIZER;
-static Collection O65Exports = STATIC_COLLECTION_INITIALIZER;
-static Collection Symbols = STATIC_COLLECTION_INITIALIZER;
-
-/* Symbol flags */
-#define SYM_NONE 0x00 /* No special meaning */
-#define SYM_DEF 0x01 /* Symbol defined in the config file */
-#define SYM_WEAK 0x02 /* Defined symbol is weak */
-#define SYM_IMPORT 0x04 /* A forced import */
+static Collection CfgSymbols = STATIC_COLLECTION_INITIALIZER;
/* Descriptor holding information about the binary formats */
static BinDesc* BinFmtDesc = 0;
-static Symbol* NewSymbol (unsigned Name, unsigned Flags, long Val)
-/* Create a new Symbol structure with the given name name and flags. The
- * current config file position is recorded in the returned struct.
+static CfgSymbol* NewCfgSymbol (CfgSymType Type, unsigned Name)
+/* Create a new CfgSymbol structure with the given type and name. The
+ * current config file position is recorded in the returned struct. The
+ * created struct is inserted into the CfgSymbols collection and returned.
*/
{
/* Allocate memory */
- Symbol* Sym = xmalloc (sizeof (Symbol));
+ CfgSymbol* Sym = xmalloc (sizeof (CfgSymbol));
/* Initialize the fields */
- Sym->Pos = CfgErrorPos;
- Sym->Name = Name;
- Sym->Flags = Flags;
- Sym->Val = Val;
+ Sym->Type = Type;
+ Sym->Pos = CfgErrorPos;
+ Sym->Name = Name;
+ Sym->Value = 0;
+ Sym->AddrSize = ADDR_SIZE_INVALID;
+
+ /* Insert the symbol into the collection */
+ CollAppend (&CfgSymbols, Sym);
/* Return the initialized struct */
return Sym;
-static Symbol* NewO65Symbol (void)
-/* Create a new Symbol structure with the name in the current CfgSVal variable
- * ready for use as an o65 symbol. The current config file position is recorded
- * in the returned struct.
- */
-{
- return NewSymbol (GetStrBufId (&CfgSVal), SYM_NONE, 0);
-}
-
-
-
static File* NewFile (unsigned Name)
/* Create a new file descriptor and insert it into the list */
{
/* Initialize the fields */
S->Name = Name;
+ S->Pos = CfgErrorPos;
S->Seg = 0;
S->Attr = 0;
S->Flags = 0;
/* We expect an identifier */
CfgAssureIdent ();
/* Remember it as an export for later */
- CollAppend (&O65Exports, NewO65Symbol ());
+ NewCfgSymbol (CfgSymO65Export, GetStrBufId (&CfgSVal));
/* Eat the identifier token */
CfgNextTok ();
break;
/* We expect an identifier */
CfgAssureIdent ();
/* Remember it as an import for later */
- CollAppend (&O65Imports, NewO65Symbol ());
+ NewCfgSymbol (CfgSymO65Import, GetStrBufId (&CfgSVal));
/* Eat the identifier token */
CfgNextTok ();
break;
/* Parse a symbols section */
{
static const IdentTok Attributes[] = {
+ { "ADDRSIZE", CFGTOK_ADDRSIZE },
+ { "TYPE", CFGTOK_TYPE },
{ "VALUE", CFGTOK_VALUE },
- { "WEAK", CFGTOK_WEAK },
+ };
+
+ static const IdentTok AddrSizes [] = {
+ { "ABS", CFGTOK_ABS },
+ { "ABSOLUTE", CFGTOK_ABS },
+ { "DIRECT", CFGTOK_ZP },
+ { "DWORD", CFGTOK_LONG },
+ { "FAR", CFGTOK_FAR },
+ { "LONG", CFGTOK_LONG },
+ { "NEAR", CFGTOK_ABS },
+ { "ZEROPAGE", CFGTOK_ZP },
+ { "ZP", CFGTOK_ZP },
+ };
+
+ static const IdentTok Types [] = {
+ { "EXPORT", CFGTOK_EXPORT },
+ { "IMPORT", CFGTOK_IMPORT },
+ { "WEAK", CFGTOK_WEAK },
};
while (CfgTok == CFGTOK_IDENT) {
- long Val = 0L;
- unsigned Flags = SYM_NONE;
+ /* Bitmask to remember the attributes we got already */
+ enum {
+ atNone = 0x0000,
+ atAddrSize = 0x0001,
+ atType = 0x0002,
+ atValue = 0x0004,
+ };
+ unsigned AttrFlags = atNone;
+
+ ExprNode* Value = 0;
+ CfgSymType Type = CfgSymExport;
+ unsigned char AddrSize = ADDR_SIZE_ABS;
+ Import* Imp;
+ Export* Exp;
+ CfgSymbol* Sym;
/* Remember the name */
unsigned Name = GetStrBufId (&CfgSVal);
CfgNextTok ();
- /* Support both, old and new syntax here. New syntax is a colon
- * followed by an attribute list, old syntax is an optional equal
- * sign plus a value.
- */
- if (CfgTok != CFGTOK_COLON) {
+ /* New syntax - skip the colon */
+ CfgNextTok ();
- /* Old syntax */
+ /* Parse the attributes */
+ while (1) {
- /* Allow an optional assignment */
- CfgOptionalAssign ();
+ /* Map the identifier to a token */
+ cfgtok_t AttrTok;
+ CfgSpecialToken (Attributes, ENTRY_COUNT (Attributes), "Attribute");
+ AttrTok = CfgTok;
- /* Make sure the next token is an integer expression, read and
- * skip it.
- */
- Val = CfgConstExpr ();
+ /* Skip the attribute name */
+ CfgNextTok ();
- /* This is a defined symbol */
- Flags = SYM_DEF;
+ /* An optional assignment follows */
+ CfgOptionalAssign ();
- } else {
+ /* Check which attribute was given */
+ switch (AttrTok) {
- /* Bitmask to remember the attributes we got already */
- enum {
- atNone = 0x0000,
- atValue = 0x0001,
- atWeak = 0x0002
- };
- unsigned AttrFlags = atNone;
+ case CFGTOK_ADDRSIZE:
+ /* Don't allow this twice */
+ FlagAttr (&AttrFlags, atAddrSize, "ADDRSIZE");
+ /* Map the type to a token */
+ CfgSpecialToken (AddrSizes, ENTRY_COUNT (AddrSizes), "AddrSize");
+ switch (CfgTok) {
+ case CFGTOK_ABS: AddrSize = ADDR_SIZE_ABS; break;
+ case CFGTOK_FAR: AddrSize = ADDR_SIZE_FAR; break;
+ case CFGTOK_LONG: AddrSize = ADDR_SIZE_LONG; break;
+ case CFGTOK_ZP: AddrSize = ADDR_SIZE_ZP; break;
+ default:
+ Internal ("Unexpected token: %d", CfgTok);
+ }
+ CfgNextTok ();
+ break;
+ case CFGTOK_TYPE:
+ /* Don't allow this twice */
+ FlagAttr (&AttrFlags, atType, "TYPE");
+ /* Map the type to a token */
+ CfgSpecialToken (Types, ENTRY_COUNT (Types), "Type");
+ switch (CfgTok) {
+ case CFGTOK_EXPORT: Type = CfgSymExport; break;
+ case CFGTOK_IMPORT: Type = CfgSymImport; break;
+ case CFGTOK_WEAK: Type = CfgSymWeak; break;
+ default:
+ Internal ("Unexpected token: %d", CfgTok);
+ }
+ CfgNextTok ();
+ break;
- /* New syntax - skip the colon */
- CfgNextTok ();
+ case CFGTOK_VALUE:
+ /* Don't allow this twice */
+ FlagAttr (&AttrFlags, atValue, "VALUE");
+ /* Value is an expression */
+ Value = CfgExpr ();
+ break;
- /* Parse the attributes */
- while (1) {
+ default:
+ FAIL ("Unexpected attribute token");
- /* Map the identifier to a token */
- cfgtok_t AttrTok;
- CfgSpecialToken (Attributes, ENTRY_COUNT (Attributes), "Attribute");
- AttrTok = CfgTok;
+ }
- /* Skip the attribute name */
+ /* Semicolon ends the decl, otherwise accept an optional comma */
+ if (CfgTok == CFGTOK_SEMI) {
+ break;
+ } else if (CfgTok == CFGTOK_COMMA) {
CfgNextTok ();
+ }
+ }
- /* An optional assignment follows */
- CfgOptionalAssign ();
-
- /* Check which attribute was given */
- switch (AttrTok) {
-
- case CFGTOK_VALUE:
- /* Don't allow this twice */
- FlagAttr (&AttrFlags, atValue, "VALUE");
- /* We expect a numeric expression */
- Val = CfgConstExpr ();
- /* Symbol is defined */
- Flags |= SYM_DEF;
- break;
-
- case CFGTOK_WEAK:
- /* Don't allow this twice */
- FlagAttr (&AttrFlags, atWeak, "WEAK");
- CfgBoolToken ();
- if (CfgTok == CFGTOK_TRUE) {
- Flags |= SYM_WEAK;
- }
- CfgNextTok ();
- break;
+ /* We must have a type */
+ AttrCheck (AttrFlags, atType, "TYPE");
- default:
- FAIL ("Unexpected attribute token");
+ /* Further actions depend on the type */
+ switch (Type) {
- }
+ case CfgSymExport:
+ /* We must have a value */
+ AttrCheck (AttrFlags, atType, "TYPE");
+ /* Create the export */
+ Exp = CreateExprExport (Name, Value, AddrSize);
+ Exp->Pos = CfgErrorPos;
+ break;
- /* Semicolon ends the decl, otherwise accept an optional comma */
- if (CfgTok == CFGTOK_SEMI) {
- break;
- } else if (CfgTok == CFGTOK_COMMA) {
- CfgNextTok ();
+ case CfgSymImport:
+ /* An import must not have a value */
+ if (AttrFlags & atValue) {
+ CfgError (&CfgErrorPos, "Imports must not have a value");
}
- }
+ /* Generate the import */
+ Imp = InsertImport (GenImport (Name, AddrSize));
+ /* Remember the file position */
+ Imp->Pos = CfgErrorPos;
+ break;
- /* Check if we have all mandatory attributes */
- AttrCheck (AttrFlags, atValue, "VALUE");
- }
+ case CfgSymWeak:
+ /* We must have a value */
+ AttrCheck (AttrFlags, atType, "TYPE");
+ /* Remember the symbol for later */
+ Sym = NewCfgSymbol (CfgSymWeak, Name);
+ Sym->Value = Value;
+ Sym->AddrSize = AddrSize;
+ break;
- /* Remember the symbol for later */
- CollAppend (&Symbols, NewSymbol (Name, Flags, Val));
+ default:
+ Internal ("Unexpected symbol type %d", Type);
+ }
/* Skip the semicolon */
CfgConsumeSemi ();
-static void ProcessMemory (void)
-/* Process the MEMORY section */
-{
- /* Walk over the list with the memory areas */
- unsigned I;
- for (I = 0; I < CollCount (&MemoryAreas); ++I) {
-
- /* Get the next memory area */
- MemoryArea* M = CollAtUnchecked (&MemoryAreas, I);
-
- /* Remember if this is a relocatable memory area */
- M->Relocatable = RelocatableBinFmt (M->F->Format);
-
- /* Resolve the expressions */
- if (!IsConstExpr (M->StartExpr)) {
- CfgError (&M->Pos,
- "Start address of memory area `%s' is not constant",
- GetString (M->Name));
- }
- M->Start = GetExprVal (M->StartExpr);
-
- if (!IsConstExpr (M->SizeExpr)) {
- CfgError (&M->Pos,
- "Size of memory area `%s' is not constant",
- GetString (M->Name));
- }
- M->Size = GetExprVal (M->SizeExpr);
-
- /* Mark the memory area as placed */
- M->Flags |= MF_PLACED;
- }
-}
-
-
-
static void ProcessSegments (void)
/* Process the SEGMENTS section */
{
-static void ProcessO65 (void)
-/* Process the o65 format section */
-{
- unsigned I;
-
- /* Walk over the imports, check and add them to the o65 data */
- for (I = 0; I < CollCount (&O65Imports); ++I) {
-
- /* Get the import */
- Symbol* Sym = CollAtUnchecked (&O65Imports, I);
-
- /* Check if we have this symbol defined already. The entry
- * routine will check this also, but we get a more verbose
- * error message when checking it here.
- */
- if (O65GetImport (O65FmtDesc, Sym->Name) != 0) {
- CfgError (&Sym->Pos,
- "Duplicate imported o65 symbol: `%s'",
- GetString (Sym->Name));
- }
-
- /* Insert the symbol into the table */
- O65SetImport (O65FmtDesc, Sym->Name);
- }
-
- /* Walk over the exports, check and add them to the o65 data */
- for (I = 0; I < CollCount (&O65Exports); ++I) {
-
- /* Get the export */
- Symbol* Sym = CollAtUnchecked (&O65Exports, I);
-
- /* Check if the export symbol is also defined as an import. */
- if (O65GetImport (O65FmtDesc, Sym->Name) != 0) {
- CfgError (&Sym->Pos,
- "Exported o65 symbol `%s' cannot also be an o65 import",
- GetString (Sym->Name));
- }
-
- /* Check if we have this symbol defined already. The entry
- * routine will check this also, but we get a more verbose
- * error message when checking it here.
- */
- if (O65GetExport (O65FmtDesc, Sym->Name) != 0) {
- CfgError (&Sym->Pos,
- "Duplicate exported o65 symbol: `%s'",
- GetString (Sym->Name));
- }
-
- /* Insert the symbol into the table */
- O65SetExport (O65FmtDesc, Sym->Name);
- }
-}
-
-
-
-static void ProcessBin (void)
-/* Process the bin format section */
-{
-}
-
-
-
-static void ProcessFormats (void)
-/* Process the target format section */
-{
- ProcessO65 ();
- ProcessBin ();
-}
-
-
-
static void ProcessSymbols (void)
/* Process the SYMBOLS section */
{
/* Walk over all symbols */
unsigned I;
- for (I = 0; I < CollCount (&Symbols); ++I) {
+ for (I = 0; I < CollCount (&CfgSymbols); ++I) {
/* Get the next symbol */
- Symbol* Sym = CollAtUnchecked (&Symbols, I);
-
- /* Do we define this symbol? */
- if ((Sym->Flags & SYM_DEF) != 0) {
- /* Check if the symbol is already defined somewhere else */
- if ((E = FindExport (Sym->Name)) != 0 && !IsUnresolvedExport (E)) {
- /* If the symbol is not marked as weak, this is an error.
- * Otherwise ignore the symbol from the config.
+ CfgSymbol* Sym = CollAtUnchecked (&CfgSymbols, I);
+
+ /* Check what it is. */
+ switch (Sym->Type) {
+
+ case CfgSymO65Export:
+ /* Check if the export symbol is also defined as an import. */
+ if (O65GetImport (O65FmtDesc, Sym->Name) != 0) {
+ CfgError (
+ &Sym->Pos,
+ "Exported o65 symbol `%s' cannot also be an o65 import",
+ GetString (Sym->Name)
+ );
+ }
+
+ /* Check if we have this symbol defined already. The entry
+ * routine will check this also, but we get a more verbose
+ * error message when checking it here.
*/
- if ((Sym->Flags & SYM_WEAK) == 0) {
- CfgError (&CfgErrorPos,
- "Symbol `%s' is already defined",
- GetString (Sym->Name));
+ if (O65GetExport (O65FmtDesc, Sym->Name) != 0) {
+ CfgError (
+ &Sym->Pos,
+ "Duplicate exported o65 symbol: `%s'",
+ GetString (Sym->Name)
+ );
+ }
+
+ /* Insert the symbol into the table */
+ O65SetExport (O65FmtDesc, Sym->Name);
+ break;
+
+ case CfgSymO65Import:
+ /* Check if the import symbol is also defined as an export. */
+ if (O65GetExport (O65FmtDesc, Sym->Name) != 0) {
+ CfgError (
+ &Sym->Pos,
+ "Imported o65 symbol `%s' cannot also be an o65 export",
+ GetString (Sym->Name)
+ );
+ }
+
+ /* Check if we have this symbol defined already. The entry
+ * routine will check this also, but we get a more verbose
+ * error message when checking it here.
+ */
+ if (O65GetImport (O65FmtDesc, Sym->Name) != 0) {
+ CfgError (
+ &Sym->Pos,
+ "Duplicate imported o65 symbol: `%s'",
+ GetString (Sym->Name)
+ );
}
- } else {
- /* The symbol is undefined, generate an export */
- CreateConstExport (Sym->Name, Sym->Val);
- }
- } else {
+ /* Insert the symbol into the table */
+ O65SetImport (O65FmtDesc, Sym->Name);
+ break;
+ case CfgSymWeak:
+ /* If the symbol is not defined until now, define it */
+ if ((E = FindExport (Sym->Name)) == 0 || IsUnresolvedExport (E)) {
+ /* The symbol is undefined, generate an export */
+ E = CreateExprExport (Sym->Name, Sym->Value, Sym->AddrSize);
+ E->Pos = Sym->Pos;
+ }
+ break;
+ default:
+ Internal ("Unexpected symbol type %d", Sym->Type);
+ break;
}
}
+
}
static void CreateRunDefines (SegDesc* S, unsigned long SegAddr)
/* Create the defines for a RUN segment */
{
+ Export* E;
StrBuf Buf = STATIC_STRBUF_INITIALIZER;
+ /* Define the run address of the segment */
SB_Printf (&Buf, "__%s_RUN__", GetString (S->Name));
- CreateMemoryExport (GetStrBufId (&Buf), S->Run, SegAddr - S->Run->Start);
+ E = CreateMemoryExport (GetStrBufId (&Buf), S->Run, SegAddr - S->Run->Start);
+ E->Pos = S->Pos;
+
+ /* Define the size of the segment */
SB_Printf (&Buf, "__%s_SIZE__", GetString (S->Name));
- CreateConstExport (GetStrBufId (&Buf), S->Seg->Size);
+ E = CreateConstExport (GetStrBufId (&Buf), S->Seg->Size);
+ E->Pos = S->Pos;
+
S->Flags |= SF_RUN_DEF;
SB_Done (&Buf);
}
static void CreateLoadDefines (SegDesc* S, unsigned long SegAddr)
/* Create the defines for a LOAD segment */
{
+ Export* E;
StrBuf Buf = STATIC_STRBUF_INITIALIZER;
+ /* Define the load address of the segment */
SB_Printf (&Buf, "__%s_LOAD__", GetString (S->Name));
- CreateMemoryExport (GetStrBufId (&Buf), S->Load, SegAddr - S->Load->Start);
+ E = CreateMemoryExport (GetStrBufId (&Buf), S->Load, SegAddr - S->Load->Start);
+ E->Pos = S->Pos;
+
S->Flags |= SF_LOAD_DEF;
SB_Done (&Buf);
}
unsigned Overflows = 0;
unsigned I;
- /* Do postprocessing of the config file data */
- ProcessSymbols (); /* ######## */
- ProcessMemory ();
+ /* Postprocess symbols. We must do that first, since weak symbols are
+ * defined here, which may be needed later.
+ */
+ ProcessSymbols ();
+
+ /* Postprocess segments */
ProcessSegments ();
- ProcessFormats ();
/* Walk through each of the memory sections. Add up the sizes and check
* for an overflow of the section. Assign the start addresses of the
for (I = 0; I < CollCount (&MemoryAreas); ++I) {
unsigned J;
+ unsigned long Addr;
- /* Get this entry */
+ /* Get the next memory area */
MemoryArea* M = CollAtUnchecked (&MemoryAreas, I);
+ /* Remember if this is a relocatable memory area */
+ M->Relocatable = RelocatableBinFmt (M->F->Format);
+
+ /* Resolve the start address expression */
+ if (!IsConstExpr (M->StartExpr)) {
+ CfgError (&M->Pos,
+ "Start address of memory area `%s' is not constant",
+ GetString (M->Name));
+ }
+ M->Start = GetExprVal (M->StartExpr);
+
+ /* Resolve the size expression */
+ if (!IsConstExpr (M->SizeExpr)) {
+ CfgError (&M->Pos,
+ "Size of memory area `%s' is not constant",
+ GetString (M->Name));
+ }
+ M->Size = GetExprVal (M->SizeExpr);
+
+ /* Mark the memory area as placed */
+ M->Flags |= MF_PLACED;
+
/* Get the start address of this memory area */
- unsigned long Addr = M->Start;
+ Addr = M->Start;
/* Walk through the segments in this memory area */
for (J = 0; J < CollCount (&M->SegList); ++J) {
/* If requested, define symbols for start and size of the memory area */
if (M->Flags & MF_DEFINE) {
+ Export* E;
StrBuf Buf = STATIC_STRBUF_INITIALIZER;
+
+ /* Define the start of the memory area */
SB_Printf (&Buf, "__%s_START__", GetString (M->Name));
- CreateMemoryExport (GetStrBufId (&Buf), M, 0);
+ E = CreateMemoryExport (GetStrBufId (&Buf), M, 0);
+ E->Pos = M->Pos;
+
+ /* Define the size of the memory area */
SB_Printf (&Buf, "__%s_SIZE__", GetString (M->Name));
- CreateConstExport (GetStrBufId (&Buf), M->Size);
+ E = CreateConstExport (GetStrBufId (&Buf), M->Size);
+ E->Pos = M->Pos;
+
+ /* Define the fill level of the memory area */
SB_Printf (&Buf, "__%s_LAST__", GetString (M->Name));
- CreateMemoryExport (GetStrBufId (&Buf), M, M->FillLevel);
+ E = CreateMemoryExport (GetStrBufId (&Buf), M, M->FillLevel);
+ E->Pos = M->Pos;
+
SB_Done (&Buf);
}
Import* I = xmalloc (sizeof (Import));
/* Initialize the fields */
- I->Next = 0;
- I->Obj = Obj;
+ I->Next = 0;
+ I->Obj = Obj;
InitFilePos (&I->Pos);
I->Exp = 0;
I->Name = INVALID_STRING_ID;
E->ImpCount = 0;
E->ImpList = 0;
E->Expr = 0;
+ InitFilePos (&E->Pos);
E->Type = Type;
E->AddrSize = AddrSize;
memset (E->ConDes, 0, sizeof (E->ConDes));
+Export* CreateExprExport (unsigned Name, ExprNode* Expr, unsigned char AddrSize)
+/* Create an export for an expression */
+{
+ /* Create a new export */
+ Export* E = NewExport (SYM_EXPR | SYM_EQUATE, AddrSize, Name, 0);
+
+ /* Assign the value expression */
+ E->Expr = Expr;
+
+ /* Insert the export */
+ InsertExport (E);
+
+ /* Return the new export */
+ return E;
+}
+
+
+
Export* CreateMemoryExport (unsigned Name, MemoryArea* Mem, unsigned long Offs)
/* Create an relative export for a memory area offset */
{
/* Check the types for one export */
{
/* External with matching imports */
- Import* Imp = E->ImpList;
- while (Imp) {
- if (E->AddrSize != Imp->AddrSize) {
- /* Export is ZP, import is abs or the other way round */
+ Import* I = E->ImpList;
+ while (I) {
+ if (E->AddrSize != I->AddrSize) {
+ /* Export and import address sizes do not match */
+ StrBuf ExportLoc = STATIC_STRBUF_INITIALIZER;
+ StrBuf ImportLoc = STATIC_STRBUF_INITIALIZER;
const char* ExpAddrSize = AddrSizeToStr (E->AddrSize);
- const char* ImpAddrSize = AddrSizeToStr (Imp->AddrSize);
- const char* ExpObjName = GetObjFileName (E->Obj);
- const char* ImpObjName = GetObjFileName (Imp->Obj);
- if (E->Obj) {
- /* User defined export */
- Warning ("Address size mismatch for `%s': Exported from %s, "
- "%s(%lu) as `%s', import in %s, %s(%lu) as `%s'",
- GetString (E->Name),
- ExpObjName,
- GetSourceFileName (E->Obj, E->Pos.Name),
- E->Pos.Line,
- ExpAddrSize,
- ImpObjName,
- GetSourceFileName (Imp->Obj, Imp->Pos.Name),
- Imp->Pos.Line,
- ImpAddrSize);
- } else {
- /* Export created by the linker */
- Warning ("Address size mismatch for `%s': Symbol is `%s'"
- ", but imported from %s, %s(%lu) as `%s'",
- GetString (E->Name),
- ExpAddrSize,
- ImpObjName,
- GetSourceFileName (Imp->Obj, Imp->Pos.Name),
- Imp->Pos.Line,
- ImpAddrSize);
- }
+ const char* ImpAddrSize = AddrSizeToStr (I->AddrSize);
+
+ /* Generate strings that describe the location of the im- and
+ * exports. This depends on the place from where they come:
+ * Object file or linker config.
+ */
+ if (E->Obj) {
+ /* The export comes from an object file */
+ SB_Printf (&ExportLoc, "%s, %s(%lu)",
+ GetString (E->Obj->Name),
+ GetSourceFileName (E->Obj, E->Pos.Name),
+ E->Pos.Line);
+ } else {
+ SB_Printf (&ExportLoc, "%s(%lu)",
+ GetSourceFileName (E->Obj, E->Pos.Name),
+ E->Pos.Line);
+ }
+ if (I->Obj) {
+ /* The import comes from an object file */
+ SB_Printf (&ImportLoc, "%s, %s(%lu)",
+ GetString (I->Obj->Name),
+ GetSourceFileName (I->Obj, I->Pos.Name),
+ I->Pos.Line);
+ } else {
+ SB_Printf (&ImportLoc, "%s(%lu)",
+ GetSourceFileName (I->Obj, I->Pos.Name),
+ I->Pos.Line);
+ }
+
+ /* Output the diagnostic */
+ Warning ("Address size mismatch for `%s': "
+ "Exported from %s as `%s', "
+ "import in %s as `%s'",
+ GetString (E->Name),
+ SB_GetConstBuf (&ExportLoc),
+ ExpAddrSize,
+ SB_GetConstBuf (&ImportLoc),
+ ImpAddrSize);
+
+ /* Free the temporary strings */
+ SB_Done (&ExportLoc);
+ SB_Done (&ImportLoc);
}
- Imp = Imp->Next;
+ I = I->Next;
}
}
projects / cc65 / commitdiff