Changeset bfd7aac in mainline for uspace/app/taskdump/taskdump.c

Timestamp:

2010-02-17T19:19:08Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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/taskdump.c (modified) (3 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);
 
@@ -356 +351 @@
 }
 
-static __attribute__((unused)) 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;
-        }
-}
-
 static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value)
 {