1
0
mirror of https://github.com/cc65/cc65.git synced 2024-06-28 19:29:53 +00:00

More line number related changes.

This commit is contained in:
Andrea Odetti 2021-05-11 16:32:43 +01:00 committed by Oliver Schmidt
parent 93762a2117
commit 05f545e189
2 changed files with 6 additions and 6 deletions

View File

@ -15,6 +15,6 @@
void __fastcall__ _afailed (char* file, unsigned line) void __fastcall__ _afailed (char* file, unsigned line)
{ {
raise (SIGABRT); raise (SIGABRT);
fprintf (stderr, "ASSERTION FAILED IN %s(%u)\n", file, line); fprintf (stderr, "ASSERTION FAILED IN %s:%u\n", file, line);
exit (EXIT_ASSERT); exit (EXIT_ASSERT);
} }

View File

@ -690,12 +690,12 @@ static void CheckSymType (const Export* E)
*/ */
if (E->Obj) { if (E->Obj) {
/* The export comes from an object file */ /* The export comes from an object file */
SB_Printf (&ExportLoc, "%s, %s(%u)", SB_Printf (&ExportLoc, "%s, %s:%u",
GetString (E->Obj->Name), GetString (E->Obj->Name),
GetSourceName (ExportLI), GetSourceName (ExportLI),
GetSourceLine (ExportLI)); GetSourceLine (ExportLI));
} else if (ExportLI) { } else if (ExportLI) {
SB_Printf (&ExportLoc, "%s(%u)", SB_Printf (&ExportLoc, "%s:%u",
GetSourceName (ExportLI), GetSourceName (ExportLI),
GetSourceLine (ExportLI)); GetSourceLine (ExportLI));
} else { } else {
@ -706,7 +706,7 @@ static void CheckSymType (const Export* E)
} }
if (I->Obj) { if (I->Obj) {
/* The import comes from an object file */ /* The import comes from an object file */
SB_Printf (&ImportLoc, "%s, %s(%u)", SB_Printf (&ImportLoc, "%s, %s:%u",
GetString (I->Obj->Name), GetString (I->Obj->Name),
GetSourceName (ImportLI), GetSourceName (ImportLI),
GetSourceLine (ImportLI)); GetSourceLine (ImportLI));
@ -714,7 +714,7 @@ static void CheckSymType (const Export* E)
/* The import is linker generated and we have line /* The import is linker generated and we have line
** information ** information
*/ */
SB_Printf (&ImportLoc, "%s(%u)", SB_Printf (&ImportLoc, "%s:%u",
GetSourceName (ImportLI), GetSourceName (ImportLI),
GetSourceLine (ImportLI)); GetSourceLine (ImportLI));
} else { } else {
@ -995,7 +995,7 @@ void PrintImportMap (FILE* F)
const LineInfo* LI = GetImportPos (Imp); const LineInfo* LI = GetImportPos (Imp);
if (LI) { if (LI) {
fprintf (F, fprintf (F,
" %-25s %s(%u)\n", " %-25s %s:%u\n",
GetObjFileName (Imp->Obj), GetObjFileName (Imp->Obj),
GetSourceName (LI), GetSourceName (LI),
GetSourceLine (LI)); GetSourceLine (LI));