Changes in uspace/app/taskdump/taskdump.c [6a343bdf:5baf209] in mainline

File:

• uspace/app/taskdump/taskdump.c (modified) (15 diffs)

uspace/app/taskdump/taskdump.c

@@ -34 +34 @@
 
 #include <async.h>
+#include <elf/elf_linux.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -54 +55 @@
 #define LINE_BYTES 16
 
-static int phoneid;
+static async_sess_t *sess;
 static task_id_t task_id;
 static bool write_core_file;
@@ -73 +74 @@
 static char *fmt_sym_address(uintptr_t addr);
 
+static istate_t reg_state;
+
 int main(int argc, char *argv[])
 {
@@ -104 +107 @@
                 printf("Failed dumping address space areas.\n");
 
-        udebug_end(phoneid);
-        async_hangup(phoneid);
+        udebug_end(sess);
+        async_hangup(sess);
 
         return 0;
@@ -112 +115 @@
 static int connect_task(task_id_t task_id)
 {
-        int rc;
-
-        rc = async_connect_kbox(task_id);
-
-        if (rc == ENOTSUP) {
-                printf("You do not have userspace debugging support "
-                    "compiled in the kernel.\n");
-                printf("Compile kernel with 'Support for userspace debuggers' "
-                    "(CONFIG_UDEBUG) enabled.\n");
-                return rc;
-        }
-
-        if (rc < 0) {
+        async_sess_t *ksess = async_connect_kbox(task_id);
+        
+        if (!ksess) {
+                if (errno == ENOTSUP) {
+                        printf("You do not have userspace debugging support "
+                            "compiled in the kernel.\n");
+                        printf("Compile kernel with 'Support for userspace debuggers' "
+                            "(CONFIG_UDEBUG) enabled.\n");
+                        return errno;
+                }
+                
                 printf("Error connecting\n");
-                printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, rc);
-                return rc;
-        }
-
-        phoneid = rc;
-
-        rc = udebug_begin(phoneid);
+                printf("async_connect_kbox(%" PRIu64 ") -> %d ", task_id, errno);
+                return errno;
+        }
+        
+        int rc = udebug_begin(ksess);
         if (rc < 0) {
                 printf("udebug_begin() -> %d\n", rc);
                 return rc;
         }
-
+        
+        sess = ksess;
         return 0;
 }
@@ -213 +213 @@
 
         /* TODO: See why NULL does not work. */
-        rc = udebug_thread_read(phoneid, &dummy_buf, 0, &copied, &needed);
+        rc = udebug_thread_read(sess, &dummy_buf, 0, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_thread_read() -> %d\n", rc);
@@ -227 +227 @@
         thash_buf = malloc(buf_size);
 
-        rc = udebug_thread_read(phoneid, thash_buf, buf_size, &copied, &needed);
+        rc = udebug_thread_read(sess, thash_buf, buf_size, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_thread_read() -> %d\n", rc);
@@ -262 +262 @@
         int rc;
 
-        rc = udebug_areas_read(phoneid, &dummy_buf, 0, &copied, &needed);
+        rc = udebug_areas_read(sess, &dummy_buf, 0, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_areas_read() -> %d\n", rc);
@@ -271 +271 @@
         ainfo_buf = malloc(buf_size);
 
-        rc = udebug_areas_read(phoneid, ainfo_buf, buf_size, &copied, &needed);
+        rc = udebug_areas_read(sess, ainfo_buf, buf_size, &copied, &needed);
         if (rc < 0) {
                 printf("udebug_areas_read() -> %d\n", rc);
@@ -296 +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, phoneid);
+
+                rc = elf_core_save(core_file_name, ainfo_buf, n_areas, sess,
+                    &reg_state);
+
                 if (rc != EOK) {
                         printf("Failed writing core file.\n");
@@ -316 +319 @@
         int rc;
 
-        rc = udebug_regs_read(phoneid, thash, &istate);
+        rc = udebug_regs_read(sess, thash, &istate);
         if (rc < 0) {
                 printf("Failed reading registers (%d).\n", rc);
@@ -324 +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);
@@ -359 +365 @@
         (void) arg;
 
-        rc = udebug_mem_read(phoneid, &data, addr, sizeof(data));
+        rc = udebug_mem_read(sess, &data, addr, sizeof(data));
         if (rc < 0) {
                 printf("Warning: udebug_mem_read() failed.\n");
@@ -430 +436 @@
         int rc;
 
-        rc = udebug_name_read(phoneid, &dummy_buf, 0, &copied, &needed);
+        rc = udebug_name_read(sess, &dummy_buf, 0, &copied, &needed);
         if (rc < 0)
                 return NULL;
@@ -436 +442 @@
         name_size = needed;
         name = malloc(name_size + 1);
-        rc = udebug_name_read(phoneid, name, name_size, &copied, &needed);
+        rc = udebug_name_read(sess, name, name_size, &copied, &needed);
         if (rc < 0) {
                 free(name);