Changeset 0b9ac3c in mainline for uspace/app/taskdump/symtab.c

Timestamp:

2010-02-23T19:03:28Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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 mainline changes.

File:

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

uspace/app/taskdump/symtab.c

@@ -49 +49 @@
 static int section_hdr_load(int fd, const elf_header_t *ehdr, int idx,
     elf_section_header_t *shdr);
-static int chunk_load(int fd, off_t start, off_t size, void **ptr);
+static int chunk_load(int fd, off64_t start, size_t size, void **ptr);
 static int read_all(int fd, void *buf, size_t len);
 
@@ -65 +65 @@
         elf_header_t elf_hdr;
         elf_section_header_t sec_hdr;
-        off_t shstrt_start, shstrt_size;
+        off64_t shstrt_start;
+        size_t shstrt_size;
         char *shstrt, *sec_name;
         void *data;
@@ -206 +207 @@
         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 +246 @@
         uintptr_t saddr, best_addr;
         char *sname, *best_name;
+        unsigned stype;
 
         best_name = NULL;
@@ -248 +255 @@
                         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)) {
@@ -291 +308 @@
         rc = lseek(fd, elf_hdr->e_shoff + idx * sizeof(elf_section_header_t),
             SEEK_SET);
-        if (rc == (off_t) -1)
+        if (rc == (off64_t) -1)
                 return EIO;
 
@@ -312 +329 @@
  * @return              EOK on success or EIO on failure.
  */
-static int chunk_load(int fd, off_t start, off_t size, void **ptr)
+static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
         int rc;
 
         rc = lseek(fd, start, SEEK_SET);
-        if (rc == (off_t) -1) {
+        if (rc == (off64_t) -1) {
                 printf("failed seeking chunk\n");
                 *ptr = NULL;