Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2014-09-02 15:24:09 -0400
committerEugene Tarassov2014-09-12 15:23:29 -0400
commit0b9bcb30b8295eafa97fa3c670486db7ae834424 (patch)
tree750dc155a2702ee7ab3abb421637c818fc5703ef
parent6bbe6814afa982fcce69e9a1ba78c1cd7acf7c1f (diff)
downloadorg.eclipse.tcf.agent-1.2_luna.tar.gz
org.eclipse.tcf.agent-1.2_luna.tar.xz
org.eclipse.tcf.agent-1.2_luna.zip
Bug 443084 - Split debug info does not work1.2.11.2_luna
-rw-r--r--agent/tcf/services/tcf_elf.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/agent/tcf/services/tcf_elf.c b/agent/tcf/services/tcf_elf.c
index 53c9964e..7ccf8aa0 100644
--- a/agent/tcf/services/tcf_elf.c
+++ b/agent/tcf/services/tcf_elf.c
@@ -385,6 +385,8 @@ static ELF_File * find_open_file_by_inode(dev_t dev, ino_t ino, int64_t mtime) {
static char * get_debug_info_file_name(ELF_File * file, int * error) {
unsigned idx;
+ char fnm[FILE_PATH_SIZE];
+ struct stat buf;
for (idx = 1; idx < file->section_cnt; idx++) {
ELF_Section * sec = file->sections + idx;
@@ -410,9 +412,7 @@ static char * get_debug_info_file_name(ELF_File * file, int * error) {
offs += name_sz;
while (offs % 4 != 0) offs++;
if (type == 3 && strcmp(name, "GNU") == 0) {
- char fnm[FILE_PATH_SIZE];
char * lnm = fnm;
- struct stat buf;
char id[64];
size_t id_size = 0;
U1_T * desc = (U1_T *)sec->data + offs;
@@ -430,11 +430,6 @@ static char * get_debug_info_file_name(ELF_File * file, int * error) {
lnm = apply_path_map(NULL, NULL, lnm, PATH_MAP_TO_LOCAL);
#endif
if (stat(lnm, &buf) == 0) return loc_strdup(lnm);
- snprintf(fnm, sizeof(fnm), "%s.debug", file->name);
-#if SERVICE_PathMap
- lnm = apply_path_map(NULL, NULL, lnm, PATH_MAP_TO_LOCAL);
-#endif
- if (stat(lnm, &buf) == 0) return loc_strdup(lnm);
}
offs += desc_sz;
while (offs % 4 != 0) offs++;
@@ -447,9 +442,7 @@ static char * get_debug_info_file_name(ELF_File * file, int * error) {
}
else {
/* TODO: check debug info CRC */
- char fnm[FILE_PATH_SIZE];
char * lnm = fnm;
- struct stat buf;
char * name = (char *)sec->data;
int l = (int)strlen(file->name);
while (l > 0 && file->name[l - 1] != '/' && file->name[l - 1] != '\\') l--;
@@ -467,6 +460,14 @@ static char * get_debug_info_file_name(ELF_File * file, int * error) {
}
}
}
+ {
+ char * lnm = fnm;
+ snprintf(fnm, sizeof(fnm), "%s.debug", file->name);
+#if SERVICE_PathMap
+ lnm = apply_path_map(NULL, NULL, lnm, PATH_MAP_TO_LOCAL);
+#endif
+ if (stat(lnm, &buf) == 0) return loc_strdup(lnm);
+ }
return NULL;
}
@@ -1307,10 +1308,10 @@ UnitAddressRange * elf_find_unit(Context * ctx, ContextAddress addr_min, Context
}
if (r->sect_name == NULL) {
ELF_File * debug = get_dwarf_file(file);
- for (j = 0; range == NULL && j < debug->pheader_cnt; j++) {
+ for (j = 0; range == NULL && j < file->pheader_cnt; j++) {
U8_T offs_min = 0;
U8_T offs_max = 0;
- ELF_PHeader * p = debug->pheaders + j;
+ ELF_PHeader * p = file->pheaders + j;
ELF_Section * sec = NULL;
if (!is_p_header_region(p, r)) continue;
offs_min = addr_min - r->addr + r->file_offs;

Back to the top