Changeset 85880 in vbox for trunk/src/VBox/Devices/EFI/Firmware/BaseTools

Timestamp:

Aug 24, 2020 6:22:41 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140054

Message:

Devices/EFI/Firmware: improve alignment error messages in Elf64Convert.c, helps tracking down what's causing the alignment trouble

File:

• trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFw/Elf64Convert.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFw/Elf64Convert.c

@@ -692 +692 @@
           mCoffOffset = (UINT32) ((mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1));
         } else {
+#ifdef VBOX
+          Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment. sec#%i addr=%#llx align=%#llx", i, shdr->sh_addr, shdr->sh_addralign);
+#else
           Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment.");
+#endif
         }
       }
@@ -743 +747 @@
           mCoffOffset = (UINT32) ((mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1));
         } else {
+#ifdef VBOX
+          Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment. sec#%i addr=%#llx align=%#llx", i, shdr->sh_addr, shdr->sh_addralign);
+#else
           Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment.");
+#endif
         }
       }
@@ -795 +803 @@
           mCoffOffset = (UINT32) ((mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1));
         } else {
+#ifdef VBOX
+          Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment. sec#%i addr=%#llx align=%#llx", i, shdr->sh_addr, shdr->sh_addralign);
+#else
           Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment.");
+#endif
         }
       }