the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added dbg file generation

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@764 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2001-05-29 07:39:46 +00:00
parent 45242a8e02
commit 3889a2bec9
20 changed files with 344 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ld65/bin.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1999-2000 Ullrich von Bassewitz */ /* (C) 1999-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -45,6 +45,7 @@
#include "global.h" #include "global.h"
#include "error.h" #include "error.h"
#include "fileio.h" #include "fileio.h"
#include "lineinfo.h"
#include "segments.h" #include "segments.h"
#include "exports.h" #include "exports.h"
#include "config.h" #include "config.h"
@@ -186,6 +187,7 @@ static void BinWriteMem (BinDesc* D, Memory* M)
* if the memory area is the load area. * if the memory area is the load area.
*/ */
if (DoWrite) { if (DoWrite) {
RelocLineInfo (S->Seg);
SegWrite (D->F, S->Seg, BinWriteExpr, D); SegWrite (D->F, S->Seg, BinWriteExpr, D);
} else if (M->Flags & MF_FILL) { } else if (M->Flags & MF_FILL) {
WriteMult (D->F, M->FillVal, S->Seg->Size); WriteMult (D->F, M->FillVal, S->Seg->Size);

4
src/ld65/bin.h
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1999 Ullrich von Bassewitz */ /* (C) 1999-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */

2
src/ld65/dbgsyms.c
View File

@@ -2,7 +2,7 @@
/* */ /* */
/* dbgsyms.c */ /* dbgsyms.c */
/* */ /* */
/* Debug symbol handing for the ld65 linker */ /* Debug symbol handling for the ld65 linker */
/* */ /* */
/* */ /* */
/* */ /* */

2
src/ld65/dbgsyms.h
View File

@@ -2,7 +2,7 @@
/* */ /* */
/* dbgsyms.h */ /* dbgsyms.h */
/* */ /* */
/* Debug symbol handing for the ld65 linker */ /* Debug symbol handling for the ld65 linker */
/* */ /* */
/* */ /* */
/* */ /* */

11
src/ld65/fragment.h
View File

@@ -43,6 +43,17 @@
/*****************************************************************************/
/* Forwards */
/*****************************************************************************/
struct LineInfo;
struct Section;
/*****************************************************************************/ /*****************************************************************************/
/* Data */ /* Data */
/*****************************************************************************/ /*****************************************************************************/

5
src/ld65/global.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998 Ullrich von Bassewitz */ /* (C) 1998-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -50,6 +50,7 @@ unsigned long StartAddr = 0x200; /* Start address */
unsigned char VerboseMap = 0; /* Verbose map file */ unsigned char VerboseMap = 0; /* Verbose map file */
const char* MapFileName = 0; /* Name of the map file */ const char* MapFileName = 0; /* Name of the map file */
const char* LabelFileName = 0; /* Name of the label file */ const char* LabelFileName = 0; /* Name of the label file */
const char* DbgFileName = 0; /* Name of the debug file */
unsigned char WProtSegs = 0; /* Mark write protected segments */ unsigned char WProtSegs = 0; /* Mark write protected segments */

5
src/ld65/global.h
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998 Ullrich von Bassewitz */ /* (C) 1998-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -51,6 +51,7 @@ extern unsigned long StartAddr; /* Start address */
extern unsigned char VerboseMap; /* Verbose map file */ extern unsigned char VerboseMap; /* Verbose map file */
extern const char* MapFileName; /* Name of the map file */ extern const char* MapFileName; /* Name of the map file */
extern const char* LabelFileName; /* Name of the label file */ extern const char* LabelFileName; /* Name of the label file */
extern const char* DbgFileName; /* Name of the debug file */
extern unsigned char WProtSegs; /* Mark write protected segments */ extern unsigned char WProtSegs; /* Mark write protected segments */

21
src/ld65/library.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2000 Ullrich von Bassewitz */ /* (C) 1998-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -101,6 +101,8 @@ static void LibReadObjHeader (ObjData* O)
O->Header.ExportSize = Read32 (Lib); O->Header.ExportSize = Read32 (Lib);
O->Header.DbgSymOffs = Read32 (Lib); O->Header.DbgSymOffs = Read32 (Lib);
O->Header.DbgSymSize = Read32 (Lib); O->Header.DbgSymSize = Read32 (Lib);
O->Header.LineInfoOffs = Read32 (Lib);
O->Header.LineInfoSize = Read32 (Lib);
} }
@@ -254,14 +256,21 @@ void LibAdd (FILE* F, const char* Name)
fseek (Lib, O->Start + O->Header.FileOffs, SEEK_SET); fseek (Lib, O->Start + O->Header.FileOffs, SEEK_SET);
ObjReadFiles (Lib, O); ObjReadFiles (Lib, O);
/* Seek to the start of the segment list and read the segments */
fseek (Lib, O->Start + O->Header.SegOffs, SEEK_SET);
ObjReadSections (Lib, O);
/* Seek to the start of the debug info and read the debug info */ /* Seek to the start of the debug info and read the debug info */
fseek (Lib, O->Start + O->Header.DbgSymOffs, SEEK_SET); fseek (Lib, O->Start + O->Header.DbgSymOffs, SEEK_SET);
ObjReadDbgSyms (Lib, O); ObjReadDbgSyms (Lib, O);
/* Seek to the start of the line infos and read them */
fseek (Lib, O->Start + O->Header.LineInfoOffs, SEEK_SET);
ObjReadLineInfos (Lib, O);
/* Seek to the start of the segment list and read the segments.
* This must be last, since the data here may reference other
* stuff.
*/
fseek (Lib, O->Start + O->Header.SegOffs, SEEK_SET);
ObjReadSections (Lib, O);
/* We have the data now */ /* We have the data now */
O->Flags |= OBJ_HAVEDATA; O->Flags |= OBJ_HAVEDATA;

104
src/ld65/lineinfo.c
View File

@@ -39,6 +39,8 @@
/* ld65 */ /* ld65 */
#include "fileio.h" #include "fileio.h"
#include "fragment.h"
#include "segments.h"
#include "lineinfo.h" #include "lineinfo.h"
@@ -49,6 +51,22 @@
static CodeRange* NewCodeRange (unsigned long Offs, unsigned long Size)
/* Create and return a new CodeRange struct */
{
/* Allocate memory */
CodeRange* R = xmalloc (sizeof (CodeRange));
/* Initialize the fields */
R->Offs = Offs;
R->Size = Size;
/* Return the new struct */
return R;
}
static LineInfo* NewLineInfo (void) static LineInfo* NewLineInfo (void)
/* Create and return a new LineInfo struct */ /* Create and return a new LineInfo struct */
{ {
@@ -59,6 +77,7 @@ static LineInfo* NewLineInfo (void)
LI->File = 0; LI->File = 0;
InitFilePos (&LI->Pos); InitFilePos (&LI->Pos);
InitCollection (&LI->Fragments); InitCollection (&LI->Fragments);
InitCollection (&LI->CodeRanges);
/* Return the new struct */ /* Return the new struct */
return LI; return LI;
@@ -85,3 +104,88 @@ LineInfo* ReadLineInfo (FILE* F, ObjData* O)
static void AddCodeRange (LineInfo* LI, unsigned long Offs, unsigned long Size)
/* Add a range of code to this line */
{
unsigned I;
/* Get a pointer to the collection */
Collection* CodeRanges = &LI->CodeRanges;
/* We will keep the CodeRanges collection sorted by starting offset,
* so we have to search for the correct insert position. Since in most
* cases, the fragments have increasing order, and there is usually not
* more than one or two ranges, we do a linear search.
*/
for (I = 0; I < CollCount (CodeRanges); ++I) {
CodeRange* R = CollAtUnchecked (CodeRanges, I);
if (Offs < R->Offs) {
/* Got the insert position */
if (Offs + Size == R->Offs) {
/* Merge the two */
R->Offs = Offs;
R->Size += Size;
} else {
/* Insert a new entry */
CollInsert (CodeRanges, NewCodeRange (Offs, Size), I);
}
/* Done */
return;
} else if (R->Offs + R->Size == Offs) {
/* This is the regular case. Merge the two. */
R->Size += Size;
/* Done */
return;
}
}
/* We must append an entry */
CollAppend (CodeRanges, NewCodeRange (Offs, Size));
}
void RelocLineInfo (struct Segment* S)
/* Relocate the line info for a segment. */
{
unsigned long Offs = 0;
/* Loop over all sections in this segment */
Section* Sec = S->SecRoot;
while (Sec) {
Fragment* Frag;
/* Adjust for fill bytes */
Offs += Sec->Fill;
/* Loop over all fragments in this section */
Frag = Sec->FragRoot;
while (Frag) {
/* Add the range for this fragment to the line info if there
* is any
*/
if (Frag->LI) {
AddCodeRange (Frag->LI, Offs, Frag->Size);
}
/* Update the offset */
Offs += Frag->Size;
/* Next fragment */
Frag = Frag->Next;
}
/* Next section */
Sec = Sec->Next;
}
}

22
src/ld65/lineinfo.h
View File

@@ -47,17 +47,36 @@
/*****************************************************************************/
/* Forwards */
/*****************************************************************************/
struct Segment;
/*****************************************************************************/ /*****************************************************************************/
/* Data */ /* Data */
/*****************************************************************************/ /*****************************************************************************/
typedef struct CodeRange CodeRange;
struct CodeRange {
unsigned long Offs;
unsigned long Size;
};
typedef struct LineInfo LineInfo; typedef struct LineInfo LineInfo;
struct LineInfo { struct LineInfo {
struct FileInfo* File; /* File struct for this line */ struct FileInfo* File; /* File struct for this line */
FilePos Pos; /* File position */ FilePos Pos; /* File position */
Collection Fragments; /* Fragments for this line */ Collection Fragments; /* Fragments for this line */
Collection CodeRanges; /* Code ranges for this line */
}; };
@@ -71,6 +90,9 @@ struct LineInfo {
LineInfo* ReadLineInfo (FILE* F, ObjData* O); LineInfo* ReadLineInfo (FILE* F, ObjData* O);
/* Read a line info from a file and return it */ /* Read a line info from a file and return it */
void RelocLineInfo (struct Segment* S);
/* Relocate the line info for a segment. */
/* End of lineinfo.h */ /* End of lineinfo.h */

12
src/ld65/main.c
View File

@@ -226,6 +226,14 @@ static void OptConfig (const char* Opt, const char* Arg)
static void OptDbgFile (const char* Opt, const char* Arg)
/* Give the name of the debug file */
{
DbgFileName = Arg;
}
static void OptHelp (const char* Opt, const char* Arg) static void OptHelp (const char* Opt, const char* Arg)
/* Print usage information and exit */ /* Print usage information and exit */
{ {
@@ -288,6 +296,7 @@ int main (int argc, char* argv [])
/* Program long options */ /* Program long options */
static const LongOpt OptTab[] = { static const LongOpt OptTab[] = {
{ "--config", 1, OptConfig }, { "--config", 1, OptConfig },
{ "--dbgfile", 1, OptDbgFile },
{ "--help", 0, OptHelp }, { "--help", 0, OptHelp },
{ "--mapfile", 1, OptMapFile }, { "--mapfile", 1, OptMapFile },
{ "--start-addr", 1, OptStartAddr }, { "--start-addr", 1, OptStartAddr },
@@ -425,6 +434,9 @@ int main (int argc, char* argv [])
if (LabelFileName) { if (LabelFileName) {
CreateLabelFile (); CreateLabelFile ();
} }
if (DbgFileName) {
CreateDbgFile ();
}
/* Dump the data for debugging */ /* Dump the data for debugging */
if (Verbosity > 1) { if (Verbosity > 1) {

1
src/ld65/make/gcc.mak
View File

@@ -22,6 +22,7 @@ OBJS = bin.o \
binfmt.o \ binfmt.o \
condes.o \ condes.o \
config.o \ config.o \
dbginfo.o \
dbgsyms.o \ dbgsyms.o \
error.o \ error.o \
exports.o \ exports.o \

2
src/ld65/make/watcom.mak
View File

@@ -71,6 +71,7 @@ OBJS = bin.obj \
binfmt.obj \ binfmt.obj \
condes.obj \ condes.obj \
config.obj \ config.obj \
dbginfo.obj \
dbgsyms.obj \ dbgsyms.obj \
error.obj \ error.obj \
exports.obj \ exports.obj \
@@ -115,6 +116,7 @@ FILE bin.obj
FILE binfmt.obj FILE binfmt.obj
FILE condes.obj FILE condes.obj
FILE config.obj FILE config.obj
FILE dbginfo.obj
FILE dbgsyms.obj FILE dbgsyms.obj
FILE error.obj FILE error.obj
FILE exports.obj FILE exports.obj

37
src/ld65/mapfile.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998 Ullrich von Bassewitz */ /* (C) 1998-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -41,6 +41,7 @@
#include "error.h" #include "error.h"
#include "objdata.h" #include "objdata.h"
#include "segments.h" #include "segments.h"
#include "dbginfo.h"
#include "dbgsyms.h" #include "dbgsyms.h"
#include "exports.h" #include "exports.h"
#include "config.h" #include "config.h"
@@ -124,7 +125,7 @@ void CreateLabelFile (void)
{ {
ObjData* O; ObjData* O;
/* Open the map file */ /* Open the label file */
FILE* F = fopen (LabelFileName, "w"); FILE* F = fopen (LabelFileName, "w");
if (F == 0) { if (F == 0) {
Error ("Cannot create label file `%s': %s", LabelFileName, strerror (errno)); Error ("Cannot create label file `%s': %s", LabelFileName, strerror (errno));
@@ -168,3 +169,33 @@ void CreateLabelFile (void)
void CreateDbgFile (void)
/* Create a debug info file */
{
ObjData* O;
/* Open the debug info file */
FILE* F = fopen (DbgFileName, "w");
if (F == 0) {
Error ("Cannot create label file `%s': %s", DbgFileName, strerror (errno));
}
/* Print line infos from all modules we have linked into the output file */
O = ObjRoot;
while (O) {
if (O->Flags & OBJ_HAVEDATA) {
/* We've linked this module */
PrintDbgInfo (O, F);
}
O = O->Next;
}
/* Close the file */
if (fclose (F) != 0) {
Error ("Error closing map file `%s': %s", DbgFileName, strerror (errno));
}
}

7
src/ld65/mapfile.h
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998 Ullrich von Bassewitz */ /* (C) 1998-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -54,6 +54,9 @@ void CreateMapFile (void);
void CreateLabelFile (void); void CreateLabelFile (void);
/* Create a label file */ /* Create a label file */
void CreateDbgFile (void);
/* Create a debug info file */
/* End of mapfile.h */ /* End of mapfile.h */

25
src/ld65/o65.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1999-2000 Ullrich von Bassewitz */ /* (C) 1999-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -50,6 +50,7 @@
#include "expr.h" #include "expr.h"
#include "fileio.h" #include "fileio.h"
#include "global.h" #include "global.h"
#include "lineinfo.h"
#include "o65.h" #include "o65.h"
@@ -82,8 +83,8 @@
#define O65RELOC_SEG 0xa0 #define O65RELOC_SEG 0xa0
/* O65 executable file header */ /* O65 executable file header */
typedef struct O65Header_ O65Header; typedef struct O65Header O65Header;
struct O65Header_ { struct O65Header {
unsigned Version; /* Version number for o65 format */ unsigned Version; /* Version number for o65 format */
unsigned Mode; /* Mode word */ unsigned Mode; /* Mode word */
unsigned long TextBase; /* Base address of text segment */ unsigned long TextBase; /* Base address of text segment */
@@ -98,8 +99,8 @@ struct O65Header_ {
}; };
/* An o65 option */ /* An o65 option */
typedef struct O65Option_ O65Option; typedef struct O65Option O65Option;
struct O65Option_ { struct O65Option {
O65Option* Next; /* Next in option list */ O65Option* Next; /* Next in option list */
unsigned char Type; /* Type of option */ unsigned char Type; /* Type of option */
unsigned char Len; /* Data length */ unsigned char Len; /* Data length */
@@ -108,15 +109,15 @@ struct O65Option_ {
/* A o65 relocation table */ /* A o65 relocation table */
#define RELOC_BLOCKSIZE 4096 #define RELOC_BLOCKSIZE 4096
typedef struct O65RelocTab_ O65RelocTab; typedef struct O65RelocTab O65RelocTab;
struct O65RelocTab_ { struct O65RelocTab {
unsigned Size; /* Size of the table */ unsigned Size; /* Size of the table */
unsigned Fill; /* Amount used */ unsigned Fill; /* Amount used */
unsigned char* Buf; /* Buffer, dynamically allocated */ unsigned char* Buf; /* Buffer, dynamically allocated */
}; };
/* Structure describing the format */ /* Structure describing the format */
struct O65Desc_ { struct O65Desc {
O65Header Header; /* File header */ O65Header Header; /* File header */
O65Option* Options; /* List of file options */ O65Option* Options; /* List of file options */
ExtSymTab* Exports; /* Table with exported symbols */ ExtSymTab* Exports; /* Table with exported symbols */
@@ -143,8 +144,8 @@ struct O65Desc_ {
}; };
/* Structure for parsing expression trees */ /* Structure for parsing expression trees */
typedef struct ExprDesc_ ExprDesc; typedef struct ExprDesc ExprDesc;
struct ExprDesc_ { struct ExprDesc {
O65Desc* D; /* File format descriptor */ O65Desc* D; /* File format descriptor */
long Val; /* The offset value */ long Val; /* The offset value */
int TooComplex; /* Expression too complex */ int TooComplex; /* Expression too complex */
@@ -580,6 +581,7 @@ static void O65WriteSeg (O65Desc* D, SegDesc** Seg, unsigned Count, int DoWrite)
/* Write this segment */ /* Write this segment */
if (DoWrite) { if (DoWrite) {
RelocLineInfo (S->Seg);
SegWrite (D->F, S->Seg, O65WriteExpr, D); SegWrite (D->F, S->Seg, O65WriteExpr, D);
} }
@@ -1069,4 +1071,3 @@ void O65WriteTarget (O65Desc* D, File* F)

6
src/ld65/o65.h
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1999 Ullrich von Bassewitz */ /* (C) 1999-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -52,7 +52,7 @@
/* Structure describing the format */ /* Structure describing the format */
typedef struct O65Desc_ O65Desc; typedef struct O65Desc O65Desc;
/* Option tags */ /* Option tags */
#define O65OPT_FILENAME 0 #define O65OPT_FILENAME 0

4
src/ld65/objfile.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998 Ullrich von Bassewitz */ /* (C) 1998-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */

11
src/ld65/objfile.h
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998 Ullrich von Bassewitz */ /* (C) 1998-2001 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Wacholderweg 14 */
/* D-70597 Stuttgart */ /* D-70597 Stuttgart */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -40,8 +40,10 @@
#include <stdio.h> #include <stdio.h>
#include "../common/objdefs.h" /* common */
#include "objdefs.h"
/* ld65 */
#include "objdata.h" #include "objdata.h"
@@ -64,6 +66,9 @@ void ObjReadExports (FILE* F, ObjData* O);
void ObjReadDbgSyms (FILE* F, ObjData* O); void ObjReadDbgSyms (FILE* F, ObjData* O);
/* Read the debug symbols from a file at the current position */ /* Read the debug symbols from a file at the current position */
void ObjReadLineInfos (FILE* F, ObjData* O);
/* Read the line infos from a file at the current position */
void ObjReadSections (FILE* F, ObjData* O); void ObjReadSections (FILE* F, ObjData* O);
/* Read the section data from a file at the current position */ /* Read the section data from a file at the current position */

9
src/ld65/segments.c
View File

@@ -312,7 +312,13 @@ Section* ReadSection (FILE* F, ObjData* O)
LineInfoIndex = ReadVar (F); LineInfoIndex = ReadVar (F);
if (LineInfoIndex) { if (LineInfoIndex) {
--LineInfoIndex; --LineInfoIndex;
CHECK (LineInfoIndex < O->LineInfoCount); if (LineInfoIndex >= O->LineInfoCount) {
Internal ("In module `%s', file `%s', line %lu: Invalid line "
"info with index %u (max count %u)",
GetObjFileName (O),
GetSourceFileName (O, Frag->Pos.Name),
Frag->Pos.Line, LineInfoIndex, O->LineInfoCount);
}
/* Point from the fragment to the line info... */ /* Point from the fragment to the line info... */
Frag->LI = O->LineInfos[LineInfoIndex]; Frag->LI = O->LineInfos[LineInfoIndex];
/* ...and back from the line info to the fragment */ /* ...and back from the line info to the fragment */
@@ -495,6 +501,7 @@ void SegWrite (FILE* Tgt, Segment* S, SegWriteFunc F, void* Data)
/* If we have fill bytes, write them now */ /* If we have fill bytes, write them now */
WriteMult (Tgt, S->FillVal, Sec->Fill); WriteMult (Tgt, S->FillVal, Sec->Fill);
Offs += Sec->Fill;
/* Loop over all fragments in this section */ /* Loop over all fragments in this section */
Frag = Sec->FragRoot; Frag = Sec->FragRoot;