diff options
| author | Michael Brown | 2005-04-10 18:58:19 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-04-10 18:58:19 +0200 |
| commit | 070f6c0b6ba867290e5c237c80958618f9015d87 (patch) | |
| tree | e7efe3bb7b1596c8d38e334d9ba5893015f67312 /src | |
| parent | setup16() now calls initialise(); we don't have to do it. (diff) | |
| download | ipxe-070f6c0b6ba867290e5c237c80958618f9015d87.tar.gz ipxe-070f6c0b6ba867290e5c237c80958618f9015d87.tar.xz ipxe-070f6c0b6ba867290e5c237c80958618f9015d87.zip | |
Fixed debug messages
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/i386/firmware/pcbios/basemem.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/arch/i386/firmware/pcbios/basemem.c b/src/arch/i386/firmware/pcbios/basemem.c index 8e65b8da4..07b5cc812 100644 --- a/src/arch/i386/firmware/pcbios/basemem.c +++ b/src/arch/i386/firmware/pcbios/basemem.c @@ -79,8 +79,10 @@ void * alloc_base_memory ( size_t size ) { */ memset ( ptr, 0, size_kb << 10 ); - DBG ( "Allocated %d kB of base memory at [%hx:0000,%hx:0000)\n", - size_kb, ( fbms << 6 ), ( ( fbms + size_kb ) << 6 ) ); + DBG ( "Allocated %d kB of base memory at [%hx:0000,%hx:0000), " + "%d kB now free\n", size_kb, + ( virt_to_phys ( ptr ) >> 4 ), + ( ( virt_to_phys ( ptr ) + ( size_kb << 10 ) ) >> 4 ), fbms ); /* Update our memory map */ get_memsizes(); @@ -113,9 +115,11 @@ void free_base_memory ( void *ptr, size_t size ) { return; } - DBG ( "Trying to free %d bytes base memory at %hx:%hx\n", size, + DBG ( "Trying to free %d bytes base memory at %hx:%hx " + "from %d kB free\n", size, ( virt_to_phys ( ptr - remainder ) >> 4 ), - ( virt_to_phys ( ptr - remainder ) & 0xf ) + remainder ); + ( virt_to_phys ( ptr - remainder ) & 0xf ) + remainder, + fbms ); /* Mark every kilobyte within this block as free. This is * overkill for normal purposes, but helps when something has @@ -142,8 +146,6 @@ void free_base_memory ( void *ptr, size_t size ) { /* Update our memory map */ get_memsizes(); - - DBG ( "%d kB of base memory now free\n", fbms ); } /* Do the actual freeing of memory. This is split out from @@ -173,9 +175,13 @@ static void free_unused_base_memory ( void ) { /* Return memory to BIOS */ fbms += free_block->size_kb; - DBG ( "Freed %d kB of base memory at [%hx:0000,%hx:0000)\n", - free_block->size_kb, ( fbms << 6 ), - ( fbms + free_block->size_kb ) << 6 ); + DBG ( "Freed %d kB of base memory at [%hx:0000,%hx:0000), " + "%d kB now free\n", + free_block->size_kb, + ( virt_to_phys ( free_block ) >> 4 ), + ( ( virt_to_phys ( free_block ) + + ( free_block->size_kb << 10 ) ) >> 4 ), + fbms ); /* Do not zero out the freed block, because it might * be the one containing librm, in which case we're |