Changeset a9bbe48d in mainline

Timestamp:

2010-01-27T22:23:50Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e7aa9f4

Parents:

95e6c4f (diff), 1ccafee (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 formatting macros for userspace.

Location:

uspace

Files:

• app/mkfat/mkfat.c (modified) (2 diffs)
• app/taskdump/taskdump.c (modified) (7 diffs)
• app/trace/ipcp.c (modified) (4 diffs)
• app/trace/trace.c (modified) (8 diffs)
• lib/libc/arch/amd64/include/inttypes.h (added)
• lib/libc/arch/arm32/include/inttypes.h (added)
• lib/libc/arch/ia32/include/inttypes.h (added)
• lib/libc/arch/ia64/include/inttypes.h (added)
• lib/libc/arch/mips32/include/inttypes.h (added)
• lib/libc/arch/mips32eb/include/inttypes.h (added)
• lib/libc/arch/ppc32/include/inttypes.h (added)
• lib/libc/arch/sparc64/include/inttypes.h (added)
• lib/libc/include/inttypes.h (added)
• lib/libc/include/sys/typefmt.h (added)
• srv/bd/ata_bd/ata_bd.c (modified) (3 diffs)
• srv/bd/part/guid_part/guid_part.c (modified) (2 diffs)
• srv/bd/part/mbr_part/mbr_part.c (modified) (6 diffs)
• srv/loader/elf_load.c (modified) (4 diffs)
• srv/loader/main.c (modified) (1 diff)
• srv/taskmon/taskmon.c (modified) (2 diffs)

uspace/app/mkfat/mkfat.c

@@ -44 +44 @@
 #include <devmap.h>
 #include <byteorder.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
+#include <inttypes.h>
 #include <errno.h>
 #include "fat.h"
@@ -157 +160 @@
                 printf(NAME ": Warning, failed to obtain block device size.\n");
         } else {
-                printf(NAME ": Block device has %llu blocks.\n", dev_nblocks);
+                printf(NAME ": Block device has %" PRIuBN " blocks.\n",
+                    dev_nblocks);
                 cfg.total_sectors = dev_nblocks;
         }

uspace/app/taskdump/taskdump.c

@@ -41 +41 @@
 #include <task.h>
 #include <kernel/mm/as.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
 #include <libarch/istate.h>
 #include <macros.h>
@@ -93 +95 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %lld.\n", task_id);
+                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
                 return 1;
         }
@@ -100 +102 @@
         app_symtab = NULL;
 
-        printf("Dumping task '%s' (task ID %lld).\n", app_name, task_id);
+        printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id);
         autoload_syms();
         putchar('\n');
@@ -134 +136 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -245 +247 @@
         printf("Threads:\n");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] hash: 0x%lx\n", 1+i, thash_buf[i]);
+                printf(" [%d] hash: %p\n", 1+i, thash_buf[i]);
 
                 thread_dump(thash_buf[i]);
@@ -289 +291 @@
         printf("Address space areas:\n");
         for (i = 0; i < n_areas; i++) {
-                printf(" [%d] flags: %c%c%c%c base: 0x%lx size: 0x%lx\n", 1+i,
+                printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i,
                     (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-',
                     (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-',
@@ -328 +330 @@
 
         sym_pc = fmt_sym_address(pc);
-        printf("Thread 0x%lx crashed at %s. FP = 0x%lx\n", thash, sym_pc, fp);
+        printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp);
         free(sym_pc);
 

uspace/app/trace/ipcp.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <adt/hash_table.h>
+#include <sys/typefmt.h>
 
 #include "ipc_desc.h"
@@ -200 +201 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Call ID: 0x%lx, phone: %d, proto: %s, method: ", hash,
+                printf("Call ID: %p, phone: %d, proto: %s, method: ", hash,
                         phone, (proto ? proto->name : "n/a"));
                 ipc_m_print(proto, IPC_GET_METHOD(*call));
-                printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2],
+                printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
+                    ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2],
                     args[3], args[4], args[5]);
         }
