i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* TRACE(()) -> TRACE()

Browse Source 
* Fixed warnings with tracing enabled.
* Improved some debug output.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35686 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-02-28 23:45:00 +00:00
parent af0572ead2
commit e82b595ac6
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/bios_ia32/mmu.cpp
+28 -25
View File
@@ -46,9 +46,9 @@
//#define TRACE_MMU //#define TRACE_MMU
#ifdef TRACE_MMU #ifdef TRACE_MMU
# define TRACE(x) dprintf x # define TRACE(x...) dprintf(x)
#else #else
# define TRACE(x) ; # define TRACE(x...) ;
#endif #endif
@@ -137,8 +137,9 @@ get_next_physical_page()
static uint32 * static uint32 *
get_next_page_table() get_next_page_table()
{ {
TRACE(("get_next_page_table, sNextPageTableAddress %p, kPageTableRegionEnd " TRACE("get_next_page_table, sNextPageTableAddress %#" B_PRIxADDR
"%p\n", sNextPageTableAddress, kPageTableRegionEnd)); ", kPageTableRegionEnd %#" B_PRIxADDR "\n", sNextPageTableAddress,
kPageTableRegionEnd);
addr_t address = sNextPageTableAddress; addr_t address = sNextPageTableAddress;
if (address >= kPageTableRegionEnd) if (address >= kPageTableRegionEnd)
@@ -153,8 +154,6 @@ get_next_page_table()
static void static void
add_page_table(addr_t base) add_page_table(addr_t base)
{ {
TRACE(("add_page_table(base = %p)\n", (void *)base));
// Get new page table and clear it out // Get new page table and clear it out
uint32 *pageTable = get_next_page_table(); uint32 *pageTable = get_next_page_table();
if (pageTable > (uint32 *)(8 * 1024 * 1024)) { if (pageTable > (uint32 *)(8 * 1024 * 1024)) {
@@ -162,6 +161,8 @@ add_page_table(addr_t base)
"region\n"); "region\n");
} }
TRACE("add_page_table(base = %p), got page: %p\n", (void*)base, pageTable);
gKernelArgs.arch_args.pgtables[gKernelArgs.arch_args.num_pgtables++] gKernelArgs.arch_args.pgtables[gKernelArgs.arch_args.num_pgtables++]
= (uint32)pageTable; = (uint32)pageTable;
@@ -177,7 +178,7 @@ add_page_table(addr_t base)
static void static void
unmap_page(addr_t virtualAddress) unmap_page(addr_t virtualAddress)
{ {
TRACE(("unmap_page(virtualAddress = %p)\n", (void *)virtualAddress)); TRACE("unmap_page(virtualAddress = %p)\n", (void *)virtualAddress);
if (virtualAddress < KERNEL_BASE) { if (virtualAddress < KERNEL_BASE) {
panic("unmap_page: asked to unmap invalid page %p!\n", panic("unmap_page: asked to unmap invalid page %p!\n",
@@ -201,7 +202,8 @@ unmap_page(addr_t virtualAddress)
static void static void
map_page(addr_t virtualAddress, addr_t physicalAddress, uint32 flags) map_page(addr_t virtualAddress, addr_t physicalAddress, uint32 flags)
{ {
TRACE(("map_page: vaddr 0x%lx, paddr 0x%lx\n", virtualAddress, physicalAddress)); TRACE("map_page: vaddr 0x%lx, paddr 0x%lx\n", virtualAddress,
physicalAddress);
if (virtualAddress < KERNEL_BASE) { if (virtualAddress < KERNEL_BASE) {
panic("map_page: asked to map invalid page %p!\n", panic("map_page: asked to map invalid page %p!\n",
@@ -210,7 +212,6 @@ map_page(addr_t virtualAddress, addr_t physicalAddress, uint32 flags)
if (virtualAddress >= sMaxVirtualAddress) { if (virtualAddress >= sMaxVirtualAddress) {
// we need to add a new page table // we need to add a new page table
add_page_table(sMaxVirtualAddress); add_page_table(sMaxVirtualAddress);
sMaxVirtualAddress += B_PAGE_SIZE * 1024; sMaxVirtualAddress += B_PAGE_SIZE * 1024;
@@ -227,14 +228,15 @@ map_page(addr_t virtualAddress, addr_t physicalAddress, uint32 flags)
/ (B_PAGE_SIZE * 1024)] & 0xfffff000); / (B_PAGE_SIZE * 1024)] & 0xfffff000);
uint32 tableEntry = (virtualAddress % (B_PAGE_SIZE * 1024)) / B_PAGE_SIZE; uint32 tableEntry = (virtualAddress % (B_PAGE_SIZE * 1024)) / B_PAGE_SIZE;
TRACE(("map_page: inserting pageTable %p, tableEntry %ld, physicalAddress " TRACE("map_page: inserting pageTable %p, tableEntry %" B_PRIu32
"%p\n", pageTable, tableEntry, physicalAddress)); ", physicalAddress %#" B_PRIxADDR "\n", pageTable, tableEntry,
physicalAddress);
pageTable[tableEntry] = physicalAddress | flags; pageTable[tableEntry] = physicalAddress | flags;
asm volatile("invlpg (%0)" : : "r" (virtualAddress)); asm volatile("invlpg (%0)" : : "r" (virtualAddress));
TRACE(("map_page: done\n")); TRACE("map_page: done\n");
} }
@@ -282,7 +284,7 @@ get_memory_map(extended_memory **_extendedMemory)
bios_regs regs = {0, 0, sizeof(extended_memory), 0, 0, (uint32)block, 0, 0}; bios_regs regs = {0, 0, sizeof(extended_memory), 0, 0, (uint32)block, 0, 0};
uint32 count = 0; uint32 count = 0;
TRACE(("get_memory_map()\n")); TRACE("get_memory_map()\n");
do { do {
regs.eax = 0xe820; regs.eax = 0xe820;
@@ -314,7 +316,7 @@ get_memory_map(extended_memory **_extendedMemory)
static void static void
init_page_directory(void) init_page_directory(void)
{ {
TRACE(("init_page_directory\n")); TRACE("init_page_directory\n");
// allocate a new pgdir // allocate a new pgdir
sPageDirectory = (uint32 *)get_next_physical_page(); sPageDirectory = (uint32 *)get_next_physical_page();
@@ -387,8 +389,8 @@ mmu_map_physical_memory(addr_t physicalAddress, size_t size, uint32 flags)
extern "C" void * extern "C" void *
mmu_allocate(void *virtualAddress, size_t size) mmu_allocate(void *virtualAddress, size_t size)
{ {
TRACE(("mmu_allocate: requested vaddr: %p, next free vaddr: 0x%lx, size: " TRACE("mmu_allocate: requested vaddr: %p, next free vaddr: 0x%lx, size: "
"%ld\n", virtualAddress, sNextVirtualAddress, size)); "%ld\n", virtualAddress, sNextVirtualAddress, size);
size = (size + B_PAGE_SIZE - 1) / B_PAGE_SIZE; size = (size + B_PAGE_SIZE - 1) / B_PAGE_SIZE;
// get number of pages to map // get number of pages to map
@@ -434,7 +436,7 @@ mmu_allocate(void *virtualAddress, size_t size)
extern "C" void extern "C" void
mmu_free(void *virtualAddress, size_t size) mmu_free(void *virtualAddress, size_t size)
{ {
TRACE(("mmu_free(virtualAddress = %p, size: %ld)\n", virtualAddress, size)); TRACE("mmu_free(virtualAddress = %p, size: %ld)\n", virtualAddress, size);
addr_t address = (addr_t)virtualAddress; addr_t address = (addr_t)virtualAddress;
addr_t pageOffset = address % B_PAGE_SIZE; addr_t pageOffset = address % B_PAGE_SIZE;
@@ -467,7 +469,7 @@ mmu_free(void *virtualAddress, size_t size)
extern "C" void extern "C" void
mmu_init_for_kernel(void) mmu_init_for_kernel(void)
{ {
TRACE(("mmu_init_for_kernel\n")); TRACE("mmu_init_for_kernel\n");
// set up a new idt // set up a new idt
{ {
struct gdt_idt_descr idtDescriptor; struct gdt_idt_descr idtDescriptor;
@@ -477,7 +479,7 @@ mmu_init_for_kernel(void)
idt = (uint32 *)get_next_physical_page(); idt = (uint32 *)get_next_physical_page();
gKernelArgs.arch_args.phys_idt = (uint32)idt; gKernelArgs.arch_args.phys_idt = (uint32)idt;
TRACE(("idt at %p\n", idt)); TRACE("idt at %p\n", idt);
// map the idt into virtual space // map the idt into virtual space
gKernelArgs.arch_args.vir_idt = (uint32)get_next_virtual_page(); gKernelArgs.arch_args.vir_idt = (uint32)get_next_virtual_page();
@@ -496,7 +498,7 @@ mmu_init_for_kernel(void)
asm("lidt %0;" asm("lidt %0;"
: : "m" (idtDescriptor)); : : "m" (idtDescriptor));
TRACE(("idt at virtual address 0x%lx\n", gKernelArgs.arch_args.vir_idt)); TRACE("idt at virtual address 0x%lx\n", gKernelArgs.arch_args.vir_idt);
} }
// set up a new gdt // set up a new gdt
@@ -508,7 +510,7 @@ mmu_init_for_kernel(void)
gdt = (segment_descriptor *)get_next_physical_page(); gdt = (segment_descriptor *)get_next_physical_page();
gKernelArgs.arch_args.phys_gdt = (uint32)gdt; gKernelArgs.arch_args.phys_gdt = (uint32)gdt;
TRACE(("gdt at %p\n", gdt)); TRACE("gdt at %p\n", gdt);
// map the gdt into virtual space // map the gdt into virtual space
gKernelArgs.arch_args.vir_gdt = (uint32)get_next_virtual_page(); gKernelArgs.arch_args.vir_gdt = (uint32)get_next_virtual_page();
@@ -545,7 +547,8 @@ mmu_init_for_kernel(void)
asm("lgdt %0;" asm("lgdt %0;"
: : "m" (gdtDescriptor)); : : "m" (gdtDescriptor));
TRACE(("gdt at virtual address %p\n", (void *)gKernelArgs.arch_args.vir_gdt)); TRACE("gdt at virtual address %p\n",
(void*)gKernelArgs.arch_args.vir_gdt);
} }
// save the memory we've physically allocated // save the memory we've physically allocated
@@ -593,7 +596,7 @@ mmu_init_for_kernel(void)
extern "C" void extern "C" void
mmu_init(void) mmu_init(void)
{ {
TRACE(("mmu_init\n")); TRACE("mmu_init\n");
gKernelArgs.physical_allocated_range[0].start = sNextPhysicalAddress; gKernelArgs.physical_allocated_range[0].start = sNextPhysicalAddress;
gKernelArgs.physical_allocated_range[0].size = 0; gKernelArgs.physical_allocated_range[0].size = 0;
@@ -619,8 +622,8 @@ mmu_init(void)
gKernelArgs.cpu_kstack[0].size = KERNEL_STACK_SIZE gKernelArgs.cpu_kstack[0].size = KERNEL_STACK_SIZE
+ KERNEL_STACK_GUARD_PAGES * B_PAGE_SIZE; + KERNEL_STACK_GUARD_PAGES * B_PAGE_SIZE;
TRACE(("kernel stack at 0x%lx to 0x%lx\n", gKernelArgs.cpu_kstack[0].start, TRACE("kernel stack at 0x%lx to 0x%lx\n", gKernelArgs.cpu_kstack[0].start,
gKernelArgs.cpu_kstack[0].start + gKernelArgs.cpu_kstack[0].size)); gKernelArgs.cpu_kstack[0].start + gKernelArgs.cpu_kstack[0].size);
extended_memory *extMemoryBlock; extended_memory *extMemoryBlock;
uint32 extMemoryCount = get_memory_map(&extMemoryBlock); uint32 extMemoryCount = get_memory_map(&extMemoryBlock);