sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-23 13:30:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

[efi] Populate debug directory entry FileOffset field

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2015-09-01 01:30:57 +01:00
parent ed609c4889
commit 619a377328
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/elf2efi.c
View File

@@ -41,6 +41,7 @@
struct pe_section { struct pe_section {
struct pe_section *next; struct pe_section *next;
EFI_IMAGE_SECTION_HEADER hdr; EFI_IMAGE_SECTION_HEADER hdr;
void ( * fixup ) ( struct pe_section *section );
uint8_t contents[0]; uint8_t contents[0];
}; };
@@ -547,6 +548,20 @@ create_reloc_section ( struct pe_header *pe_header,
return reloc; return reloc;
} }
/**
* Fix up debug section
*
* @v debug Debug section
*/
static void fixup_debug_section ( struct pe_section *debug ) {
EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *contents;
/* Fix up FileOffset */
contents = ( ( void * ) debug->contents );
contents->FileOffset += ( debug->hdr.PointerToRawData -
debug->hdr.VirtualAddress );
}
/** /**
* Create debug section * Create debug section
* *
@@ -581,6 +596,7 @@ create_debug_section ( struct pe_header *pe_header, const char *filename ) {
debug->hdr.Characteristics = ( EFI_IMAGE_SCN_CNT_INITIALIZED_DATA | debug->hdr.Characteristics = ( EFI_IMAGE_SCN_CNT_INITIALIZED_DATA |
EFI_IMAGE_SCN_MEM_NOT_PAGED | EFI_IMAGE_SCN_MEM_NOT_PAGED |
EFI_IMAGE_SCN_MEM_READ ); EFI_IMAGE_SCN_MEM_READ );
debug->fixup = fixup_debug_section;
/* Create section contents */ /* Create section contents */
contents->debug.TimeDateStamp = 0x10d1a884; contents->debug.TimeDateStamp = 0x10d1a884;
@@ -589,6 +605,7 @@ create_debug_section ( struct pe_header *pe_header, const char *filename ) {
( sizeof ( *contents ) - sizeof ( contents->debug ) ); ( sizeof ( *contents ) - sizeof ( contents->debug ) );
contents->debug.RVA = ( debug->hdr.VirtualAddress + contents->debug.RVA = ( debug->hdr.VirtualAddress +
offsetof ( typeof ( *contents ), rsds ) ); offsetof ( typeof ( *contents ), rsds ) );
contents->debug.FileOffset = contents->debug.RVA;
contents->rsds.Signature = CODEVIEW_SIGNATURE_RSDS; contents->rsds.Signature = CODEVIEW_SIGNATURE_RSDS;
snprintf ( contents->name, sizeof ( contents->name ), "%s", snprintf ( contents->name, sizeof ( contents->name ), "%s",
filename ); filename );
@@ -629,6 +646,8 @@ static void write_pe_file ( struct pe_header *pe_header,
fpos += section->hdr.SizeOfRawData; fpos += section->hdr.SizeOfRawData;
fpos = efi_file_align ( fpos ); fpos = efi_file_align ( fpos );
} }
if ( section->fixup )
section->fixup ( section );
} }
/* Write file header */ /* Write file header */