Changeset 5baf209 in mainline

Timestamp:

2011-07-23T12:37:16Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

90b8d58

Parents:

a701812

Message:

Write register state to core files (only ia32).

Location:

uspace

Files:

• app/taskdump/elf_core.c (modified) (13 diffs)
• app/taskdump/include/elf_core.h (modified) (1 diff)
• app/taskdump/include/symtab.h (modified) (1 diff)
• app/taskdump/symtab.c (modified) (2 diffs)
• app/taskdump/taskdump.c (modified) (4 diffs)
• lib/c/arch/abs32le/include/elf_linux.h (added)
• lib/c/arch/amd64/include/elf_linux.h (added)
• lib/c/arch/arm32/include/elf_linux.h (added)
• lib/c/arch/ia32/include/elf_linux.h (added)
• lib/c/arch/ia64/include/elf_linux.h (added)
• lib/c/arch/mips32/include/elf_linux.h (added)
• lib/c/arch/mips32eb/include/elf_linux.h (added)
• lib/c/arch/mips64/include/elf_linux.h (added)
• lib/c/arch/ppc32/include/elf_linux.h (added)
• lib/c/arch/sparc64/include/elf_linux.h (added)
• lib/c/include/elf/elf.h (moved) (moved from uspace/app/taskdump/include/elf.h ) (5 diffs)
• lib/c/include/elf/elf_linux.h (added)

uspace/app/taskdump/elf_core.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
  * Looking at core files produced by Linux, these don't have section headers,
  * only program headers, although objdump shows them as having sections.
- * Basically at the beginning there should be a note segment (which we
- * do not write) and one loadable segment per memory area (which we do write).
- *
- * The note segment probably contains register state, etc. -- we don't
- * deal with these yet. Nevertheless you can use these core files with
- * objdump or gdb.
- */
-
+ * Basically at the beginning there should be a note segment followed
+ * by one loadable segment per memory area.
+ *
+ * The note segment contains a series of records with register state,
+ * process info etc. We only write one record NT_PRSTATUS which contains
+ * process/register state (anything which is not register state we fill
+ * with zeroes).
+ */
+
+#include <align.h>
+#include <elf/elf.h>
+#include <elf/elf_linux.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -58 +62 @@
 #include <udebug.h>
 #include <macros.h>
-
-#include <elf.h>
-#include "include/elf_core.h"
+#include <libarch/istate.h>
+
+#include "elf_core.h"
 
 static off64_t align_foff_up(off64_t, uintptr_t, size_t);
-static int write_all(int, void *, size_t);
+static int write_all(int, const void *, size_t);
+static int align_pos(int, size_t);
 static int write_mem_area(int, as_area_info_t *, async_sess_t *);
 
