narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[efi] Show memory map returned by wrapped calls to GetMemoryMap 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/143/head
Michael Brown 2020-09-22 13:59:37 +01:00
parent e08ad61bf7
commit fe69934191
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/interface/efi/efi_wrap.c
View File

@ -282,18 +282,36 @@ efi_get_memory_map_wrapper ( UINTN *memory_map_size,
UINT32 *descriptor_version ) { UINT32 *descriptor_version ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices; EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
void *retaddr = __builtin_return_address ( 0 ); void *retaddr = __builtin_return_address ( 0 );
EFI_MEMORY_DESCRIPTOR *desc;
size_t remaining;
EFI_STATUS efirc; EFI_STATUS efirc;
DBGC ( colour, "GetMemoryMap ( %#llx, %p ) ", DBGC ( colour, "GetMemoryMap ( %#llx, %p ) ",
( ( unsigned long long ) *memory_map_size ), memory_map ); ( ( unsigned long long ) *memory_map_size ), memory_map );
efirc = bs->GetMemoryMap ( memory_map_size, memory_map, map_key, efirc = bs->GetMemoryMap ( memory_map_size, memory_map, map_key,
descriptor_size, descriptor_version ); descriptor_size, descriptor_version );
DBGC ( colour, "= %s ( %#llx, %#llx, %#llx, v%d ) -> %p\n", DBGC ( colour, "= %s ( %#llx, %#llx, %#llx, v%d",
efi_status ( efirc ), efi_status ( efirc ),
( ( unsigned long long ) *memory_map_size ), ( ( unsigned long long ) *memory_map_size ),
( ( unsigned long long ) *map_key ), ( ( unsigned long long ) *map_key ),
( ( unsigned long long ) *descriptor_size ), ( ( unsigned long long ) *descriptor_size ),
*descriptor_version, retaddr ); *descriptor_version );
if ( DBG_EXTRA && ( efirc == 0 ) ) {
DBGC2 ( colour, ",\n" );
for ( desc = memory_map, remaining = *memory_map_size ;
remaining >= *descriptor_size ;
desc = ( ( ( void * ) desc ) + *descriptor_size ),
remaining -= *descriptor_size ) {
DBGC2 ( colour, "%#016llx+%#08llx %#016llx "
"%s\n", desc->PhysicalStart,
( desc->NumberOfPages * EFI_PAGE_SIZE ),
desc->Attribute,
efi_memory_type ( desc->Type ) );
}
} else {
DBGC ( colour, " " );
}
DBGC ( colour, ") -> %p\n", retaddr );
return efirc; return efirc;
} }