Formatting fixes and removed commented code only.
This commit is contained in:
Justin C. Miller
@@ -8,107 +8,107 @@
|
||||
const UINTN PAGE_SIZE = 4096;
|
||||
|
||||
const CHAR16 *memory_type_names[] = {
|
||||
L"EfiReservedMemoryType",
|
||||
L"EfiLoaderCode",
|
||||
L"EfiLoaderData",
|
||||
L"EfiBootServicesCode",
|
||||
L"EfiBootServicesData",
|
||||
L"EfiRuntimeServicesCode",
|
||||
L"EfiRuntimeServicesData",
|
||||
L"EfiConventionalMemory",
|
||||
L"EfiUnusableMemory",
|
||||
L"EfiACPIReclaimMemory",
|
||||
L"EfiACPIMemoryNVS",
|
||||
L"EfiMemoryMappedIO",
|
||||
L"EfiMemoryMappedIOPortSpace",
|
||||
L"EfiPalCode",
|
||||
L"EfiPersistentMemory",
|
||||
L"EfiReservedMemoryType",
|
||||
L"EfiLoaderCode",
|
||||
L"EfiLoaderData",
|
||||
L"EfiBootServicesCode",
|
||||
L"EfiBootServicesData",
|
||||
L"EfiRuntimeServicesCode",
|
||||
L"EfiRuntimeServicesData",
|
||||
L"EfiConventionalMemory",
|
||||
L"EfiUnusableMemory",
|
||||
L"EfiACPIReclaimMemory",
|
||||
L"EfiACPIMemoryNVS",
|
||||
L"EfiMemoryMappedIO",
|
||||
L"EfiMemoryMappedIOPortSpace",
|
||||
L"EfiPalCode",
|
||||
L"EfiPersistentMemory",
|
||||
};
|
||||
|
||||
static const CHAR16 *memory_type_name(UINT32 value) {
|
||||
if (value >= (sizeof(memory_type_names)/sizeof(CHAR16*)))
|
||||
return L"Bad Type Value";
|
||||
return memory_type_names[value];
|
||||
if (value >= (sizeof(memory_type_names)/sizeof(CHAR16*)))
|
||||
return L"Bad Type Value";
|
||||
return memory_type_names[value];
|
||||
}
|
||||
|
||||
void EFIAPI memory_update_addresses(EFI_EVENT UNUSED *event, void *context) {
|
||||
ST->RuntimeServices->ConvertPointer(0, (void **)context);
|
||||
ST->RuntimeServices->ConvertPointer(0, (void **)context);
|
||||
}
|
||||
|
||||
EFI_STATUS memory_mark_address_for_update(void **pointer) {
|
||||
EFI_EVENT event;
|
||||
EFI_STATUS status;
|
||||
EFI_EVENT event;
|
||||
EFI_STATUS status;
|
||||
|
||||
status = ST->BootServices->CreateEvent(
|
||||
EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
|
||||
TPL_CALLBACK,
|
||||
(EFI_EVENT_NOTIFY)&memory_update_addresses,
|
||||
(void*)pointer,
|
||||
&event);
|
||||
status = ST->BootServices->CreateEvent(
|
||||
EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
|
||||
TPL_CALLBACK,
|
||||
(EFI_EVENT_NOTIFY)&memory_update_addresses,
|
||||
(void*)pointer,
|
||||
&event);
|
||||
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to create memory update event");
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to create memory update event");
|
||||
}
|
||||
|
||||
EFI_STATUS memory_virtualize(void **kernel_addr, EFI_MEMORY_DESCRIPTOR *memory_map,
|
||||
UINTN memmap_size, UINTN desc_size, UINT32 desc_version) {
|
||||
unsigned count = memmap_size / desc_size;
|
||||
for (unsigned i=0; i<count; ++i) {
|
||||
if (memory_map[i].Type == KERNEL_MEMTYPE)
|
||||
memory_map[i].VirtualStart = (EFI_VIRTUAL_ADDRESS)KERNEL_VIRT_ADDRESS;
|
||||
else
|
||||
memory_map[i].VirtualStart = (EFI_VIRTUAL_ADDRESS)memory_map[i].PhysicalStart;
|
||||
}
|
||||
UINTN memmap_size, UINTN desc_size, UINT32 desc_version) {
|
||||
unsigned count = memmap_size / desc_size;
|
||||
for (unsigned i=0; i<count; ++i) {
|
||||
if (memory_map[i].Type == KERNEL_MEMTYPE)
|
||||
memory_map[i].VirtualStart = (EFI_VIRTUAL_ADDRESS)KERNEL_VIRT_ADDRESS;
|
||||
else
|
||||
memory_map[i].VirtualStart = (EFI_VIRTUAL_ADDRESS)memory_map[i].PhysicalStart;
|
||||
}
|
||||
|
||||
return ST->RuntimeServices->SetVirtualAddressMap(memmap_size, desc_size, desc_version, memory_map);
|
||||
return ST->RuntimeServices->SetVirtualAddressMap(memmap_size, desc_size, desc_version, memory_map);
|
||||
}
|
||||
|
||||
EFI_STATUS memory_get_map(EFI_MEMORY_DESCRIPTOR **buffer, UINTN *buffer_size,
|
||||
UINTN *key, UINTN *desc_size, UINT32 *desc_version) {
|
||||
EFI_STATUS status;
|
||||
UINTN *key, UINTN *desc_size, UINT32 *desc_version) {
|
||||
EFI_STATUS status;
|
||||
|
||||
UINTN needs_size = 0;
|
||||
status = ST->BootServices->GetMemoryMap(&needs_size, 0, key, desc_size, desc_version);
|
||||
if (status != EFI_BUFFER_TOO_SMALL) {
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to load memory map");
|
||||
}
|
||||
UINTN needs_size = 0;
|
||||
status = ST->BootServices->GetMemoryMap(&needs_size, 0, key, desc_size, desc_version);
|
||||
if (status != EFI_BUFFER_TOO_SMALL) {
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to load memory map");
|
||||
}
|
||||
|
||||
// Give some extra buffer to account for changes.
|
||||
*buffer_size = needs_size + 256;
|
||||
status = ST->BootServices->AllocatePool(EfiLoaderData, *buffer_size, (void**)buffer);
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to allocate space for memory map");
|
||||
// Give some extra buffer to account for changes.
|
||||
*buffer_size = needs_size + 256;
|
||||
status = ST->BootServices->AllocatePool(EfiLoaderData, *buffer_size, (void**)buffer);
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to allocate space for memory map");
|
||||
|
||||
status = ST->BootServices->GetMemoryMap(buffer_size, *buffer, key, desc_size, desc_version);
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to load memory map");
|
||||
return EFI_SUCCESS;
|
||||
status = ST->BootServices->GetMemoryMap(buffer_size, *buffer, key, desc_size, desc_version);
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to load memory map");
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
EFI_STATUS memory_dump_map() {
|
||||
EFI_MEMORY_DESCRIPTOR *buffer;
|
||||
UINTN buffer_size, desc_size, key;
|
||||
UINT32 desc_version;
|
||||
EFI_MEMORY_DESCRIPTOR *buffer;
|
||||
UINTN buffer_size, desc_size, key;
|
||||
UINT32 desc_version;
|
||||
|
||||
EFI_STATUS status = memory_get_map(&buffer, &buffer_size, &key,
|
||||
&desc_size, &desc_version);
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to get memory map");
|
||||
EFI_STATUS status = memory_get_map(&buffer, &buffer_size, &key,
|
||||
&desc_size, &desc_version);
|
||||
CHECK_EFI_STATUS_OR_RETURN(status, "Failed to get memory map");
|
||||
|
||||
const UINTN count = buffer_size / desc_size;
|
||||
const UINTN count = buffer_size / desc_size;
|
||||
|
||||
Print(L"Memory map:\n");
|
||||
Print(L"\t Descriptor Count: %d (%d bytes)\n", count, buffer_size);
|
||||
Print(L"\t Version Key: %d\n", key);
|
||||
Print(L"\tDescriptor Version: %d (%d bytes)\n\n", desc_version, desc_size);
|
||||
Print(L"Memory map:\n");
|
||||
Print(L"\t Descriptor Count: %d (%d bytes)\n", count, buffer_size);
|
||||
Print(L"\t Version Key: %d\n", key);
|
||||
Print(L"\tDescriptor Version: %d (%d bytes)\n\n", desc_version, desc_size);
|
||||
|
||||
EFI_MEMORY_DESCRIPTOR *end = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)buffer + buffer_size);
|
||||
EFI_MEMORY_DESCRIPTOR *d = buffer;
|
||||
while (d < end) {
|
||||
UINTN size_bytes = d->NumberOfPages * PAGE_SIZE;
|
||||
EFI_MEMORY_DESCRIPTOR *end = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)buffer + buffer_size);
|
||||
EFI_MEMORY_DESCRIPTOR *d = buffer;
|
||||
while (d < end) {
|
||||
UINTN size_bytes = d->NumberOfPages * PAGE_SIZE;
|
||||
|
||||
Print(L"%23s ", memory_type_name(d->Type));
|
||||
Print(L"%016llx (%3d pages)\n", d->PhysicalStart, size_bytes / 0x1000);
|
||||
Print(L"%23s ", memory_type_name(d->Type));
|
||||
Print(L"%016llx (%3d pages)\n", d->PhysicalStart, size_bytes / 0x1000);
|
||||
|
||||
d = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)d + desc_size);
|
||||
}
|
||||
d = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)d + desc_size);
|
||||
}
|
||||
|
||||
ST->BootServices->FreePool(buffer);
|
||||
return EFI_SUCCESS;
|
||||
ST->BootServices->FreePool(buffer);
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user