@@ -83 +88 @@
  */
 int elf_core_save(const char *file_name, as_area_info_t *ainfo, unsigned int n,
-    async_sess_t *sess)
+    async_sess_t *sess, istate_t *istate)
 {
         elf_header_t elf_hdr;
@@ -90 +95 @@
         elf_word flags;
         elf_segment_header_t *p_hdr;
+        elf_prstatus_t pr_status;
+        elf_note_t note;
+        size_t word_size;
 
         int fd;
@@ -95 +103 @@
         unsigned int i;
 
-        n_ph = n;
-
-        p_hdr = malloc(sizeof(elf_segment_header_t) * n);
+#ifdef __32_BITS__
+        word_size = 4;
+#endif
+#ifdef __64_BITS__
+        word_size = 8;
+#endif
+        memset(&pr_status, 0, sizeof(pr_status));
+        istate_to_elf_regs(istate, &pr_status.regs);
+
+        n_ph = n + 1;
+
+        p_hdr = malloc(sizeof(elf_segment_header_t) * n_ph);
         if (p_hdr == NULL) {
                 printf("Failed allocating memory.\n");
@@ -115 +132 @@
          *      ELF header
          *      program headers
+         *      note segment
          * repeat:
          *      (pad for alignment)
-         *      segment data
+         *      core segment
          * end repeat
          */
@@ -147 +165 @@
         foff = elf_hdr.e_phoff + n_ph * sizeof(elf_segment_header_t);
 
-        for (i = 1; i <= n; ++i) {
-                foff = align_foff_up(foff, ainfo[i - 1].start_addr, PAGE_SIZE);
+        memset(&p_hdr[0], 0, sizeof(p_hdr[0]));
+        p_hdr[0].p_type = PT_NOTE;
+        p_hdr[0].p_offset = foff;
+        p_hdr[0].p_vaddr = 0;
+        p_hdr[0].p_paddr = 0;
+        p_hdr[0].p_filesz = sizeof(elf_note_t)
+            + ALIGN_UP((str_size("CORE") + 1), word_size)
+            + ALIGN_UP(sizeof(elf_prstatus_t), word_size);
+        p_hdr[0].p_memsz = 0;
+        p_hdr[0].p_flags = 0;
+        p_hdr[0].p_align = 1;
+
+        foff += p_hdr[0].p_filesz;
+
+        for (i = 0; i < n; ++i) {
+                foff = align_foff_up(foff, ainfo[i].start_addr, PAGE_SIZE);
 
                 flags = 0;
-                if (ainfo[i - 1].flags & AS_AREA_READ)
+                if (ainfo[i].flags & AS_AREA_READ)
                         flags |= PF_R;
-                if (ainfo[i - 1].flags & AS_AREA_WRITE)
+                if (ainfo[i].flags & AS_AREA_WRITE)
                         flags |= PF_W;
-                if (ainfo[i - 1].flags & AS_AREA_EXEC)
+                if (ainfo[i].flags & AS_AREA_EXEC)
                         flags |= PF_X;
 
-                memset(&p_hdr[i - 1], 0, sizeof(p_hdr[i - 1]));
-                p_hdr[i - 1].p_type = PT_LOAD;
-                p_hdr[i - 1].p_offset = foff;
-                p_hdr[i - 1].p_vaddr = ainfo[i - 1].start_addr;
-                p_hdr[i - 1].p_paddr = 0;
-                p_hdr[i - 1].p_filesz = ainfo[i - 1].size;
-                p_hdr[i - 1].p_memsz = ainfo[i - 1].size;
-                p_hdr[i - 1].p_flags = flags;
-                p_hdr[i - 1].p_align = PAGE_SIZE;
-
-                foff += ainfo[i - 1].size;
+                memset(&p_hdr[i + 1], 0, sizeof(p_hdr[i + 1]));
+                p_hdr[i + 1].p_type = PT_LOAD;
+                p_hdr[i + 1].p_offset = foff;
+                p_hdr[i + 1].p_vaddr = ainfo[i].start_addr;
+                p_hdr[i + 1].p_paddr = 0;
+                p_hdr[i + 1].p_filesz = ainfo[i].size;
+                p_hdr[i + 1].p_memsz = ainfo[i].size;
+                p_hdr[i + 1].p_flags = flags;
+                p_hdr[i + 1].p_align = PAGE_SIZE;
+
+                foff += ainfo[i].size;
         }
 
@@ -187 +219 @@
         }
 
-        for (i = 0; i < n_ph; ++i) {
+        if (lseek(fd, p_hdr[0].p_offset, SEEK_SET) == (off64_t) -1) {
+                printf("Failed writing memory data.\n");
+                free(p_hdr);
+                return EIO;
+        }
+
+        /*
+         * Write note header
+         */
+        note.namesz = str_size("CORE") + 1;
+        note.descsz = sizeof(elf_prstatus_t);
+        note.type = NT_PRSTATUS;
+
+        rc = write_all(fd, &note, sizeof(elf_note_t));
+        if (rc != EOK) {
+                printf("Failed writing note header.\n");
+                free(p_hdr);
+                return EIO;
+        }
+
+        rc = write_all(fd, "CORE", note.namesz);
+        if (rc != EOK) {
+                printf("Failed writing note header.\n");
+                free(p_hdr);
+                return EIO;
+        }
+
+        rc = align_pos(fd, word_size);
+        if (rc != EOK) {
+                printf("Failed writing note header.\n");
+                free(p_hdr);
+                return EIO;
+        }
+
+        rc = write_all(fd, &pr_status, sizeof(elf_prstatus_t));
+        if (rc != EOK) {
+                printf("Failed writing register data.\n");
+                free(p_hdr);
+                return EIO;
+        }
+
+        for (i = 1; i < n_ph; ++i) {
                 if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off64_t) -1) {
                         printf("Failed writing memory data.\n");
@@ -193 +266 @@
                         return EIO;
                 }
-                if (write_mem_area(fd, &ainfo[i], sess) != EOK) {
+                if (write_mem_area(fd, &ainfo[i - 1], sess) != EOK) {
                         printf("Failed writing memory data.\n");
                         free(p_hdr);
@@ -210 +283 @@
         off64_t rva = vaddr % page_size;
         off64_t rfo = foff % page_size;
-        
+
         if (rva >= rfo)
                 return (foff + (rva - rfo));
-        
+
         return (foff + (page_size + (rva - rfo)));
 }
@@ -268 +341 @@
  *                      failed.
  */
-static int write_all(int fd, void *data, size_t len)
+static int write_all(int fd, const void *data, size_t len)
 {
         int cnt = 0;
@@ -287 +360 @@
 }
 
+static int align_pos(int fd, size_t align)
+{
+        off64_t cur_pos;
+        size_t rem, adv;
+
+        cur_pos = lseek(fd, 0, SEEK_CUR);
+        if (cur_pos < 0)
+                return -1;
+
+        rem = cur_pos % align;
+        adv = align - rem;
+
+        cur_pos = lseek(fd, adv, SEEK_CUR);
+        if (cur_pos < 0)
+                return -1;
+
+        return EOK;
+}
 
 /** @}

uspace/app/taskdump/include/elf_core.h

@@ -37 +37 @@
 
 #include <async.h>
+#include <elf/elf_linux.h>
+#include <libarch/istate.h>
 
 extern int elf_core_save(const char *, as_area_info_t *, unsigned int,
-    async_sess_t *);
+    async_sess_t *, istate_t *);
 
 #endif

uspace/app/taskdump/include/symtab.h

@@ -36 +36 @@
 #define SYMTAB_H_
 
+#include <elf/elf.h>
 #include <sys/types.h>
-#include <elf.h>
 
 typedef struct {

uspace/app/taskdump/symtab.c

@@ -36 +36 @@
  */
 
+#include <elf/elf.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43 +44 @@
 #include <fcntl.h>
 
-#include <elf.h>
 #include "include/symtab.h"
 

uspace/app/taskdump/taskdump.c

@@ -34 +34 @@
 
 #include <async.h>
+#include <elf/elf_linux.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -72 +73 @@
 static char *get_app_task_name(void);
 static char *fmt_sym_address(uintptr_t addr);
+
+static istate_t reg_state;
 
 int main(int argc, char *argv[])
@@ -293 +296 @@
         if (write_core_file) {
                 printf("Writing core file '%s'\n", core_file_name);
-                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, sess);
+
+                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, sess,
+                    &reg_state);
+
                 if (rc != EOK) {
                         printf("Failed writing core file.\n");
@@ -321 +327 @@
         pc = istate_get_pc(&istate);
         fp = istate_get_fp(&istate);
+
+        /* Save register state for dumping to core file later. */
+        reg_state = istate;
 
         sym_pc = fmt_sym_address(pc);

uspace/lib/c/include/elf/elf.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef ELF_H_
-#define ELF_H_
+#ifndef LIBC_ELF_H_
+#define LIBC_ELF_H_
 
 #include <arch/elf.h>
@@ -44 +44 @@
 #define EV_CURRENT      1
 
-/** 
- * ELF types 
+/**
+ * ELF types
  */
 #define ET_NONE         0       /* No type */
@@ -329 +329 @@
 };
 
-#ifdef __32_BITS__ 
+/*
+ * ELF note segment entry
+ */
+struct elf32_note {
+        elf_word namesz;
+        elf_word descsz;
+        elf_word type;
+};
+struct elf64_note {
+        elf_xword namesz;
+        elf_xword descsz;
+        elf_xword type;
+};
+
+#ifdef __32_BITS__
 typedef struct elf32_header elf_header_t;
 typedef struct elf32_segment_header elf_segment_header_t;
 typedef struct elf32_section_header elf_section_header_t;
 typedef struct elf32_symbol elf_symbol_t;
+typedef struct elf32_note elf_note_t;
 #endif
 #ifdef __64_BITS__
@@ -340 +355 @@
 typedef struct elf64_section_header elf_section_header_t;
 typedef struct elf64_symbol elf_symbol_t;
+typedef struct elf64_note elf_note_t;
 #endif
 
+/*
+ * Note types are not defined by the standard. These are the ones used
+ * by SVr4 derivatives.
+ */
+#define NT_PRSTATUS     1
+
 extern char *elf_error(unsigned int rc);