Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1220 → Rev 1221

/kernel/trunk/test/synch/rwlock4/test.c
132,7 → 132,7
thread_t *thrd;
context_save(&ctx);
printf("sp=%#X, readers_in=%d\n", ctx.sp, rwlock.readers_in);
printf("sp=%#x, readers_in=%d\n", ctx.sp, rwlock.readers_in);
k = random(7) + 1;
printf("Creating %d readers\n", k);
/kernel/trunk/test/mm/falloc1/test.c
40,8 → 40,7
#define TEST_RUNS 2
 
void test(void) {
__address * frames = (__address *) malloc(MAX_FRAMES*sizeof(__address),
0);
__address * frames = (__address *) malloc(MAX_FRAMES*sizeof(__address), 0);
int results[MAX_ORDER+1];
int i, order, run;
59,7 → 58,7
frames[allocated] = PA2KA(PFN2ADDR(frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status)));
if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
panic("Test failed. Block at address %P (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
panic("Test failed. Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
}
if (status == 0) {
/kernel/trunk/test/mm/falloc2/test.c
77,7 → 77,7
for (i = 0; i < allocated; i++) {
for (k = 0; k <= ((FRAME_SIZE << order) - 1); k++) {
if (((__u8 *) frames[i])[k] != val) {
printf("Thread #%d (cpu%d): Unexpected data (%d) in block %P offset %#zX\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
printf("Thread #%d (cpu%d): Unexpected data (%d) in block %p offset %#zx\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
failed();
}
}
/kernel/trunk/test/mm/mapping1/test.c
50,32 → 50,32
frame0 = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
frame1 = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
 
printf("Writing %#X to physical address %P.\n", VALUE0, KA2PA(frame0));
printf("Writing %#x to physical address %p.\n", VALUE0, KA2PA(frame0));
*((__u32 *) frame0) = VALUE0;
printf("Writing %#X to physical address %P.\n", VALUE1, KA2PA(frame1));
printf("Writing %#x to physical address %p.\n", VALUE1, KA2PA(frame1));
*((__u32 *) frame1) = VALUE1;
printf("Mapping virtual address %P to physical address %P.\n", PAGE0, KA2PA(frame0));
printf("Mapping virtual address %p to physical address %p.\n", PAGE0, KA2PA(frame0));
page_mapping_insert(AS_KERNEL, PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE);
printf("Mapping virtual address %P to physical address %P.\n", PAGE1, KA2PA(frame1));
printf("Mapping virtual address %p to physical address %p.\n", PAGE1, KA2PA(frame1));
page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE);
printf("Value at virtual address %P is %#X.\n", PAGE0, v0 = *((__u32 *) PAGE0));
printf("Value at virtual address %P is %#X.\n", PAGE1, v1 = *((__u32 *) PAGE1));
printf("Value at virtual address %p is %#x.\n", PAGE0, v0 = *((__u32 *) PAGE0));
printf("Value at virtual address %p is %#x.\n", PAGE1, v1 = *((__u32 *) PAGE1));
ASSERT(v0 == VALUE0);
ASSERT(v1 == VALUE1);
 
printf("Writing %#X to virtual address %P.\n", 0, PAGE0);
printf("Writing %#x to virtual address %p.\n", 0, PAGE0);
*((__u32 *) PAGE0) = 0;
printf("Writing %#X to virtual address %P.\n", 0, PAGE1);
printf("Writing %#x to virtual address %p.\n", 0, PAGE1);
*((__u32 *) PAGE1) = 0;
 
v0 = *((__u32 *) PAGE0);
v1 = *((__u32 *) PAGE1);
printf("Value at virtual address %P is %#X.\n", PAGE0, *((__u32 *) PAGE0));
printf("Value at virtual address %P is %#X.\n", PAGE1, *((__u32 *) PAGE1));
printf("Value at virtual address %p is %#x.\n", PAGE0, *((__u32 *) PAGE0));
printf("Value at virtual address %p is %#x.\n", PAGE1, *((__u32 *) PAGE1));
 
ASSERT(v0 == 0);
ASSERT(v1 == 0);
/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, CALLER); }
#else
# define ASSERT(expr)
#endif
/kernel/trunk/generic/src/main/main.c
176,8 → 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("%#zx: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", config.base, hardcoded_ktext_size / 1024, hardcoded_kdata_size / 1024);
 
arch_pre_smp_init();
smp_init();
196,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, init.tasks[i].addr, i, init.tasks[i].size);
ipc_init();
 
/kernel/trunk/generic/src/proc/scheduler.c
633,7 → 633,7
continue;
 
spinlock_lock(&cpus[cpu].lock);
printf("cpu%d: address=%P, nrdy=%ld, needs_relink=%ld\n",
printf("cpu%d: address=%p, nrdy=%ld, needs_relink=%ld\n",
cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink);
for (i=0; i<RQ_COUNT; i++) {
/kernel/trunk/generic/src/adt/btree.c
117,7 → 117,7
lnode = leaf_node;
if (!lnode) {
if (btree_search(t, key, &lnode)) {
panic("B-tree %P already contains key %d\n", t, key);
panic("B-tree %p already contains key %d\n", t, key);
}
}
200,7 → 200,7
lnode = leaf_node;
if (!lnode) {
if (!btree_search(t, key, &lnode)) {
panic("B-tree %P does not contain key %d\n", t, key);
panic("B-tree %p does not contain key %d\n", t, key);
}
}
500,7 → 500,7
return;
}
}
panic("node %P does not contain key %d\n", node, key);
panic("node %p does not contain key %d\n", node, key);
}
 
