Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1223 → Rev 1224

/kernel/trunk/generic/include/debug.h
49,7 → 49,7
*
*/
#ifdef CONFIG_DEBUG
# define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%p\n", #expr, CALLER); }
# define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%.*p\n", #expr, sizeof(__address) * 2, CALLER); }
#else
# define ASSERT(expr)
#endif
/kernel/trunk/generic/src/synch/spinlock.c
69,8 → 69,8
preemption_disable();
while (test_and_set(&sl->val)) {
if (i++ > 300000 && sl!=&printflock) {
printf("cpu%d: looping on spinlock %p:%s, caller=%p",
CPU->id, sl, sl->name, CALLER);
printf("cpu%d: looping on spinlock %.*p:%s, caller=%.*p",
CPU->id, sizeof(__address) * 2, sl, sl->name, sizeof(__address) * 2, CALLER);
symbol = get_symtab_entry(CALLER);
if (symbol)
printf("(%s)", symbol);
/kernel/trunk/generic/src/main/main.c
176,7 → 176,7
arch_post_mm_init();
 
version_print();
printf("%#zx: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", config.base, hardcoded_ktext_size / 1024, hardcoded_kdata_size / 1024);
printf("%.*p: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(__address) * 2, config.base, hardcoded_ktext_size / 1024, hardcoded_kdata_size / 1024);
 
arch_pre_smp_init();
smp_init();
195,7 → 195,7
futex_init();
for (i = 0; i < init.cnt; i++)
printf("init[%zd].addr=%p, init[%zd].size=%zd\n", i, init.tasks[i].addr, i, init.tasks[i].size);
printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, sizeof(__address)*2, init.tasks[i].addr, i, init.tasks[i].size);
ipc_init();
 
/kernel/trunk/generic/src/debug/symtab.c
132,7 → 132,7
while (symtab_search_one(name, &i)) {
addr = __u64_le2host(symbol_table[i].address_le);
realname = symbol_table[i].symbol_name;
printf("%p: %s\n", addr, realname);
printf("%.*p: %s\n", sizeof(__address) * 2, addr, realname);
i++;
}
}
/kernel/trunk/generic/src/debug/print.c
210,7 → 210,7
* @param base Base to print the number in (should
* be in range 2 .. 16).
* @param flags output modifiers
* @return number of written characters or negative value on fail.
* @return number of written characters or EOF.
*/
static int print_number(__u64 num, int width, int precision, int base , __u64 flags)
{
/kernel/trunk/generic/src/interrupt/interrupt.c
96,8 → 96,8
symbol = get_symtab_entry((__native)exc_table[i].f);
if (!symbol)
symbol = "not found";
printf("%d %s %p(%s)\n", i + IVT_FIRST, exc_table[i].name,
exc_table[i].f,symbol);
printf("%d %s %.*p(%s)\n", i + IVT_FIRST, exc_table[i].name,
sizeof(__address) * 2, exc_table[i].f,symbol);
if (!((i+1) % 20)) {
printf("Press any key to continue.");
spinlock_unlock(&exctbl_lock);
/kernel/trunk/generic/src/console/cmd.c
458,9 → 458,9
printf("Duplicate symbol, be more specific.\n");
} else {
symbol = get_symtab_entry(symaddr);
printf("Calling f(): %p: %s\n", symaddr, symbol);
printf("Calling f(): %.*p: %s\n", sizeof(__address) * 2, symaddr, symbol);
f = (__native (*)(void)) symaddr;
printf("Result: %p\n", f());
printf("Result: %#zx\n", f());
}
return 1;
482,9 → 482,9
printf("Duplicate symbol, be more specific.\n");
} else {
symbol = get_symtab_entry(symaddr);
printf("Calling f(0x%zX): %p: %s\n", arg1, symaddr, symbol);
printf("Calling f(0x%zX): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
f = (__native (*)(__native,...)) symaddr;
printf("Result: %p\n", f(arg1));
printf("Result: %#zx\n", f(arg1));
}
return 1;
507,10 → 507,10
printf("Duplicate symbol, be more specific.\n");
} else {
symbol = get_symtab_entry(symaddr);
printf("Calling f(0x%zx,0x%zx): %p: %s\n",
arg1, arg2, symaddr, symbol);
printf("Calling f(0x%zx,0x%zx): %.*p: %s\n",
arg1, arg2, sizeof(__address) * 2, symaddr, symbol);
f = (__native (*)(__native,__native,...)) symaddr;
printf("Result: %p\n", f(arg1, arg2));
printf("Result: %#zx\n", f(arg1, arg2));
}
return 1;
534,10 → 534,10
printf("Duplicate symbol, be more specific.\n");
} else {
symbol = get_symtab_entry(symaddr);
printf("Calling f(0x%zx,0x%zx, 0x%zx): %p: %s\n",
arg1, arg2, arg3, symaddr, symbol);
printf("Calling f(0x%zx,0x%zx, 0x%zx): %.*p: %s\n",
arg1, arg2, arg3, sizeof(__address) * 2, symaddr, symbol);
f = (__native (*)(__native,__native,__native,...)) symaddr;
printf("Result: %p\n", f(arg1, arg2, arg3));
printf("Result: %#zx\n", f(arg1, arg2, arg3));
}
return 1;
598,7 → 598,7
} else {
if (pointer)
addr = (__u32 *)(*(__native *)addr);
printf("Writing 0x%x -> %p\n", arg1, addr);
printf("Writing 0x%x -> %.*p\n", arg1, sizeof(__address) * 2, addr);
*addr = arg1;
}
/kernel/trunk/generic/src/mm/slab.c
789,10 → 789,10
ipl = interrupts_disable();
spinlock_lock(&slab_cache_lock);
printf("SLAB name\tOsize\tPages\tObj/pg\tSlabs\tCached\tAllocobjs\tCtl\n");
printf("SLAB name\t Osize\t Pages\t Obj/pg\t Slabs\t Cached\tAllocobjs\tCtl\n");
for (cur = slab_cache_list.next;cur!=&slab_cache_list; cur=cur->next) {
cache = list_get_instance(cur, slab_cache_t, link);
printf("%s\t%zd\t%zd\t%zd\t%zd\t%zd\t%zd\t\t%s\n", cache->name, cache->size,
printf("%s\t%7zd\t%7zd\t%7zd\t%7zd\t%7zd\t%7zd\t\t%s\n", cache->name, cache->size,
(1 << cache->order), cache->objects,
atomic_get(&cache->allocated_slabs),
atomic_get(&cache->cached_objs),
/kernel/trunk/generic/src/mm/buddy.c
291,7 → 291,7
cnt++;
}
printf("#%zd\t%zd\t%zdK\t\t%zdK\t\t%zd\t", i, cnt, (cnt * (1 << i) * elem_size) >> 10, ((1 << i) * elem_size) >> 10, 1 << i);
printf("#%zd\t%5zd\t%7zdK\t%8zdK\t%6zd\t", i, cnt, (cnt * (1 << i) * elem_size) >> 10, ((1 << i) * elem_size) >> 10, 1 << i);
if (!list_empty(&b->order[i])) {
for (cur = b->order[i].next; cur != &b->order[i]; cur = cur->next) {
b->op->print_id(b, cur);
/kernel/trunk/generic/src/mm/frame.c
1028,7 → 1028,7
for (i = 0; i < zones.count; i++) {
zone = zones.info[i];
spinlock_lock(&zone->lock);
printf("%d: %#x \t%zd\t\t%zd\n", i, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(__address) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
spinlock_unlock(&zone->lock);
}
spinlock_unlock(&zones.lock);
1060,7 → 1060,7
spinlock_lock(&zone->lock);
printf("Memory zone information\n");
printf("Zone base address: %#zX\n", PFN2ADDR(zone->base));
printf("Zone base address: %#.*p\n", sizeof(__address) * 2, PFN2ADDR(zone->base));
printf("Zone size: %zd frames (%zdK)\n", zone->count, ((zone->count) * FRAME_SIZE) >> 10);
printf("Allocated space: %zd frames (%zdK)\n", zone->busy_count, (zone->busy_count * FRAME_SIZE) >> 10);
printf("Available space: %zd (%zdK)\n", zone->free_count, (zone->free_count * FRAME_SIZE) >> 10);
/kernel/trunk/arch/ia32/src/mm/frame.c
91,7 → 91,8
name = e820names[e820table[i].type];
else
name = "invalid";
printf("%p %#llXB %s\n",
printf("%.*p %#.16llXB %s\n",
sizeof(__native) * 2,
(__native) e820table[i].base_address,
(__u64) e820table[i].size,
name);
/kernel/trunk/arch/ia32/src/mm/memory_init.c
45,7 → 45,7
__u8 i;
for (i=0;i<e820counter;i++) {
printf("E820 base: %#llX size: %lld type: ", e820table[i].base_address, e820table[i].size);
printf("E820 base: %#.16llx size: %#.16llx type: ", e820table[i].base_address, e820table[i].size);
switch (e820table[i].type) {
case MEMMAP_MEMORY_AVAILABLE:
printf("available memory\n");