Skip to content

Fix several issues with Codeview debug information #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SEt-t wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix several issues with Codeview debug information #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions output/codeview.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,15 @@ static void cv8_linenum(const char *filename, int32_t linenumber,
struct linepair *li;
struct source_file *file;

file = register_file(filename);

s = find_section(segto);
if (s == NULL)
return;

if ((s->flags & IMAGE_SCN_MEM_EXECUTE) == 0)
return;

file = register_file(filename);

li = saa_wstruct(file->lines);
li->file_offset = cv8_state.text_offset;
li->linenumber = linenumber;
Expand All @@ -192,10 +192,18 @@ static void cv8_deflabel(char *name, int32_t segment, int64_t offset,

(void)special;

/* Skip macro-local labels */
if (!strncmp(name, "..@", 3))
return;

s = find_section(segment);
if (s == NULL)
return;

/* MS linker errors on relocations to .pdata section, so skip such symbols */
if (!strcmp(s->name, ".pdata"))
return;

sym = saa_wstruct(cv8_state.symbols);

if (s->flags & IMAGE_SCN_MEM_EXECUTE)
Expand Down Expand Up @@ -558,10 +566,10 @@ static void write_linenumber_table(struct coff_Section *const sect)
section_write16(sect, 0); /* pad */
section_write32(sect, s->len);

register_reloc(sect, ".text", field_base,
register_reloc(sect, s->name, field_base,
win64 ? IMAGE_REL_AMD64_SECREL : IMAGE_REL_I386_SECREL);

register_reloc(sect, ".text", field_base + 4,
register_reloc(sect, s->name, field_base + 4,
win64 ? IMAGE_REL_AMD64_SECTION : IMAGE_REL_I386_SECTION);

list_for_each(file, cv8_state.source_files) {
Expand Down