/** Remove key and its right subtree pointer from B-tree node.
527,7 → 527,7
return;
}
}
panic("node %P does not contain key %d\n", node, key);
panic("node %p does not contain key %d\n", node, key);
}
 
/** Split full B-tree node and insert new key-value-right-subtree triplet.
669,7 → 669,7
if (subtree == node->subtree[i])
return i - (int) (right != false);
}
panic("node %P does not contain subtree %P\n", node, subtree);
panic("node %p does not contain subtree %p\n", node, subtree);
}
 
/** Rotate one key-value-rsubtree triplet from the left sibling to the right sibling.
/kernel/trunk/generic/src/mm/frame.c
1028,8 → 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: %#x \t%zd\t\t%zd\n", i, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
spinlock_unlock(&zone->lock);
}
spinlock_unlock(&zones.lock);
/kernel/trunk/generic/src/mm/page.c
63,11 → 63,11
{
int i, cnt, length;
 
length = size + (s - (s & ~(PAGE_SIZE-1)));
cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0);
length = size + (s - (s & ~(PAGE_SIZE - 1)));
cnt = length / PAGE_SIZE + (length % PAGE_SIZE > 0);
 
for (i = 0; i < cnt; i++)
page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE);
page_mapping_insert(AS_KERNEL, s + i * PAGE_SIZE, s + i * PAGE_SIZE, PAGE_NOT_CACHEABLE);
 
}
 
/kernel/trunk/arch/sparc64/src/mm/tlb.c
172,8 → 172,8
tpc = tpc_read();
tpc_str = get_symtab_entry(tpc);
 
printf("Faulting page: %P, ASID=%d\n", tag.vpn * PAGE_SIZE, tag.context);
printf("TPC=%P, (%s)\n", tpc, tpc_str ? tpc_str : "?");
printf("Faulting page: %p, ASID=%d\n", tag.vpn * PAGE_SIZE, tag.context);
printf("TPC=%p, (%s)\n", tpc, tpc_str ? tpc_str : "?");
panic("%s\n", __FUNCTION__);
}
 
/kernel/trunk/arch/ia64/src/mm/tlb.c
448,7 → 448,7
*/
page_table_unlock(AS, true);
if (!as_page_fault(va)) {
panic("%s: va=%P, rid=%d, iip=%P\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
}
}
}
494,7 → 494,7
*/
page_table_unlock(AS, true);
if (!as_page_fault(va)) {
panic("%s: va=%P, rid=%d, iip=%P\n", __FUNCTION__, va, rid, istate->cr_iip);
panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
}
}
}
609,7 → 609,7
} else {
page_table_unlock(AS, true);
if (!as_page_fault(va)) {
panic("%s: va=%P, rid=%d\n", __FUNCTION__, va, rr.map.rid);
panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rr.map.rid);
}
}
}
/kernel/trunk/arch/ia64/src/interrupt.c
131,14 → 131,14
 
