Changes in uspace/app/taskdump/taskdump.c [dafa2d04:7e752b2] in mainline

File:

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

uspace/app/taskdump/taskdump.c

@@ -54 +54 @@
 #define LINE_BYTES 16
 
-#define DBUF_SIZE 4096
-static uint8_t data_buf[DBUF_SIZE];
-
 static int phoneid;
 static task_id_t task_id;
@@ -70 +67 @@
 static int thread_dump(uintptr_t thash);
 static int areas_dump(void);
-static int area_dump(as_area_info_t *area);
-static void hex_dump(uintptr_t addr, void *buffer, size_t size);
 static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value);
 
@@ -90 +85 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
+                printf("Failed connecting to task %" PRIu64 ".\n", task_id);
                 return 1;
         }
@@ -97 +92 @@
         app_symtab = NULL;
 
-        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
+        printf("Dumping task '%s' (task ID %" PRIu64 ").\n", app_name, task_id);
         autoload_syms();
         putchar('\n');
@@ -131 +126 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -173 +168 @@
                                 core_file_name = *argv;
                         } else {
-                                printf("Uknown option '%s'\n", arg[0]);
+                                printf("Uknown option '%c'\n", arg[0]);
                                 print_syntax();
                                 return -1;
@@ -245 +240 @@
         printf("Threads:\n");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] hash: %p\n", 1+i, thash_buf[i]);
+                printf(" [%zu] hash: %p\n", 1 + i, (void *) thash_buf[i]);
 
                 thread_dump(thash_buf[i]);
@@ -289 +284 @@
         printf("Address space areas:\n");
         for (i = 0; i < n_areas; i++) {
-                printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i,
+                printf(" [%zu] flags: %c%c%c%c base: %p size: %zu\n", 1 + i,
                     (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-',
                     (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-',
                     (ainfo_buf[i].flags & AS_AREA_EXEC) ? 'X' : '-',
                     (ainfo_buf[i].flags & AS_AREA_CACHEABLE) ? 'C' : '-',
-                    ainfo_buf[i].start_addr, ainfo_buf[i].size);
+                    (void *) ainfo_buf[i].start_addr, ainfo_buf[i].size);
         }
 
@@ -331 +326 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp);
+        printf("Thread %p crashed at %s. FP = %p\n", (void *) thash,
+            sym_pc, (void *) fp);
         free(sym_pc);
 
@@ -339 +335 @@
         while (stacktrace_fp_valid(&st, fp)) {
                 sym_pc = fmt_sym_address(pc);
-                printf("  %p: %s\n", fp, sym_pc);
+                printf("  %p: %s\n", (void *) fp, sym_pc);
                 free(sym_pc);
 
@@ -354 +350 @@
 
         return EOK;
-}
-
-static int area_dump(as_area_info_t *area)
-{
-        size_t to_copy;
-        size_t total;
-        uintptr_t addr;
-        int rc;
-
-        addr = area->start_addr;
-        total = 0;
-
-        while (total < area->size) {
-                to_copy = min(area->size - total, DBUF_SIZE);
-                rc = udebug_mem_read(phoneid, data_buf, addr, to_copy);
-                if (rc < 0) {
-                        printf("udebug_mem_read() failed.\n");
-                        return rc;
-                }
-
-                hex_dump(addr, data_buf, to_copy);
-
-                addr += to_copy;
-                total += to_copy;
-        }
-
-        return EOK;
-}
-
-static void hex_dump(uintptr_t addr, void *buffer, size_t size)
-{
-        uint8_t *data = (uint8_t *) buffer;
-        uint8_t b;
-        size_t pos, i;
-
-        assert(addr % LINE_BYTES == 0);
-        assert(size % LINE_BYTES == 0);
-
-        pos = 0;
-
-        while (pos < size) {
-                printf("%08lx:", addr + pos);
-                for (i = 0; i < LINE_BYTES; ++i) {
-                        if (i % 4 == 0) putchar(' ');
-                        printf(" %02x", data[pos + i]);
-                }
-                putchar('\t');
-
-                for (i = 0; i < LINE_BYTES; ++i) {
-                        b = data[pos + i];
-                        if (b >= 32 && b < 127) {
-                                putchar(b);
-                        } else {
-                                putchar(' ');
-                        }
-                }
-                putchar('\n');
-                pos += LINE_BYTES;
-        }
 }
 
@@ -521 +458 @@
 
         if (rc == EOK) {
-                rc = asprintf(&str, "%p (%s+%p)", addr, name, offs);
+                rc = asprintf(&str, "%p (%s+%zu)", (void *) addr, name, offs);
         } else {
-                rc = asprintf(&str, "%p", addr);
+                rc = asprintf(&str, "%p", (void *) addr);
         }