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


Ignore:
Timestamp:
2010-02-09T21:03:02Z (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/taskdump/symtab.c

    r696979ce r5bda2f96  
    206206        size_t i;
    207207        char *sname;
     208        unsigned stype;
    208209
    209210        for (i = 0; i < st->sym_size / sizeof(elf_symbol_t); ++i) {
    210211                if (st->sym[i].st_name == 0)
     212                        continue;
     213
     214                stype = ELF_ST_TYPE(st->sym[i].st_info);
     215                if (stype != STT_OBJECT && stype != STT_FUNC)
    211216                        continue;
    212217
     
    240245        uintptr_t saddr, best_addr;
    241246        char *sname, *best_name;
     247        unsigned stype;
    242248
    243249        best_name = NULL;
     
    248254                        continue;
    249255
     256                stype = ELF_ST_TYPE(st->sym[i].st_info);
     257                if (stype != STT_OBJECT && stype != STT_FUNC &&
     258                    stype != STT_NOTYPE) {
     259                        continue;
     260                }
     261
    250262                saddr = st->sym[i].st_value;
    251263                sname = st->strtab + st->sym[i].st_name;
     264
     265                /* An ugly hack to filter out some special ARM symbols. */
     266                if (sname[0] == '$')
     267                        continue;
    252268
    253269                if (best_name == NULL || (saddr <= addr && saddr > best_addr)) {
Note: See TracChangeset for help on using the changeset viewer.