putchar('\n');
printf("Interrupted context dump:\n");
printf("ar.bsp=%P\tar.bspstore=%P\n", istate->ar_bsp, istate->ar_bspstore);
printf("ar.rnat=%#llX\tar.rsc=%$llX\n", istate->ar_rnat, istate->ar_rsc);
printf("ar.ifs=%#llX\tar.pfs=%#llX\n", istate->ar_ifs, istate->ar_pfs);
printf("cr.isr=%#llX\tcr.ipsr=%#llX\t\n", istate->cr_isr.value, istate->cr_ipsr);
printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp, istate->ar_bspstore);
printf("ar.rnat=%#llx\tar.rsc=%$llx\n", istate->ar_rnat, istate->ar_rsc);
printf("ar.ifs=%#llx\tar.pfs=%#llx\n", istate->ar_ifs, istate->ar_pfs);
printf("cr.isr=%#llx\tcr.ipsr=%#llx\t\n", istate->cr_isr.value, istate->cr_ipsr);
printf("cr.iip=%#llX, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei ,iip ? iip : "?");
printf("cr.iipa=%#llX\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
printf("cr.ifa=%#llX\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
printf("cr.iip=%#llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei, iip ? iip : "?");
printf("cr.iipa=%#llx\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
printf("cr.ifa=%#llx\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
}
 
void general_exception(__u64 vector, istate_t *istate)
182,7 → 182,7
scheduler_fpu_lazy_request();
#else
dump_interrupted_context(istate);
panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
#endif
}
 
217,7 → 217,7
void universal_handler(__u64 vector, istate_t *istate)
{
dump_interrupted_context(istate);
panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
}
 
void external_interrupt(__u64 vector, istate_t *istate)
/kernel/trunk/arch/ppc32/src/mm/memory_init.c
43,5 → 43,5
count_t i;
for (i = 0; i < bootinfo.memmap.count; i++)
printf("base: %#X size: %#X\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
printf("base: %#x size: %#x\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
}
/kernel/trunk/arch/amd64/src/debugger.c
231,14 → 231,14
if ((breakpoints[slot].flags & BKPOINT_CHECK_ZERO)) {
if (*((__native *) breakpoints[slot].address) != 0)
return;
printf("**** Found ZERO on address %P ****\n",
printf("**** Found ZERO on address %p ****\n",
slot, breakpoints[slot].address);
} else {
printf("Data watchpoint - new data: %P\n",
printf("Data watchpoint - new data: %p\n",
*((__native *) breakpoints[slot].address));
}
}
printf("Reached breakpoint %d:%P(%s)\n", slot, getip(istate),
printf("Reached breakpoint %d:%p(%s)\n", slot, getip(istate),
get_symtab_entry(getip(istate)));
printf("***Type 'exit' to exit kconsole.\n");
atomic_set(&haltstate,1);
/kernel/trunk/arch/ppc64/src/mm/memory_init.c
43,5 → 43,5
count_t i;
for (i = 0; i < bootinfo.memmap.count; i++)
printf("base: %P size: %#X\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
printf("base: %p size: %#x\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
}
/kernel/trunk/arch/mips32/src/exception.c
73,8 → 73,7
if (s)
rasymbol = s;
printf("PC: %#X(%s) RA: %#X(%s), SP(%P)\n",istate->epc,pcsymbol,
istate->ra,rasymbol, istate->sp);
printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol, istate->ra, rasymbol, istate->sp);
}
 
static void unhandled_exception(int n, istate_t *istate)
/kernel/trunk/arch/mips32/src/drivers/arc.c
135,7 → 135,7
for (i=0; i < configdata->count; i++) {
switch (configdata->descr[i].type) {
case CmResourceTypePort:
printf("Port: %P-size:%d ",
printf("Port: %p-size:%d ",
(__address)configdata->descr[i].u.port.start,
configdata->descr[i].u.port.length);
break;
145,7 → 145,7
configdata->descr[i].u.interrupt.vector);
break;
case CmResourceTypeMemory:
printf("Memory: %P-size:%d ",
printf("Memory: %p-size:%d ",
(__address)configdata->descr[i].u.port.start,
configdata->descr[i].u.port.length);
break;
212,7 → 212,7
 
desc = arc_entry->getmemorydescriptor(NULL);
while (desc) {
printf("%s: %d(%P) (size: %dKB)\n",basetypes[desc->type],
printf("%s: %d(%p) (size: %dKB)\n",basetypes[desc->type],
desc->basepage * ARC_FRAME,
desc->basepage * ARC_FRAME,
desc->basecount*ARC_FRAME/1024);
/kernel/trunk/arch/ia32/src/smp/mps.c
187,7 → 187,7
return;
fs_found:
printf("%P: MPS Floating Pointer Structure\n", fs);
printf("%p: MPS Floating Pointer Structure\n", fs);
 
if (fs->config_type == 0 && fs->configuration_table) {
if (fs->mpfib2 >> 7) {
406,7 → 406,7
for (cur = ext; cur < ext + ct->ext_table_length; cur += cur[CT_EXT_ENTRY_LEN]) {
switch (cur[CT_EXT_ENTRY_TYPE]) {
default:
printf("%P: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
printf("%p: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
break;
}
}
/kernel/trunk/arch/ia32/src/mm/frame.c
91,7 → 91,7
name = e820names[e820table[i].type];
else
name = "invalid";
printf("%P %#llXB %s\n",
printf("%p %#llXB %s\n",
(__native) e820table[i].base_address,
(__u64) e820table[i].size,
name);
/kernel/trunk/arch/ia32/src/interrupt.c
61,15 → 61,15
else
printf("----------------EXCEPTION OCCURED----------------\n");
printf("%%eip: %#X (%s)\n",istate->eip,symbol);
printf("ERROR_WORD=%#X\n", istate->error_word);
printf("%%cs=%#X,flags=%#X\n", istate->cs, istate->eflags);
printf("%%eax=%#X, %%ecx=%#X, %%edx=%#X, %%esp=%#X\n", istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
printf("%%eip: %#x (%s)\n",istate->eip,symbol);
printf("ERROR_WORD=%#x\n", istate->error_word);
printf("%%cs=%#x,flags=%#x\n", istate->cs, istate->eflags);
printf("%%eax=%#x, %%ecx=%#x, %%edx=%#x, %%esp=%#x\n", istate->eax,istate->ecx,istate->edx,&istate->stack[0]);
#ifdef CONFIG_DEBUG_ALLREGS
printf("%%esi=%#X, %%edi=%#X, %%ebp=%#X, %%ebx=%#X\n", istate->esi,istate->edi,istate->ebp,istate->ebx);
printf("%%esi=%#x, %%edi=%#x, %%ebp=%#x, %%ebx=%#x\n", istate->esi,istate->edi,istate->ebp,istate->ebx);
#endif
printf("stack: %#X, %#X, %#X, %#X\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
printf(" %#X, %#X, %#X, %#X\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
printf("stack: %#x, %#x, %#x, %#x\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
printf(" %#x, %#x, %#x, %#x\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
}
 
void null_interrupt(int n, istate_t *istate)
120,7 → 120,7
page = read_cr2();
if (!as_page_fault(page)) {
PRINT_INFO_ERRCODE(istate);
printf("page fault address: %#X\n", page);
printf("page fault address: %#x\n", page);
panic("page fault\n");
}
}