From f23a5b042c9d0d762a9e9bc72df44b6a74affc02 Mon Sep 17 00:00:00 2001 From: Charles Crayne Date: Wed, 17 Oct 2007 17:55:45 -0700 Subject: [PATCH] Generate stabs entries for any executable section --- output/outelf32.c | 14 +++++++------- output/outelf64.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/output/outelf32.c b/output/outelf32.c index 6466b1eb..e021ba74 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -1394,7 +1394,7 @@ void stabs32_output(int type, void *param) if (type == TY_STABSSYMLIN) { if (stabs_immcall) { s = (struct symlininfo *)param; - if (strcmp(s->name, ".text")) + if (!(sects[s->section]->flags & SHF_EXECINSTR)) return; /* we are only interested in the text stuff */ numlinestabs++; el = (struct linelist *)nasm_malloc(sizeof(struct linelist)); @@ -1492,16 +1492,16 @@ void stabs32_generate(void) stabstrlen = strsize; /* set global variable for length of stab strings */ sptr = sbuf; - /* this is the first stab, its strx points to the filename of the - the source-file, the n_desc field should be set to the number - of remaining stabs - */ - WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12)); - ptr = stabslines; numstabs = 0; if (ptr) { + /* this is the first stab, its strx points to the filename of the + the source-file, the n_desc field should be set to the number + of remaining stabs + */ + WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12)); + /* this is the stab for the main source file */ WRITE_STAB(sptr, fileidx[mainfileindex], N_SO, 0, 0, 0); diff --git a/output/outelf64.c b/output/outelf64.c index a72a6bf4..3ef19a24 100644 --- a/output/outelf64.c +++ b/output/outelf64.c @@ -1409,7 +1409,7 @@ void stabs64_output(int type, void *param) if (type == TY_STABSSYMLIN) { if (stabs_immcall) { s = (struct symlininfo *)param; - if (strcmp(s->name, ".text")) + if (!(sects[s->section]->flags & SHF_EXECINSTR)) return; /* we are only interested in the text stuff */ numlinestabs++; el = (struct linelist *)nasm_malloc(sizeof(struct linelist)); @@ -1507,16 +1507,16 @@ void stabs64_generate(void) stabstrlen = strsize; /* set global variable for length of stab strings */ sptr = sbuf; - /* this is the first stab, its strx points to the filename of the - the source-file, the n_desc field should be set to the number - of remaining stabs - */ - WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12)); - ptr = stabslines; numstabs = 0; if (ptr) { + /* this is the first stab, its strx points to the filename of the + the source-file, the n_desc field should be set to the number + of remaining stabs + */ + WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12)); + /* this is the stab for the main source file */ WRITE_STAB(sptr, fileidx[mainfileindex], N_SO, 0, 0, 0);