Changeset 501 for GPL/trunk/lib32/memory.cpp

Timestamp:

Jul 11, 2010, 7:01:51 AM (15 years ago)

Author:

David Azarewicz

Message:

debug statement changes

File:

• GPL/trunk/lib32/memory.cpp (modified) (10 diffs)

GPL/trunk/lib32/memory.cpp

@@ -197 +197 @@
         *pAddr = (LINEAR)addr;
         if (flags & VMDHA_USEHIGHMEM)
-            dprintf((("allocated %X in HIGH memory\n"), size));
-        else dprintf((("allocated %X in LOW memory\n"), size));
-    }
-    if ((rc == 87) &&
-        (flags & VMDHA_USEHIGHMEM))
+            dprintf1((("allocated %X in HIGH memory\n"), size));
+        else dprintf1((("allocated %X in LOW memory\n"), size));
+    }
+    if ((rc == 87) && (flags & VMDHA_USEHIGHMEM))
     {
         // EARLYMEMINIT workaround
@@ -280 +279 @@
         //only done to save size of memory block
         AddBaseAddress(addr, addr, size);
-#ifdef DEBUG
         dprintf(("get_free_dma_pages %d -> %x (phys %x)", size, (ULONG)addr, virt_to_phys((void *)addr)));
-#endif
         ulget_free_pagesMemUsed += size;
-#ifdef DEBUG
         dprintf(("get_free_dma_pages: total alloc size %d", ulget_free_pagesMemUsed));
-#endif
     }
 
@@ -331 +326 @@
                 return 0;
         }
-////    dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));
+        //dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));
     if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM))
     {//must be aligned at 64kb boundary
@@ -359 +354 @@
     }
     if(addr) {
-#ifdef DEBUG
         dprintf(("get_free_pages %d (%d) -> %x (phys %x)", allocsize, size, (ULONG)addr, virt_to_phys((void *)addr)));
-#endif
         ulget_free_pagesMemUsed += allocsize;
-#ifdef DEBUG
         dprintf(("get_free_pages: total alloc size %d", ulget_free_pagesMemUsed));
-#endif
     }
     return (void *)addr;
@@ -382 +373 @@
     }
     else {
-#ifdef DEBUG
         dprintf(("free_pages %x size %d", (ULONG)addr, size));
-#endif
         ulget_free_pagesMemUsed -= size;
-#ifdef DEBUG
         dprintf(("free_pages: total alloc size %d", ulget_free_pagesMemUsed));
-#endif
-    }
-////    dprintf(("free_pages %x", addr));
+    }
+        //dprintf(("free_pages %x", addr));
         return 0;
 }
@@ -409 +396 @@
         }
     if(addr) {
-#ifdef DEBUG
         //dprintf(("vmalloc %d -> %x (phys %x)", size, addr, virt_to_phys((void *)addr)));
-#endif
         //only done to save size of memory block
         AddBaseAddress(addr, addr, size);
         ulget_free_pagesMemUsed += size;
-#ifdef DEBUG
         //dprintf(("vmalloc: total alloc size %d", ulget_free_pagesMemUsed));
-#endif
     }
     return (void *)addr;
@@ -434 +417 @@
     }
     else {
-#ifdef DEBUG
         //dprintf(("vfree %x size %d", (ULONG)ptr, size));
-#endif
         ulget_free_pagesMemUsed -= size;
-#ifdef DEBUG
         //dprintf(("vfree: total alloc size %d", ulget_free_pagesMemUsed));
-#endif
     }
 }
@@ -474 +453 @@
 
     //round to next page boundary
-//    size = size + PAGE_SIZE - 1;
-//    size &= 0xFFFFF000;
+        //size = size + PAGE_SIZE - 1;
+        //size &= 0xFFFFF000;
 
 #ifdef KEE
     SHORT sel;
 
-//    rc = KernVMAlloc(size, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&physaddr, &sel);
+        //rc = KernVMAlloc(size, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&physaddr, &sel);
     rc = KernVMAlloc(Length, VMDHA_PHYS, (PVOID*)&addr, (PVOID*)&PhysicalAddress, &sel);
 #else
@@ -616 +595 @@
         return 0;
     }
-////    dprintf(("kmalloc %d returned %x", size, addr));
+        //dprintf(("kmalloc %d returned %x", size, addr));
     return addr;
 }
@@ -634 +613 @@
         return;
     }
-////  dprintf(("kfree %x", addr));
+        //dprintf(("kfree %x", addr));
     if(IsHeapAddr(addr)) {
 #ifdef DEBUGHEAP