6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-11 11:30:13 +00:00
Code Issues Projects Releases Wiki Activity

Fixed several issues where an object file reference or line infos were

Browse Source 
accessed when they in fact didn't exist, because the symbol was linker
generated (in the config or on the command line).


git-svn-id: svn://svn.cc65.org/cc65/trunk@5981 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2013-02-10 20:56:13 +00:00
parent fd679d92d0
commit 274a7210e7
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/ld65/exports.c
View File

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2011, Ullrich von Bassewitz */ /* (C) 1998-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -196,23 +196,12 @@ Import* GenImport (unsigned Name, unsigned char AddrSize)
/* Check the address size */ /* Check the address size */
if (I->AddrSize == ADDR_SIZE_DEFAULT || I->AddrSize > ADDR_SIZE_LONG) { if (I->AddrSize == ADDR_SIZE_DEFAULT || I->AddrSize > ADDR_SIZE_LONG) {
/* Beware: This function may be called in cases where the object file /* We have no object file information and no line info for a new
* is not read completely into memory. In this case, the file list is * import
* invalid. Be sure not to access it in this case.
*/ */
if (ObjHasFiles (I->Obj)) { Error ("Invalid import size 0x%02X for symbol `%s'",
const LineInfo* LI = GetImportPos (I); I->AddrSize,
Error ("Invalid import size in for `%s', imported from %s(%u): 0x%02X", GetString (I->Name));
GetString (I->Name),
GetSourceName (LI),
GetSourceLine (LI),
I->AddrSize);
} else {
Error ("Invalid import size in for `%s', imported from %s: 0x%02X",
GetString (I->Name),
GetObjFileName (I->Obj),
I->AddrSize);
}
} }
/* Return the new import */ /* Return the new import */
@ -232,7 +221,7 @@ Import* InsertImport (Import* I)
/* Create a hash value for the given name */ /* Create a hash value for the given name */
unsigned Hash = (Name & HASHTAB_MASK); unsigned Hash = (Name & HASHTAB_MASK);
/* Search through the list in that slot and print matching duplicates */ /* Search through the list in that slot for a symbol with that name */
if (HashTab[Hash] == 0) { if (HashTab[Hash] == 0) {
/* The slot is empty, we need to insert a dummy export */ /* The slot is empty, we need to insert a dummy export */
E = HashTab[Hash] = NewExport (0, ADDR_SIZE_DEFAULT, Name, 0); E = HashTab[Hash] = NewExport (0, ADDR_SIZE_DEFAULT, Name, 0);
@ -711,10 +700,18 @@ static void CheckSymType (const Export* E)
GetString (I->Obj->Name), GetString (I->Obj->Name),
GetSourceName (ImportLI), GetSourceName (ImportLI),
GetSourceLine (ImportLI)); GetSourceLine (ImportLI));
} else { } else if (ImportLI) {
/* The import is linker generated and we have line
* information
*/
SB_Printf (&ImportLoc, "%s(%u)", SB_Printf (&ImportLoc, "%s(%u)",
GetSourceName (ImportLI), GetSourceName (ImportLI),
GetSourceLine (ImportLI)); GetSourceLine (ImportLI));
} else {
/* The import is linker generated and we don't have line
* information
*/
SB_Printf (&ImportLoc, "%s", GetObjFileName (I->Obj));
} }
/* Output the diagnostic */ /* Output the diagnostic */
@ -927,13 +924,22 @@ void PrintImportMap (FILE* F)
Imp = Exp->ImpList; Imp = Exp->ImpList;
while (Imp) { while (Imp) {
/* Print the import */ /* Print the import. Beware: The import might be linker
* generated, in which case there is no object file and
* sometimes no line information.
*/
const LineInfo* LI = GetImportPos (Imp); const LineInfo* LI = GetImportPos (Imp);
fprintf (F, if (LI) {
" %-25s %s(%u)\n", fprintf (F,
GetObjFileName (Imp->Obj), " %-25s %s(%u)\n",
GetSourceName (LI), GetObjFileName (Imp->Obj),
GetSourceLine (LI)); GetSourceName (LI),
GetSourceLine (LI));
} else {
fprintf (F,
" %-25s\n",
GetObjFileName (Imp->Obj));
}
/* Next import */ /* Next import */
Imp = Imp->Next; Imp = Imp->Next;