diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/msghandler.C | 2 | ||||
| -rw-r--r-- | src/kernel/ptmgr.C | 41 | ||||
| -rw-r--r-- | src/kernel/syscall.C | 4 |
3 files changed, 24 insertions, 23 deletions
diff --git a/src/kernel/msghandler.C b/src/kernel/msghandler.C index e414455b2..32da05673 100644 --- a/src/kernel/msghandler.C +++ b/src/kernel/msghandler.C @@ -86,7 +86,7 @@ int MessageHandler::recvMessage(msg_t* i_msg) // Verify userspace didn't give a non-kernel message type. if (i_msg->type < MSG_FIRST_SYS_TYPE) { - printk("MessageHandler::recvMessage> type=%d\n", i_msg->type); + printkd("MessageHandler::recvMessage> type=%d\n", i_msg->type); return -EINVAL; } diff --git a/src/kernel/ptmgr.C b/src/kernel/ptmgr.C index dd7f0b6a8..f1e72bbca 100644 --- a/src/kernel/ptmgr.C +++ b/src/kernel/ptmgr.C @@ -27,7 +27,7 @@ #include <arch/ppc.H> #include <assert.h> -//#define Dprintk(...) printk(args...) +//#define Dprintk(...) printkd(args...) #define Dprintk(args...) #define Tprintk(args...) #define Eprintk(args...) printk(args) @@ -267,7 +267,7 @@ PageTableManager::PageTableManager( bool i_userSpace ) } else { - printk( "Page Table is at 0x%.16lX : 0x%.16lX\n", getAddress(), getAddress() + getSize() ); + printkd( "Page Table is at 0x%.16lX : 0x%.16lX\n", getAddress(), getAddress() + getSize() ); } //initialize the table to be invalid @@ -678,31 +678,32 @@ void PageTableManager::printPTE( const char* i_label, { if( i_pte == NULL ) { - if( i_label ) { printk( "%s :: ", i_label ); } - printk( "NULL PTE\n" ); + if( i_label ) { printkd( "%s :: ", i_label ); } + printkd( "NULL PTE\n" ); return; } uint64_t pte_num = (((uint64_t)i_pte) - getAddress()) / sizeof(PageTableEntry); + pte_num++; pte_num--; - if( i_label ) { printk( "%s :: ", i_label ); } + if( i_label ) { printkd( "%s :: ", i_label ); } if( i_verbose ) { - printk( "[%4ld:%4ld]> @%p\n", pte_num/PTEG_SIZE, pte_num%PTEG_SIZE, i_pte ); - printk( "Dword : %.16lX %.16lX\n", ((uint64_t*)i_pte)[0], ((uint64_t*)i_pte)[1] ); - printk( "-AVA : 0x%.14lX\n", i_pte->AVA ); - printk( "-SW : %ld\n", i_pte->SW ); - printk( "-LRU : %ld\n", i_pte->LRU ); - printk( "-V : %ld\n", i_pte->V ); - printk( "-RC : %ld%ld\n", i_pte->R, i_pte->C ); - printk( "-WIMG : 0x%.1lX\n", i_pte->WIMG ); - printk( "-pp0 : %ld\n", i_pte->pp0 ); - printk( "-pp1_2 : %ld\n", i_pte->pp1_2 ); - printk( "-PN : %ld\n", i_pte->PN ); + printkd( "[%4ld:%4ld]> @%p\n", pte_num/PTEG_SIZE, pte_num%PTEG_SIZE, i_pte ); + printkd( "Dword : %.16lX %.16lX\n", ((uint64_t*)i_pte)[0], ((uint64_t*)i_pte)[1] ); + printkd( "-AVA : 0x%.14lX\n", i_pte->AVA ); + printkd( "-SW : %ld\n", i_pte->SW ); + printkd( "-LRU : %ld\n", i_pte->LRU ); + printkd( "-V : %ld\n", i_pte->V ); + printkd( "-RC : %ld%ld\n", i_pte->R, i_pte->C ); + printkd( "-WIMG : 0x%.1lX\n", i_pte->WIMG ); + printkd( "-pp0 : %ld\n", i_pte->pp0 ); + printkd( "-pp1_2 : %ld\n", i_pte->pp1_2 ); + printkd( "-PN : %ld\n", i_pte->PN ); } else { - printk( "[%4ld:%4ld]> @%p : %.16lX %.16lX : AVA=%16lX, PN=%ld\n", pte_num/PTEG_SIZE, pte_num%PTEG_SIZE, i_pte, i_pte->dword0, i_pte->dword1, i_pte->AVA, i_pte->PN ); + printkd( "[%4ld:%4ld]> @%p : %.16lX %.16lX : AVA=%16lX, PN=%ld\n", pte_num/PTEG_SIZE, pte_num%PTEG_SIZE, i_pte, i_pte->dword0, i_pte->dword1, i_pte->AVA, i_pte->PN ); } } @@ -713,10 +714,10 @@ void PageTableManager::printPTE( const char* i_label, */ void PageTableManager::_printPT( void ) { - printk( "- -Page Table --\n" ); + printkd( "- -Page Table --\n" ); uint64_t pt_addr = getAddress(); PageTableEntry* pte = (PageTableEntry*) pt_addr; - printk( "@%p..0x%.16lX\n", pte, pt_addr + getSize() ); + printkd( "@%p..0x%.16lX\n", pte, pt_addr + getSize() ); uint64_t num_ptes = getSize() / sizeof(PageTableEntry); for( uint64_t x = 0; x < num_ptes; x++ ) @@ -729,7 +730,7 @@ void PageTableManager::_printPT( void ) pte++; } - printk( "-- End Page Table --\n" ); + printkd( "-- End Page Table --\n" ); } /** diff --git a/src/kernel/syscall.C b/src/kernel/syscall.C index 07e34a5f5..c33f2b40a 100644 --- a/src/kernel/syscall.C +++ b/src/kernel/syscall.C @@ -200,7 +200,7 @@ namespace Systemcalls if (m->type >= MSG_FIRST_SYS_TYPE) { - printk("MsgSend> type=%d\n", m->type); + printkd("MsgSend> type=%d\n", m->type); TASK_SETRTN(t, -EINVAL); return; } @@ -234,7 +234,7 @@ namespace Systemcalls if (m->type >= MSG_FIRST_SYS_TYPE) { - printk("MsgSendRecv> type=%d\n", m->type); + printkd("MsgSendRecv> type=%d\n", m->type); TASK_SETRTN(t, -EINVAL); return; } |
