Use "[linker generated]" as source for linker generated symbols.
git-svn-id: svn://svn.cc65.org/cc65/trunk@478 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -115,35 +115,35 @@ void FreeObjData (ObjData* O)
|
|||||||
|
|
||||||
|
|
||||||
const char* GetObjFileName (const ObjData* O)
|
const char* GetObjFileName (const ObjData* O)
|
||||||
/* Get the name of the object file. Return "(linker generated)" if the object
|
/* Get the name of the object file. Return "[linker generated]" if the object
|
||||||
* file is NULL.
|
* file is NULL.
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
return O? O->Name : "(linker generated)";
|
return O? O->Name : "[linker generated]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const char* GetSourceFileName (const ObjData* O, unsigned Index)
|
const char* GetSourceFileName (const ObjData* O, unsigned Index)
|
||||||
/* Get the name of the source file with the given index. If O is NULL, return
|
/* Get the name of the source file with the given index. If O is NULL, return
|
||||||
* "(linker generated)" as the file name.
|
* "[linker generated]" as the file name.
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
/* Check if we have an object file */
|
/* Check if we have an object file */
|
||||||
if (O == 0) {
|
if (O == 0) {
|
||||||
|
|
||||||
/* No object file */
|
/* No object file */
|
||||||
return "(linker generated)";
|
return "[linker generated]";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
/* Check the parameter */
|
/* Check the parameter */
|
||||||
PRECONDITION (Index < O->FileCount);
|
PRECONDITION (Index < O->FileCount);
|
||||||
|
|
||||||
/* Return the name */
|
/* Return the name */
|
||||||
return O->Files[Index];
|
return O->Files[Index];
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -98,13 +98,13 @@ void FreeObjData (ObjData* O);
|
|||||||
/* Free a complete struct */
|
/* Free a complete struct */
|
||||||
|
|
||||||
const char* GetObjFileName (const ObjData* O);
|
const char* GetObjFileName (const ObjData* O);
|
||||||
/* Get the name of the object file. Return "(linker generated)" if the object
|
/* Get the name of the object file. Return "[linker generated]" if the object
|
||||||
* file is NULL.
|
* file is NULL.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const char* GetSourceFileName (const ObjData* O, unsigned Index);
|
const char* GetSourceFileName (const ObjData* O, unsigned Index);
|
||||||
/* Get the name of the source file with the given index. If O is NULL, return
|
/* Get the name of the source file with the given index. If O is NULL, return
|
||||||
* "(linker generated)" as the file name.
|
* "[linker generated]" as the file name.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ Segment* GetSegment (const char* Name, unsigned char Type, const char* ObjName)
|
|||||||
if (S->Type != Type) {
|
if (S->Type != Type) {
|
||||||
/* Allow an empty object name */
|
/* Allow an empty object name */
|
||||||
if (ObjName == 0) {
|
if (ObjName == 0) {
|
||||||
ObjName = "(linker generated)";
|
ObjName = "[linker generated]";
|
||||||
}
|
}
|
||||||
Error ("Module `%s': Type mismatch for segment `%s'", ObjName, Name);
|
Error ("Module `%s': Type mismatch for segment `%s'", ObjName, Name);
|
||||||
}
|
}
|
||||||
@@ -505,13 +505,13 @@ void SegWrite (FILE* Tgt, Segment* S, SegWriteFunc F, void* Data)
|
|||||||
|
|
||||||
case SEG_EXPR_RANGE_ERROR:
|
case SEG_EXPR_RANGE_ERROR:
|
||||||
Error ("Range error in module `%s', line %lu",
|
Error ("Range error in module `%s', line %lu",
|
||||||
GetSourceFileName (Frag->Obj, Frag->Pos.Name),
|
GetSourceFileName (Frag->Obj, Frag->Pos.Name),
|
||||||
Frag->Pos.Line);
|
Frag->Pos.Line);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SEG_EXPR_TOO_COMPLEX:
|
case SEG_EXPR_TOO_COMPLEX:
|
||||||
Error ("Expression too complex in module `%s', line %lu",
|
Error ("Expression too complex in module `%s', line %lu",
|
||||||
GetSourceFileName (Frag->Obj, Frag->Pos.Name),
|
GetSourceFileName (Frag->Obj, Frag->Pos.Name),
|
||||||
Frag->Pos.Line);
|
Frag->Pos.Line);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user