1*4882a593SmuzhiyunFrom ba44c87e56a8bccde235ebb7d41d5aa54604d241 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Jones <pjones@redhat.com> 3*4882a593SmuzhiyunDate: Mon, 15 Feb 2021 14:21:48 +0100 4*4882a593SmuzhiyunSubject: [PATCH] util/mkimage: Reorder PE optional header fields set-up 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis makes the PE32 and PE32+ header fields set-up easier to follow by 7*4882a593Smuzhiyunsetting them closer to the initialization of their related sections. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Peter Jones <pjones@redhat.com> 10*4882a593SmuzhiyunSigned-off-by: Javier Martinez Canillas <javierm@redhat.com> 11*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 12*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun util/mkimage.c | 16 ++++++++-------- 15*4882a593Smuzhiyun 1 file changed, 8 insertions(+), 8 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/util/mkimage.c b/util/mkimage.c 18*4882a593Smuzhiyunindex a039039..deaef56 100644 19*4882a593Smuzhiyun--- a/util/mkimage.c 20*4882a593Smuzhiyun+++ b/util/mkimage.c 21*4882a593Smuzhiyun@@ -1332,16 +1332,12 @@ grub_install_generate_image (const char *dir, const char *prefix, 22*4882a593Smuzhiyun sections = o64 + 1; 23*4882a593Smuzhiyun } 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun- PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); 26*4882a593Smuzhiyun- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); 27*4882a593Smuzhiyun+ PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); 28*4882a593Smuzhiyun PE_OHDR (o32, o64, entry_addr) = grub_host_to_target32 (layout.start_address); 29*4882a593Smuzhiyun- PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); 30*4882a593Smuzhiyun- 31*4882a593Smuzhiyun PE_OHDR (o32, o64, image_base) = 0; 32*4882a593Smuzhiyun+ PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); 33*4882a593Smuzhiyun PE_OHDR (o32, o64, section_alignment) = grub_host_to_target32 (image_target->section_align); 34*4882a593Smuzhiyun PE_OHDR (o32, o64, file_alignment) = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); 35*4882a593Smuzhiyun- PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); 36*4882a593Smuzhiyun- PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); 37*4882a593Smuzhiyun PE_OHDR (o32, o64, subsystem) = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun /* Do these really matter? */ 40*4882a593Smuzhiyun@@ -1351,10 +1347,10 @@ grub_install_generate_image (const char *dir, const char *prefix, 41*4882a593Smuzhiyun PE_OHDR (o32, o64, heap_commit_size) = grub_host_to_target32 (0x10000); 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); 44*4882a593Smuzhiyun- PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); 45*4882a593Smuzhiyun- PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun /* The sections. */ 48*4882a593Smuzhiyun+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); 49*4882a593Smuzhiyun+ PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); 50*4882a593Smuzhiyun text_section = sections; 51*4882a593Smuzhiyun strcpy (text_section->name, ".text"); 52*4882a593Smuzhiyun text_section->virtual_size = grub_host_to_target32 (layout.exec_size); 53*4882a593Smuzhiyun@@ -1366,6 +1362,8 @@ grub_install_generate_image (const char *dir, const char *prefix, 54*4882a593Smuzhiyun | GRUB_PE32_SCN_MEM_EXECUTE 55*4882a593Smuzhiyun | GRUB_PE32_SCN_MEM_READ); 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); 58*4882a593Smuzhiyun+ 59*4882a593Smuzhiyun data_section = text_section + 1; 60*4882a593Smuzhiyun strcpy (data_section->name, ".data"); 61*4882a593Smuzhiyun data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); 62*4882a593Smuzhiyun@@ -1388,6 +1386,8 @@ grub_install_generate_image (const char *dir, const char *prefix, 63*4882a593Smuzhiyun | GRUB_PE32_SCN_MEM_READ 64*4882a593Smuzhiyun | GRUB_PE32_SCN_MEM_WRITE); 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); 67*4882a593Smuzhiyun+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); 68*4882a593Smuzhiyun reloc_section = mods_section + 1; 69*4882a593Smuzhiyun strcpy (reloc_section->name, ".reloc"); 70*4882a593Smuzhiyun reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size); 71*4882a593Smuzhiyun-- 72*4882a593Smuzhiyun2.14.2 73*4882a593Smuzhiyun 74