Changeset 5bda2f96 in mainline for uspace/app/taskdump/symtab.c

Timestamp:

2010-02-09T21:03:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

83b4cf53

Parents:

696979ce (diff), a60b2d7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline.

File:

• uspace/app/taskdump/symtab.c (modified) (3 diffs)

uspace/app/taskdump/symtab.c

@@ -206 +206 @@
         size_t i;
         char *sname;
+        unsigned stype;
 
         for (i = 0; i < st->sym_size / sizeof(elf_symbol_t); ++i) {
                 if (st->sym[i].st_name == 0)
+                        continue;
+
+                stype = ELF_ST_TYPE(st->sym[i].st_info);
+                if (stype != STT_OBJECT && stype != STT_FUNC)
                         continue;
 
@@ -240 +245 @@
         uintptr_t saddr, best_addr;
         char *sname, *best_name;
+        unsigned stype;
 
         best_name = NULL;
@@ -248 +254 @@
                         continue;
 
+                stype = ELF_ST_TYPE(st->sym[i].st_info);
+                if (stype != STT_OBJECT && stype != STT_FUNC &&
+                    stype != STT_NOTYPE) {
+                        continue;
+                }
+
                 saddr = st->sym[i].st_value;
                 sname = st->strtab + st->sym[i].st_name;
+
+                /* An ugly hack to filter out some special ARM symbols. */
+                if (sname[0] == '$')
+                        continue;
 
                 if (best_name == NULL || (saddr <= addr && saddr > best_addr)) {