@@ -279 +281 @@
 
         if ((display_mask & DM_IPC) != 0) {
-                printf("Response to 0x%lx: retval=%ld, args = (%lu, %lu, %lu, %lu, %lu)\n",
-                        hash, retval, IPC_GET_ARG1(*answer),
-                        IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
-                        IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
+                printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG
+                    ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG
+                    ", %" PRIuIPCARG ")\n",
+                    hash, retval, IPC_GET_ARG1(*answer),
+                    IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer),
+                    IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer));
         }
 
@@ -336 +340 @@
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
-                        printf("Not a response (hash 0x%lx)\n", hash);
+                        printf("Not a response (hash %p)\n", hash);
                 }
                 return;

uspace/app/trace/trace.c

@@ -49 +49 @@
 #include <io/keycode.h>
 #include <fibril_synch.h>
+#include <sys/types.h>
+#include <sys/typefmt.h>
 
 #include <libc.h>
@@ -159 +161 @@
         if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%lld) -> %d ", task_id, rc);
+                printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc);
                 return rc;
         }
@@ -198 +200 @@
         printf("Threads:");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] (hash 0x%lx)", 1+i, thread_hash_buf[i]);
+                printf(" [%d] (hash %p)", 1+i, thread_hash_buf[i]);
         }
         printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t));
@@ -222 +224 @@
         case V_HASH:
         case V_PTR:
-                printf("0x%08lx", val);
+                printf("%p", val);
                 break;
 
@@ -275 +277 @@
 
         putchar('(');
-        if (n > 0) printf("%ld", sc_args[0]);
+        if (n > 0) printf("%" PRIdSYSARG, sc_args[0]);
         for (i = 1; i < n; i++) {
-                printf(", %ld", sc_args[i]);
+                printf(", %" PRIdSYSARG, sc_args[i]);
         }
         putchar(')');
@@ -508 +510 @@
         }
 
-        printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash);
+        printf("Start tracing thread [%d] (hash %p).\n", thread_id, thread_hash);
 
         while (!abort_trace) {
@@ -552 +554 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("Thread 0x%lx exited.\n", val0);
+                                printf("Thread %p exited.\n", val0);
                                 fibril_mutex_lock(&state_lock);
                                 abort_trace = true;
@@ -972 +974 @@
         rc = connect_task(task_id);
         if (rc < 0) {
-                printf("Failed connecting to task %lld.\n", task_id);
+                printf("Failed connecting to task %" PRIdTASKID ".\n", task_id);
                 return 1;
         }
 
-        printf("Connected to task %lld.\n", task_id);
+        printf("Connected to task %" PRIdTASKID ".\n", task_id);
 
         if (task_ldr != NULL)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -59 +59 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <inttypes.h>
 #include <errno.h>
 #include <bool.h>
@@ -112 +113 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address 0x%p/0x%p\n", ctl_physical, cmd_physical);
+        printf("I/O address %p/%p\n", ctl_physical, cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -180 +181 @@
         }
 
-        printf(" %llu blocks", d->blocks, d->blocks / (2 * 1024));
+        printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024));
 
         mbytes = d->blocks / (2 * 1024);
         if (mbytes > 0)
-                printf(" %llu MB.", mbytes);
+                printf(" %" PRIu64 " MB.", mbytes);
 
         printf("\n");

uspace/srv/bd/part/guid_part/guid_part.c

@@ -54 +54 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
+#include <inttypes.h>
 #include <libblock.h>
 #include <devmap.h>
@@ -196 +198 @@
                 size_mb = (part->length * block_size + 1024 * 1024 - 1)
                     / (1024 * 1024);
-                printf(NAME ": Registered device %s: %llu blocks %llu MB.\n",
-                    name, part->length, size_mb);
+                printf(NAME ": Registered device %s: %" PRIu64 " blocks "
+                    "%" PRIuBN " MB.\n", name, part->length, size_mb);
 
                 part->dev = dev;

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -64 +64 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
+#include <inttypes.h>
 #include <libblock.h>
 #include <devmap.h>
