Changeset 83349b03 in mainline

Timestamp:

2010-01-28T22:28:40Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19f24fd

Parents:

f0bdfb7

Message:

Ignore symbols with type other than 'object' or 'function'.

Location:

uspace/app/taskdump

Files:

• include/elf.h (modified) (1 diff)
• symtab.c (modified) (3 diffs)

uspace/app/taskdump/include/elf.h

@@ -148 +148 @@
 #define SHF_MASKPROC            0xf0000000
 
+/** Macros for decomposing elf_symbol.st_info into binging and type */
+#define ELF_ST_BIND(i)          ((i) >> 4)
+#define ELF_ST_TYPE(i)          ((i) & 0x0f)
+#define ELF_ST_INFO(b, t)       (((b) << 4) + ((t) & 0x0f))
+
 /**
  * Symbol binding

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;
@@ -246 +252 @@
         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;