@@ -247 +249 @@
                 size_mb = (part->length * block_size + 1024 * 1024 - 1)
                     / (1024 * 1024);
-                printf(NAME ": Registered device %s: %llu blocks %llu MB.\n",
-                    name, part->length, size_mb);
+                printf(NAME ": Registered device %s: %" PRIuBN " blocks "
+                    "%" PRIu64 " MB.\n", name, part->length, size_mb);
 
                 part->dev = dev;
@@ -274 +276 @@
         if (brb == NULL) {
                 printf(NAME ": Failed allocating memory.\n");
-                return ENOMEM;  
+                return ENOMEM;
         }
 
@@ -289 +291 @@
         sgn = uint16_t_le2host(brb->signature);
         if (sgn != BR_SIGNATURE) {
-                printf(NAME ": Invalid boot record signature 0x%04X.\n", sgn);
+                printf(NAME ": Invalid boot record signature 0x%04" PRIX16
+                    ".\n", sgn);
                 return EINVAL;
         }
@@ -333 +336 @@
                 rc = block_read_direct(indev_handle, ba, 1, brb);
                 if (rc != EOK) {
-                        printf(NAME ": Failed reading EBR block at %u.\n", ba);
+                        printf(NAME ": Failed reading EBR block at %"
+                            PRIu32 ".\n", ba);
                         return rc;
                 }
@@ -339 +343 @@
                 sgn = uint16_t_le2host(brb->signature);
                 if (sgn != BR_SIGNATURE) {
-                        printf(NAME ": Invalid boot record signature 0x%04X "
-                            " in EBR at %u.\n", sgn, ba);
+                        printf(NAME ": Invalid boot record signature 0x%04"
+                            PRIX16 " in EBR at %" PRIu32 ".\n", sgn, ba);
                         return EINVAL;
                 }

uspace/srv/loader/elf_load.c

@@ -342 +342 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr 0x%x, size 0x%x\n", seg_addr,
-                entry->p_memsz);        
+        DPRINTF("Load segment at addr %p, size 0x%x\n", seg_addr,
+                entry->p_memsz);
 
         if (entry->p_align > 1) {
@@ -370 +370 @@
         mem_sz = entry->p_memsz + (entry->p_vaddr - base);
 
-        DPRINTF("Map to seg_addr=0x%x-0x%x.\n", seg_addr,
+        DPRINTF("Map to seg_addr=%p-%p.\n", seg_addr,
         entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE));
 
@@ -384 +384 @@
         }
 
-        DPRINTF("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n",
+        DPRINTF("as_area_create(%p, 0x%x, %d) -> 0x%lx\n",
                 base + bias, mem_sz, flags, (uintptr_t)a);
 
@@ -461 +461 @@
                 elf->info->dynamic =
                     (void *)((uint8_t *)entry->sh_addr + elf->bias);
-                DPRINTF("Dynamic section found at 0x%x.\n",
+                DPRINTF("Dynamic section found at %p.\n",
                         (uintptr_t)elf->info->dynamic);
                 break;

uspace/srv/loader/main.c

@@ -392 +392 @@
                 /* Dynamically linked program */
                 DPRINTF("Run ELF interpreter.\n");
-                DPRINTF("Entry point: 0x%lx\n", interp_info.entry);
+                DPRINTF("Entry point: %p\n", interp_info.entry);
                 
                 ipc_answer_0(rid, EOK);

uspace/srv/taskmon/taskmon.c

@@ -39 +39 @@
 #include <async.h>
 #include <ipc/services.h>
+#include <sys/typefmt.h>
 #include <task.h>
 #include <event.h>
@@ -60 +61 @@
         thread = IPC_GET_ARG3(*call);
 
-        if (asprintf(&s_taskid, "%lld", taskid) < 0) {
+        if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        if (asprintf(&dump_fname, "/scratch/d%lld.txt", taskid) < 0) {
+        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
         }
 
-        printf(NAME ": Task %lld fault in thread 0x%lx.\n", taskid, thread);
+        printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
 
 #ifdef CONFIG_VERBOSE_DUMPS