* [PATCH 0/4] Support payload in ELF format
@ 2021-05-26 8:23 Ni, Ray
2021-05-26 8:23 ` [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ni, Ray
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Ni, Ray @ 2021-05-26 8:23 UTC (permalink / raw)
To: devel
Per universal payload spec, the payload is in ELF format.
The patch set adds toolchain CLANGDWARF for building ELF image and
adds a payload loader that can load ELF image.
Ray Ni (4):
BaseTools: Create CLANGDWARF toolchain
MdePkg/UniversalPayload: Add definition for extra info in payload
UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload
PeiCore: Remove assertion when failing to load PE image
BaseTools/Conf/build_rule.template | 10 +-
BaseTools/Conf/tools_def.template | 98 ++
MdeModulePkg/Core/Pei/Image/Image.c | 5 +-
MdePkg/Include/UniversalPayload/ExtraData.h | 28 +
.../UniversalPayload/UniversalPayload.h | 38 +
MdePkg/MdePkg.dec | 3 +
UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h | 122 +++
.../PayloadLoaderPeim/ElfLib/Elf32.h | 252 +++++
.../PayloadLoaderPeim/ElfLib/Elf32Lib.c | 398 +++++++
.../PayloadLoaderPeim/ElfLib/Elf64.h | 254 +++++
.../PayloadLoaderPeim/ElfLib/Elf64Lib.c | 407 ++++++++
.../PayloadLoaderPeim/ElfLib/ElfCommon.h | 983 ++++++++++++++++++
.../PayloadLoaderPeim/ElfLib/ElfLib.c | 499 +++++++++
.../PayloadLoaderPeim/ElfLib/ElfLibInternal.h | 88 ++
.../PayloadLoaderPeim/PayloadLoaderPeim.c | 187 ++++
.../PayloadLoaderPeim/PayloadLoaderPeim.inf | 59 ++
16 files changed, 3426 insertions(+), 5 deletions(-)
create mode 100644 MdePkg/Include/UniversalPayload/ExtraData.h
create mode 100644 MdePkg/Include/UniversalPayload/UniversalPayload.h
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c
create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf
--
2.31.1.windows.1
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain 2021-05-26 8:23 [PATCH 0/4] Support payload in ELF format Ni, Ray @ 2021-05-26 8:23 ` Ni, Ray 2021-05-26 11:35 ` [edk2-devel] " Steven Shi 2021-05-26 8:23 ` [PATCH 2/4] MdePkg/UniversalPayload: Add definition for extra info in payload Ni, Ray ` (3 subsequent siblings) 4 siblings, 1 reply; 14+ messages in thread From: Ni, Ray @ 2021-05-26 8:23 UTC (permalink / raw) To: devel Signed-off-by: Ray Ni <ray.ni@intel.com> --- BaseTools/Conf/build_rule.template | 10 ++- BaseTools/Conf/tools_def.template | 98 ++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletion(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 1395792cd6..e69f963cc8 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -293,7 +293,10 @@ <ExtraDependency> $(MAKE_FILE) - <OutputFile> + <OutputFile.CLANGDWARF> + $(DEBUG_DIR)(+)$(MODULE_NAME).elf + + <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC> $(DEBUG_DIR)(+)$(MODULE_NAME).dll <Command.MSFT, Command.INTEL> @@ -303,6 +306,11 @@ <Command.CLANGPDB> "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) + <Command.CLANGDWARF> + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) + "$(CP)" ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).debug + "$(OBJCOPY)" --strip-unneeded -R .eh_frame ${dst} + <Command.GCC> "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) $(DLINK2_FLAGS) "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 498696e583..390e297cc1 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -2828,6 +2828,104 @@ NOOPT_CLANGPDB_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE NOOPT_CLANGPDB_X64_DLINK2_FLAGS = NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable +#################################################################################### +# +# CLANGDWARF - This configuration is used to compile under Windows/Linux/Mac to produce +# ELF binaries using LLVM/Clang/LLD with Link Time Optimization enabled +# +#################################################################################### +*_CLANGDWARF_*_*_FAMILY = GCC +*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGDWARF +*_CLANGDWARF_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make +*_CLANGDWARF_*_*_DLL = ENV(CLANGPDB_DLL) +*_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) + +*_CLANGDWARF_*_APP_FLAGS = +*_CLANGDWARF_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) +*_CLANGDWARF_*_ASL_OUTFLAGS = DEF(DEFAULT_WIN_ASL_OUTFLAGS) +*_CLANGDWARF_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) +*_CLANGDWARF_*_DEPS_FLAGS = DEF(GCC_DEPS_FLAGS) + +DEFINE CLANGDWARF_IA32_PREFIX = ENV(CLANG_BIN) +DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN) + +DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu +DEFINE CLANGDWARF_X64_TARGET = -target x86_64-pc-linux-gnu + +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses-equality -Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare -Wno-empty-body -Wno-unused-const-variable -Wno-varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward-reference +DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector -funsigned-char -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -Wno-address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno-incompatible-library-redeclaration -Wno-null-dereference -mno-implicit-float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh-exceptions + +########################### +# CLANGDWARF IA32 definitions +########################### +*_CLANGDWARF_IA32_CC_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang +*_CLANGDWARF_IA32_SLINK_PATH = DEF(CLANGDWARF_IA32_PREFIX)llvm-ar +*_CLANGDWARF_IA32_DLINK_PATH = DEF(CLANGDWARF_IA32_PREFIX)ld.lld +*_CLANGDWARF_IA32_ASLDLINK_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang +*_CLANGDWARF_IA32_ASM_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang +*_CLANGDWARF_IA32_PP_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang +*_CLANGDWARF_IA32_VFRPP_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang +*_CLANGDWARF_IA32_ASLCC_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang +*_CLANGDWARF_IA32_ASLPP_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang +*_CLANGDWARF_IA32_OBJCOPY_PATH = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy + +*_CLANGDWARF_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto DEF(CLANGDWARF_IA32_TARGET) +*_CLANGDWARF_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 -march=i386 DEF(CLANGDWARF_IA32_TARGET) +*_CLANGDWARF_IA32_OBJCOPY_FLAGS = +*_CLANGDWARF_IA32_NASM_FLAGS = -f elf32 +*_CLANGDWARF_IA32_PP_FLAGS = DEF(GCC_PP_FLAGS) DEF(CLANGDWARF_IA32_TARGET) +*_CLANGDWARF_IA32_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) DEF(CLANGDWARF_IA32_TARGET) +*_CLANGDWARF_IA32_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) DEF(CLANGDWARF_IA32_TARGET) + +DEBUG_CLANGDWARF_IA32_CC_FLAGS = DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANGDWARF_IA32_TARGET) -g +DEBUG_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 --format=elf +DEBUG_CLANGDWARF_IA32_DLINK2_FLAGS = + +RELEASE_CLANGDWARF_IA32_CC_FLAGS = DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANGDWARF_IA32_TARGET) +RELEASE_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 --format=elf +RELEASE_CLANGDWARF_IA32_DLINK2_FLAGS = + +NOOPT_CLANGDWARF_IA32_CC_FLAGS = DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -O0 -march=i586 DEF(CLANGDWARF_IA32_TARGET) -g +NOOPT_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_i386 --format=elf +NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = + +########################## +# CLANGDWARF X64 definitions +########################## +*_CLANGDWARF_X64_CC_PATH = DEF(CLANGDWARF_X64_PREFIX)clang +*_CLANGDWARF_X64_SLINK_PATH = DEF(CLANGDWARF_X64_PREFIX)llvm-ar +*_CLANGDWARF_X64_DLINK_PATH = DEF(CLANGDWARF_X64_PREFIX)ld.lld +*_CLANGDWARF_X64_ASLDLINK_PATH = DEF(CLANGDWARF_X64_PREFIX)clang +*_CLANGDWARF_X64_ASM_PATH = DEF(CLANGDWARF_X64_PREFIX)clang +*_CLANGDWARF_X64_PP_PATH = DEF(CLANGDWARF_X64_PREFIX)clang +*_CLANGDWARF_X64_VFRPP_PATH = DEF(CLANGDWARF_X64_PREFIX)clang +*_CLANGDWARF_X64_ASLCC_PATH = DEF(CLANGDWARF_X64_PREFIX)clang +*_CLANGDWARF_X64_ASLPP_PATH = DEF(CLANGDWARF_X64_PREFIX)clang +*_CLANGDWARF_X64_OBJCOPY_PATH = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy + +*_CLANGDWARF_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto DEF(CLANGDWARF_X64_TARGET) +*_CLANGDWARF_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64 DEF(CLANGDWARF_X64_TARGET) +*_CLANGDWARF_X64_OBJCOPY_FLAGS = +*_CLANGDWARF_X64_NASM_FLAGS = -f elf64 +*_CLANGDWARF_X64_PP_FLAGS = DEF(GCC_PP_FLAGS) DEF(CLANGDWARF_X64_TARGET) +*_CLANGDWARF_X64_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) DEF(CLANGDWARF_X64_TARGET) +*_CLANGDWARF_X64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) DEF(CLANGDWARF_X64_TARGET) + +DEBUG_CLANGDWARF_X64_CC_FLAGS = DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz -flto DEF(CLANGDWARF_X64_TARGET) -g +DEBUG_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_x86_64 --format=elf -pie +DEBUG_CLANGDWARF_X64_DLINK2_FLAGS = +DEBUG_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable + +RELEASE_CLANGDWARF_X64_CC_FLAGS = DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz -flto DEF(CLANGDWARF_X64_TARGET) +RELEASE_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_x86_64 --format=elf -pie +RELEASE_CLANGDWARF_X64_DLINK2_FLAGS = +RELEASE_CLANGDWARF_X64_GENFW_FLAGS = + +NOOPT_CLANGDWARF_X64_CC_FLAGS = DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 DEF(CLANGDWARF_X64_TARGET) -g +NOOPT_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_x86_64 --format=elf -pie +NOOPT_CLANGDWARF_X64_DLINK2_FLAGS = +NOOPT_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable + # # # XCODE5 support -- 2.31.1.windows.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain 2021-05-26 8:23 ` [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ni, Ray @ 2021-05-26 11:35 ` Steven Shi 2021-05-28 2:52 ` 回复: " gaoliming 0 siblings, 1 reply; 14+ messages in thread From: Steven Shi @ 2021-05-26 11:35 UTC (permalink / raw) To: devel@edk2.groups.io, Ni, Ray [-- Attachment #1.1: Type: text/plain, Size: 12600 bytes --] Some suggestions: 1. There are many blanks appending the line "+ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) " [cid:image001.png@01D75263.998291F0] 1. We need a toolchain dependency descirption in the BaseTools\Conf\tools_def.template. Below is the example for CLANGPDB. Please add one for the CLANGDWARF. # CLANGPDB -Linux, Windows, Mac- Requires: # Clang 9 or above from http://releases.llvm.org/ # Optional: # Required to compile nasm source: # nasm compiler from # NASM -- http://www.nasm.us/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler from # https://acpica.org/downloads 1. We could merge the CLANG38 and the CLANGDWARF toolchains together in the future. Thanks Steven Shi > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ni, Ray > Sent: Wednesday, May 26, 2021 4:23 PM > To: devel@edk2.groups.io > Subject: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Signed-off-by: Ray Ni <ray.ni@intel.com<mailto:ray.ni@intel.com>> > --- > BaseTools/Conf/build_rule.template | 10 ++- > BaseTools/Conf/tools_def.template | 98 > ++++++++++++++++++++++++++++++ > 2 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/BaseTools/Conf/build_rule.template > b/BaseTools/Conf/build_rule.template > index 1395792cd6..e69f963cc8 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -293,7 +293,10 @@ > <ExtraDependency> > > $(MAKE_FILE) > > > > - <OutputFile> > > + <OutputFile.CLANGDWARF> > > + $(DEBUG_DIR)(+)$(MODULE_NAME).elf > > + > > + <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC> > > $(DEBUG_DIR)(+)$(MODULE_NAME).dll > > > > <Command.MSFT, Command.INTEL> > > @@ -303,6 +306,11 @@ > <Command.CLANGPDB> > > "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) > @$(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) > > > > + <Command.CLANGDWARF> > > + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) > > + "$(CP)" ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).debug > > + "$(OBJCOPY)" --strip-unneeded -R .eh_frame ${dst} > > + > > <Command.GCC> > > "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start- > group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) > $(DLINK2_FLAGS) > > "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} > > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index 498696e583..390e297cc1 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -2828,6 +2828,104 @@ NOOPT_CLANGPDB_X64_DLINK_FLAGS = > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE > NOOPT_CLANGPDB_X64_DLINK2_FLAGS = > > NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable > > > > +######################################################### > ########################### > > +# > > +# CLANGDWARF - This configuration is used to compile under > Windows/Linux/Mac to produce > > +# ELF binaries using LLVM/Clang/LLD with Link Time Optimization enabled > > +# > > +######################################################### > ########################### > > +*_CLANGDWARF_*_*_FAMILY = GCC > > +*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGDWARF > > +*_CLANGDWARF_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make > > +*_CLANGDWARF_*_*_DLL = ENV(CLANGPDB_DLL) > > +*_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) > > + > > +*_CLANGDWARF_*_APP_FLAGS = > > +*_CLANGDWARF_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) > > +*_CLANGDWARF_*_ASL_OUTFLAGS = > DEF(DEFAULT_WIN_ASL_OUTFLAGS) > > +*_CLANGDWARF_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) > > +*_CLANGDWARF_*_DEPS_FLAGS = DEF(GCC_DEPS_FLAGS) > > + > > +DEFINE CLANGDWARF_IA32_PREFIX = ENV(CLANG_BIN) > > +DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN) > > + > > +DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu > > +DEFINE CLANGDWARF_X64_TARGET = -target x86_64-pc-linux-gnu > > + > > +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses- > equality -Wno-tautological-compare -Wno-tautological-constant-out-of- > range-compare -Wno-empty-body -Wno-unused-const-variable -Wno- > varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward- > reference > > +DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) > DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector - > funsigned-char -ftrap- > function=undefined_behavior_has_been_optimized_away_by_clang -Wno- > address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno- > incompatible-library-redeclaration -Wno-null-dereference -mno-implicit- > float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh- > exceptions > > + > > +########################### > > +# CLANGDWARF IA32 definitions > > +########################### > > +*_CLANGDWARF_IA32_CC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_SLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-ar > > +*_CLANGDWARF_IA32_DLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)ld.lld > > +*_CLANGDWARF_IA32_ASLDLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASM_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_PP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_VFRPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLCC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 > -fno-lto DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 - > march=i386 DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_OBJCOPY_FLAGS = > > +*_CLANGDWARF_IA32_NASM_FLAGS = -f elf32 > > +*_CLANGDWARF_IA32_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > + > > +DEBUG_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +DEBUG_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +DEBUG_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +RELEASE_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) > > +RELEASE_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +RELEASE_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +NOOPT_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -O0 -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +NOOPT_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_i386 -- > format=elf > > +NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +########################## > > +# CLANGDWARF X64 definitions > > +########################## > > +*_CLANGDWARF_X64_CC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_SLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)llvm-ar > > +*_CLANGDWARF_X64_DLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)ld.lld > > +*_CLANGDWARF_X64_ASLDLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASM_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_PP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_VFRPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLCC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 > -fno-lto DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64 > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_OBJCOPY_FLAGS = > > +*_CLANGDWARF_X64_NASM_FLAGS = -f elf64 > > +*_CLANGDWARF_X64_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > + > > +DEBUG_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) -g > > +DEBUG_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +DEBUG_CLANGDWARF_X64_DLINK2_FLAGS = > > +DEBUG_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > +RELEASE_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) > > +RELEASE_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +RELEASE_CLANGDWARF_X64_DLINK2_FLAGS = > > +RELEASE_CLANGDWARF_X64_GENFW_FLAGS = > > + > > +NOOPT_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 > DEF(CLANGDWARF_X64_TARGET) -g > > +NOOPT_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 - > melf_x86_64 --format=elf -pie > > +NOOPT_CLANGDWARF_X64_DLINK2_FLAGS = > > +NOOPT_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > # > > # > > # XCODE5 support > > -- > 2.31.1.windows.1 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#75599): https://edk2.groups.io/g/devel/message/75599 > Mute This Topic: https://groups.io/mt/83095853/1781003 > Group Owner: devel+owner@edk2.groups.io<mailto:devel+owner@edk2.groups.io> > Unsubscribe: https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > -=-=-=-=-=-= > [-- Attachment #1.2: Type: text/html, Size: 33864 bytes --] [-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain 2021-05-26 11:35 ` [edk2-devel] " Steven Shi @ 2021-05-28 2:52 ` gaoliming 2021-05-28 14:31 ` Ni, Ray 0 siblings, 1 reply; 14+ messages in thread From: gaoliming @ 2021-05-28 2:52 UTC (permalink / raw) To: devel, steven.shi, 'Ni, Ray' [-- Attachment #1.1: Type: text/plain, Size: 13556 bytes --] Ray: I would like to suggest CLANGDWARF also generate EFI image. If so, the people can use this tool chain for EFI development with DWARF format debug symbol. In dll generation phase, CLANGDWARF still generates dll image, then copy dll image to elf image. In EFI generation phase, dll image will be converted to EFI image. Thanks Liming 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Steven Shi 发送时间: 2021年5月26日 19:35 收件人: devel@edk2.groups.io; Ni, Ray <ray.ni@intel.com> 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Some suggestions: 1. There are many blanks appending the line “+ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) “ 2. We need a toolchain dependency descirption in the BaseTools\Conf\tools_def.template. Below is the example for CLANGPDB. Please add one for the CLANGDWARF. # CLANGPDB -Linux, Windows, Mac- Requires: # Clang 9 or above from http://releases.llvm.org/ # Optional: # Required to compile nasm source: # nasm compiler from # NASM -- http://www.nasm.us/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler from # https://acpica.org/downloads 3. We could merge the CLANG38 and the CLANGDWARF toolchains together in the future. Thanks Steven Shi > -----Original Message----- > From: devel@edk2.groups.io <mailto:devel@edk2.groups.io> <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > On Behalf Of Ni, Ray > Sent: Wednesday, May 26, 2021 4:23 PM > To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> > Subject: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Signed-off-by: Ray Ni < <mailto:ray.ni@intel.com> ray.ni@intel.com> > --- > BaseTools/Conf/build_rule.template | 10 ++- > BaseTools/Conf/tools_def.template | 98 > ++++++++++++++++++++++++++++++ > 2 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/BaseTools/Conf/build_rule.template > b/BaseTools/Conf/build_rule.template > index 1395792cd6..e69f963cc8 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -293,7 +293,10 @@ > <ExtraDependency> > > $(MAKE_FILE) > > > > - <OutputFile> > > + <OutputFile.CLANGDWARF> > > + $(DEBUG_DIR)(+)$(MODULE_NAME).elf > > + > > + <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC> > > $(DEBUG_DIR)(+)$(MODULE_NAME).dll > > > > <Command.MSFT, Command.INTEL> > > @@ -303,6 +306,11 @@ > <Command.CLANGPDB> > > "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) > @$(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) > > > > + <Command.CLANGDWARF> > > + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) > > + "$(CP)" ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).debug > > + "$(OBJCOPY)" --strip-unneeded -R .eh_frame ${dst} > > + > > <Command.GCC> > > "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start- > group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) > $(DLINK2_FLAGS) > > "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} > > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index 498696e583..390e297cc1 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -2828,6 +2828,104 @@ NOOPT_CLANGPDB_X64_DLINK_FLAGS = > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE > NOOPT_CLANGPDB_X64_DLINK2_FLAGS = > > NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable > > > > +######################################################### > ########################### > > +# > > +# CLANGDWARF - This configuration is used to compile under > Windows/Linux/Mac to produce > > +# ELF binaries using LLVM/Clang/LLD with Link Time Optimization enabled > > +# > > +######################################################### > ########################### > > +*_CLANGDWARF_*_*_FAMILY = GCC > > +*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGDWARF > > +*_CLANGDWARF_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make > > +*_CLANGDWARF_*_*_DLL = ENV(CLANGPDB_DLL) > > +*_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) > > + > > +*_CLANGDWARF_*_APP_FLAGS = > > +*_CLANGDWARF_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) > > +*_CLANGDWARF_*_ASL_OUTFLAGS = > DEF(DEFAULT_WIN_ASL_OUTFLAGS) > > +*_CLANGDWARF_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) > > +*_CLANGDWARF_*_DEPS_FLAGS = DEF(GCC_DEPS_FLAGS) > > + > > +DEFINE CLANGDWARF_IA32_PREFIX = ENV(CLANG_BIN) > > +DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN) > > + > > +DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu > > +DEFINE CLANGDWARF_X64_TARGET = -target x86_64-pc-linux-gnu > > + > > +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses- > equality -Wno-tautological-compare -Wno-tautological-constant-out-of- > range-compare -Wno-empty-body -Wno-unused-const-variable -Wno- > varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward- > reference > > +DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) > DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector - > funsigned-char -ftrap- > function=undefined_behavior_has_been_optimized_away_by_clang -Wno- > address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno- > incompatible-library-redeclaration -Wno-null-dereference -mno-implicit- > float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh- > exceptions > > + > > +########################### > > +# CLANGDWARF IA32 definitions > > +########################### > > +*_CLANGDWARF_IA32_CC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_SLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-ar > > +*_CLANGDWARF_IA32_DLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)ld.lld > > +*_CLANGDWARF_IA32_ASLDLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASM_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_PP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_VFRPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLCC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 > -fno-lto DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 - > march=i386 DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_OBJCOPY_FLAGS = > > +*_CLANGDWARF_IA32_NASM_FLAGS = -f elf32 > > +*_CLANGDWARF_IA32_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > + > > +DEBUG_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +DEBUG_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +DEBUG_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +RELEASE_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) > > +RELEASE_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +RELEASE_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +NOOPT_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -O0 -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +NOOPT_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_i386 -- > format=elf > > +NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +########################## > > +# CLANGDWARF X64 definitions > > +########################## > > +*_CLANGDWARF_X64_CC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_SLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)llvm-ar > > +*_CLANGDWARF_X64_DLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)ld.lld > > +*_CLANGDWARF_X64_ASLDLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASM_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_PP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_VFRPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLCC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 > -fno-lto DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64 > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_OBJCOPY_FLAGS = > > +*_CLANGDWARF_X64_NASM_FLAGS = -f elf64 > > +*_CLANGDWARF_X64_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > + > > +DEBUG_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) -g > > +DEBUG_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +DEBUG_CLANGDWARF_X64_DLINK2_FLAGS = > > +DEBUG_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > +RELEASE_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) > > +RELEASE_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +RELEASE_CLANGDWARF_X64_DLINK2_FLAGS = > > +RELEASE_CLANGDWARF_X64_GENFW_FLAGS = > > + > > +NOOPT_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 > DEF(CLANGDWARF_X64_TARGET) -g > > +NOOPT_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 - > melf_x86_64 --format=elf -pie > > +NOOPT_CLANGDWARF_X64_DLINK2_FLAGS = > > +NOOPT_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > # > > # > > # XCODE5 support > > -- > 2.31.1.windows.1 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#75599): <https://edk2.groups.io/g/devel/message/75599> https://edk2.groups.io/g/devel/message/75599 > Mute This Topic: <https://groups.io/mt/83095853/1781003> https://groups.io/mt/83095853/1781003 > Group Owner: <mailto:devel+owner@edk2.groups.io> devel+owner@edk2.groups. io > Unsubscribe: <https://edk2.groups.io/g/devel/unsub> https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > -=-=-=-=-=-= > [-- Attachment #1.2: Type: text/html, Size: 48829 bytes --] [-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain 2021-05-28 2:52 ` 回复: " gaoliming @ 2021-05-28 14:31 ` Ni, Ray 2021-05-31 3:23 ` 回复: " gaoliming 0 siblings, 1 reply; 14+ messages in thread From: Ni, Ray @ 2021-05-28 14:31 UTC (permalink / raw) To: devel@edk2.groups.io, gaoliming@byosoft.com.cn, Shi, Steven [-- Attachment #1.1: Type: text/plain, Size: 13846 bytes --] Liming, that is not the intention of this new toolchain. we want to have a toolchain that can generate elf. or can you suggest a new name for this toolchain? thanks, ray ________________________________ From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of gaoliming <gaoliming@byosoft.com.cn> Sent: Friday, May 28, 2021 10:52:06 AM To: devel@edk2.groups.io <devel@edk2.groups.io>; Shi, Steven <steven.shi@intel.com>; Ni, Ray <ray.ni@intel.com> Subject: 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ray: I would like to suggest CLANGDWARF also generate EFI image. If so, the people can use this tool chain for EFI development with DWARF format debug symbol. In dll generation phase, CLANGDWARF still generates dll image, then copy dll image to elf image. In EFI generation phase, dll image will be converted to EFI image. Thanks Liming 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Steven Shi 发送时间: 2021年5月26日 19:35 收件人: devel@edk2.groups.io; Ni, Ray <ray.ni@intel.com> 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Some suggestions: 1. There are many blanks appending the line “+ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) “ [cid:image001.png@01D753AE.32EE4550] 1. We need a toolchain dependency descirption in the BaseTools\Conf\tools_def.template. Below is the example for CLANGPDB. Please add one for the CLANGDWARF. # CLANGPDB -Linux, Windows, Mac- Requires: # Clang 9 or above from http://releases.llvm.org/ # Optional: # Required to compile nasm source: # nasm compiler from # NASM -- http://www.nasm.us/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler from # https://acpica.org/downloads 1. We could merge the CLANG38 and the CLANGDWARF toolchains together in the future. Thanks Steven Shi > -----Original Message----- > From: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> On Behalf Of Ni, Ray > Sent: Wednesday, May 26, 2021 4:23 PM > To: devel@edk2.groups.io<mailto:devel@edk2.groups.io> > Subject: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Signed-off-by: Ray Ni <ray.ni@intel.com<mailto:ray.ni@intel.com>> > --- > BaseTools/Conf/build_rule.template | 10 ++- > BaseTools/Conf/tools_def.template | 98 > ++++++++++++++++++++++++++++++ > 2 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/BaseTools/Conf/build_rule.template > b/BaseTools/Conf/build_rule.template > index 1395792cd6..e69f963cc8 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -293,7 +293,10 @@ > <ExtraDependency> > > $(MAKE_FILE) > > > > - <OutputFile> > > + <OutputFile.CLANGDWARF> > > + $(DEBUG_DIR)(+)$(MODULE_NAME).elf > > + > > + <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC> > > $(DEBUG_DIR)(+)$(MODULE_NAME).dll > > > > <Command.MSFT, Command.INTEL> > > @@ -303,6 +306,11 @@ > <Command.CLANGPDB> > > "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) > @$(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) > > > > + <Command.CLANGDWARF> > > + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) > > + "$(CP)" ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).debug > > + "$(OBJCOPY)" --strip-unneeded -R .eh_frame ${dst} > > + > > <Command.GCC> > > "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start- > group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) > $(DLINK2_FLAGS) > > "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} > > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index 498696e583..390e297cc1 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -2828,6 +2828,104 @@ NOOPT_CLANGPDB_X64_DLINK_FLAGS = > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE > NOOPT_CLANGPDB_X64_DLINK2_FLAGS = > > NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable > > > > +######################################################### > ########################### > > +# > > +# CLANGDWARF - This configuration is used to compile under > Windows/Linux/Mac to produce > > +# ELF binaries using LLVM/Clang/LLD with Link Time Optimization enabled > > +# > > +######################################################### > ########################### > > +*_CLANGDWARF_*_*_FAMILY = GCC > > +*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGDWARF > > +*_CLANGDWARF_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make > > +*_CLANGDWARF_*_*_DLL = ENV(CLANGPDB_DLL) > > +*_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) > > + > > +*_CLANGDWARF_*_APP_FLAGS = > > +*_CLANGDWARF_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) > > +*_CLANGDWARF_*_ASL_OUTFLAGS = > DEF(DEFAULT_WIN_ASL_OUTFLAGS) > > +*_CLANGDWARF_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) > > +*_CLANGDWARF_*_DEPS_FLAGS = DEF(GCC_DEPS_FLAGS) > > + > > +DEFINE CLANGDWARF_IA32_PREFIX = ENV(CLANG_BIN) > > +DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN) > > + > > +DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu > > +DEFINE CLANGDWARF_X64_TARGET = -target x86_64-pc-linux-gnu > > + > > +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses- > equality -Wno-tautological-compare -Wno-tautological-constant-out-of- > range-compare -Wno-empty-body -Wno-unused-const-variable -Wno- > varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward- > reference > > +DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) > DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector - > funsigned-char -ftrap- > function=undefined_behavior_has_been_optimized_away_by_clang -Wno- > address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno- > incompatible-library-redeclaration -Wno-null-dereference -mno-implicit- > float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh- > exceptions > > + > > +########################### > > +# CLANGDWARF IA32 definitions > > +########################### > > +*_CLANGDWARF_IA32_CC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_SLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-ar > > +*_CLANGDWARF_IA32_DLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)ld.lld > > +*_CLANGDWARF_IA32_ASLDLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASM_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_PP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_VFRPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLCC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 > -fno-lto DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 - > march=i386 DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_OBJCOPY_FLAGS = > > +*_CLANGDWARF_IA32_NASM_FLAGS = -f elf32 > > +*_CLANGDWARF_IA32_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > + > > +DEBUG_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +DEBUG_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +DEBUG_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +RELEASE_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) > > +RELEASE_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +RELEASE_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +NOOPT_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -O0 -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +NOOPT_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_i386 -- > format=elf > > +NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +########################## > > +# CLANGDWARF X64 definitions > > +########################## > > +*_CLANGDWARF_X64_CC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_SLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)llvm-ar > > +*_CLANGDWARF_X64_DLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)ld.lld > > +*_CLANGDWARF_X64_ASLDLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASM_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_PP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_VFRPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLCC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 > -fno-lto DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64 > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_OBJCOPY_FLAGS = > > +*_CLANGDWARF_X64_NASM_FLAGS = -f elf64 > > +*_CLANGDWARF_X64_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > + > > +DEBUG_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) -g > > +DEBUG_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +DEBUG_CLANGDWARF_X64_DLINK2_FLAGS = > > +DEBUG_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > +RELEASE_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) > > +RELEASE_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +RELEASE_CLANGDWARF_X64_DLINK2_FLAGS = > > +RELEASE_CLANGDWARF_X64_GENFW_FLAGS = > > + > > +NOOPT_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 > DEF(CLANGDWARF_X64_TARGET) -g > > +NOOPT_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 - > melf_x86_64 --format=elf -pie > > +NOOPT_CLANGDWARF_X64_DLINK2_FLAGS = > > +NOOPT_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > # > > # > > # XCODE5 support > > -- > 2.31.1.windows.1 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#75599): https://edk2.groups.io/g/devel/message/75599 > Mute This Topic: https://groups.io/mt/83095853/1781003 > Group Owner: devel+owner@edk2.groups.io<mailto:devel+owner@edk2.groups.io> > Unsubscribe: https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > -=-=-=-=-=-= > [-- Attachment #1.2: Type: text/html, Size: 45670 bytes --] [-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain 2021-05-28 14:31 ` Ni, Ray @ 2021-05-31 3:23 ` gaoliming 2021-06-01 15:11 ` Ni, Ray 0 siblings, 1 reply; 14+ messages in thread From: gaoliming @ 2021-05-31 3:23 UTC (permalink / raw) To: 'Ni, Ray', devel, 'Shi, Steven' [-- Attachment #1.1: Type: text/plain, Size: 15027 bytes --] Ray: If the tool chain generates ELF image, its ELF image can be converted to EFI image by Edk2 GenFw tool. Then, this tool chain can be used for EFI development. So, I propose to make CLANGDWARF tool chain generate ELF image and EFI image both. It can support the usage of ELF image generation. Thanks Liming 发件人: Ni, Ray <ray.ni@intel.com> 发送时间: 2021年5月28日 22:31 收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn; Shi, Steven <steven. shi@intel.com> 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Liming, that is not the intention of this new toolchain. we want to have a toolchain that can generate elf. or can you suggest a new name for this toolchain? thanks, ray _____ From: devel@edk2.groups.io <mailto:devel@edk2.groups.io> <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > on behalf of gaoliming <gaoliming@byosoft.com.cn <mailto:gaoliming@byosoft.com.cn> > Sent: Friday, May 28, 2021 10:52:06 AM To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> <devel@edk2.groups.io <mailto:devel@edk2.groups.io> >; Shi, Steven <steven.shi@intel.com <mailto:steven.shi@intel.com> >; Ni, Ray <ray.ni@intel.com <mailto:ray.ni@intel.com> > Subject: 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ray: I would like to suggest CLANGDWARF also generate EFI image. If so, the people can use this tool chain for EFI development with DWARF format debug symbol. In dll generation phase, CLANGDWARF still generates dll image, then copy dll image to elf image. In EFI generation phase, dll image will be converted to EFI image. Thanks Liming 发件人: devel@edk2.groups.io <mailto:devel@edk2.groups.io> <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > 代表 Steven Shi 发送时间: 2021年5月26日 19:35 收件人: devel@edk2.groups.io <mailto:devel@edk2.groups.io> ; Ni, Ray <ray.ni@intel.com <mailto:ray.ni@intel.com> > 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Some suggestions: 1. There are many blanks appending the line “+ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) “ 2. We need a toolchain dependency descirption in the BaseTools\Conf\tools_def.template. Below is the example for CLANGPDB. Please add one for the CLANGDWARF. # CLANGPDB -Linux, Windows, Mac- Requires: # Clang 9 or above from http://releases.llvm.org/ # Optional: # Required to compile nasm source: # nasm compiler from # NASM -- http://www.nasm.us/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler from # https://acpica.org/downloads 3. We could merge the CLANG38 and the CLANGDWARF toolchains together in the future. Thanks Steven Shi > -----Original Message----- > From: devel@edk2.groups.io <mailto:devel@edk2.groups.io> <devel@edk2.groups.io <mailto:devel@edk2.groups.io> > On Behalf Of Ni, Ray > Sent: Wednesday, May 26, 2021 4:23 PM > To: devel@edk2.groups.io <mailto:devel@edk2.groups.io> > Subject: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Signed-off-by: Ray Ni < <mailto:ray.ni@intel.com> ray.ni@intel.com> > --- > BaseTools/Conf/build_rule.template | 10 ++- > BaseTools/Conf/tools_def.template | 98 > ++++++++++++++++++++++++++++++ > 2 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/BaseTools/Conf/build_rule.template > b/BaseTools/Conf/build_rule.template > index 1395792cd6..e69f963cc8 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -293,7 +293,10 @@ > <ExtraDependency> > > $(MAKE_FILE) > > > > - <OutputFile> > > + <OutputFile.CLANGDWARF> > > + $(DEBUG_DIR)(+)$(MODULE_NAME).elf > > + > > + <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC> > > $(DEBUG_DIR)(+)$(MODULE_NAME).dll > > > > <Command.MSFT, Command.INTEL> > > @@ -303,6 +306,11 @@ > <Command.CLANGPDB> > > "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) > @$(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) > > > > + <Command.CLANGDWARF> > > + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) > > + "$(CP)" ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).debug > > + "$(OBJCOPY)" --strip-unneeded -R .eh_frame ${dst} > > + > > <Command.GCC> > > "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start- > group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) > $(DLINK2_FLAGS) > > "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} > > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index 498696e583..390e297cc1 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -2828,6 +2828,104 @@ NOOPT_CLANGPDB_X64_DLINK_FLAGS = > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE > NOOPT_CLANGPDB_X64_DLINK2_FLAGS = > > NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable > > > > +######################################################### > ########################### > > +# > > +# CLANGDWARF - This configuration is used to compile under > Windows/Linux/Mac to produce > > +# ELF binaries using LLVM/Clang/LLD with Link Time Optimization enabled > > +# > > +######################################################### > ########################### > > +*_CLANGDWARF_*_*_FAMILY = GCC > > +*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGDWARF > > +*_CLANGDWARF_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make > > +*_CLANGDWARF_*_*_DLL = ENV(CLANGPDB_DLL) > > +*_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) > > + > > +*_CLANGDWARF_*_APP_FLAGS = > > +*_CLANGDWARF_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) > > +*_CLANGDWARF_*_ASL_OUTFLAGS = > DEF(DEFAULT_WIN_ASL_OUTFLAGS) > > +*_CLANGDWARF_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) > > +*_CLANGDWARF_*_DEPS_FLAGS = DEF(GCC_DEPS_FLAGS) > > + > > +DEFINE CLANGDWARF_IA32_PREFIX = ENV(CLANG_BIN) > > +DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN) > > + > > +DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu > > +DEFINE CLANGDWARF_X64_TARGET = -target x86_64-pc-linux-gnu > > + > > +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses- > equality -Wno-tautological-compare -Wno-tautological-constant-out-of- > range-compare -Wno-empty-body -Wno-unused-const-variable -Wno- > varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward- > reference > > +DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) > DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector - > funsigned-char -ftrap- > function=undefined_behavior_has_been_optimized_away_by_clang -Wno- > address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno- > incompatible-library-redeclaration -Wno-null-dereference -mno-implicit- > float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh- > exceptions > > + > > +########################### > > +# CLANGDWARF IA32 definitions > > +########################### > > +*_CLANGDWARF_IA32_CC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_SLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-ar > > +*_CLANGDWARF_IA32_DLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)ld.lld > > +*_CLANGDWARF_IA32_ASLDLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASM_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_PP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_VFRPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLCC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 > -fno-lto DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 - > march=i386 DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_OBJCOPY_FLAGS = > > +*_CLANGDWARF_IA32_NASM_FLAGS = -f elf32 > > +*_CLANGDWARF_IA32_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > + > > +DEBUG_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +DEBUG_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +DEBUG_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +RELEASE_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) > > +RELEASE_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +RELEASE_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +NOOPT_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -O0 -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +NOOPT_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_i386 -- > format=elf > > +NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +########################## > > +# CLANGDWARF X64 definitions > > +########################## > > +*_CLANGDWARF_X64_CC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_SLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)llvm-ar > > +*_CLANGDWARF_X64_DLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)ld.lld > > +*_CLANGDWARF_X64_ASLDLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASM_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_PP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_VFRPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLCC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 > -fno-lto DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64 > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_OBJCOPY_FLAGS = > > +*_CLANGDWARF_X64_NASM_FLAGS = -f elf64 > > +*_CLANGDWARF_X64_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > + > > +DEBUG_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) -g > > +DEBUG_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +DEBUG_CLANGDWARF_X64_DLINK2_FLAGS = > > +DEBUG_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > +RELEASE_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) > > +RELEASE_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +RELEASE_CLANGDWARF_X64_DLINK2_FLAGS = > > +RELEASE_CLANGDWARF_X64_GENFW_FLAGS = > > + > > +NOOPT_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 > DEF(CLANGDWARF_X64_TARGET) -g > > +NOOPT_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 - > melf_x86_64 --format=elf -pie > > +NOOPT_CLANGDWARF_X64_DLINK2_FLAGS = > > +NOOPT_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > # > > # > > # XCODE5 support > > -- > 2.31.1.windows.1 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#75599): <https://edk2.groups.io/g/devel/message/75599> https://edk2.groups.io/g/devel/message/75599 > Mute This Topic: <https://groups.io/mt/83095853/1781003> https://groups.io/mt/83095853/1781003 > Group Owner: <mailto:devel+owner@edk2.groups.io> devel+owner@edk2.groups. io > Unsubscribe: <https://edk2.groups.io/g/devel/unsub> https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > -=-=-=-=-=-= > [-- Attachment #1.2: Type: text/html, Size: 52382 bytes --] [-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain 2021-05-31 3:23 ` 回复: " gaoliming @ 2021-06-01 15:11 ` Ni, Ray 2021-06-02 2:18 ` 回复: " gaoliming 0 siblings, 1 reply; 14+ messages in thread From: Ni, Ray @ 2021-06-01 15:11 UTC (permalink / raw) To: devel@edk2.groups.io, gaoliming@byosoft.com.cn, Shi, Steven Cc: Leif Lindholm, Ard Biesheuvel, 'Andrew Fish (afish@apple.com)', Justen, Jordan L Liming, I happen to notice the below patches which you sent out two years ago: https://edk2.groups.io/g/devel/topic/31354044#41053 It seems to me that I can drop my CLANGDWARF change completely and use your patches. Correct? Thanks, Ray From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming Sent: Monday, May 31, 2021 11:23 AM To: Ni, Ray <ray.ni@intel.com>; devel@edk2.groups.io; Shi, Steven <steven.shi@intel.com> Subject: 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ray: If the tool chain generates ELF image, its ELF image can be converted to EFI image by Edk2 GenFw tool. Then, this tool chain can be used for EFI development. So, I propose to make CLANGDWARF tool chain generate ELF image and EFI image both. It can support the usage of ELF image generation. Thanks Liming 发件人: Ni, Ray <mailto:ray.ni@intel.com> 发送时间: 2021年5月28日 22:31 收件人: mailto:devel@edk2.groups.io; mailto:gaoliming@byosoft.com.cn; Shi, Steven <mailto:steven.shi@intel.com> 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Liming, that is not the intention of this new toolchain. we want to have a toolchain that can generate elf. or can you suggest a new name for this toolchain? thanks, ray ________________________________________ From: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io> on behalf of gaoliming <mailto:gaoliming@byosoft.com.cn> Sent: Friday, May 28, 2021 10:52:06 AM To: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io>; Shi, Steven <mailto:steven.shi@intel.com>; Ni, Ray <mailto:ray.ni@intel.com> Subject: 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ray: I would like to suggest CLANGDWARF also generate EFI image. If so, the people can use this tool chain for EFI development with DWARF format debug symbol. In dll generation phase, CLANGDWARF still generates dll image, then copy dll image to elf image. In EFI generation phase, dll image will be converted to EFI image. Thanks Liming 发件人: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io> 代表 Steven Shi 发送时间: 2021年5月26日 19:35 收件人: mailto:devel@edk2.groups.io; Ni, Ray <mailto:ray.ni@intel.com> 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Some suggestions: 1. There are many blanks appending the line “+ "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) “ 2. We need a toolchain dependency descirption in the BaseTools\Conf\tools_def.template. Below is the example for CLANGPDB. Please add one for the CLANGDWARF. # CLANGPDB -Linux, Windows, Mac- Requires: # Clang 9 or above from http://releases.llvm.org/ # Optional: # Required to compile nasm source: # nasm compiler from # NASM -- http://www.nasm.us/ # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler from # https://acpica.org/downloads 3. We could merge the CLANG38 and the CLANGDWARF toolchains together in the future. Thanks Steven Shi > -----Original Message----- > From: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io> On Behalf Of Ni, Ray > Sent: Wednesday, May 26, 2021 4:23 PM > To: mailto:devel@edk2.groups.io > Subject: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Signed-off-by: Ray Ni <mailto:ray.ni@intel.com> > --- > BaseTools/Conf/build_rule.template | 10 ++- > BaseTools/Conf/tools_def.template | 98 > ++++++++++++++++++++++++++++++ > 2 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/BaseTools/Conf/build_rule.template > b/BaseTools/Conf/build_rule.template > index 1395792cd6..e69f963cc8 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -293,7 +293,10 @@ > <ExtraDependency> > > $(MAKE_FILE) > > > > - <OutputFile> > > + <OutputFile.CLANGDWARF> > > + $(DEBUG_DIR)(+)$(MODULE_NAME).elf > > + > > + <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC> > > $(DEBUG_DIR)(+)$(MODULE_NAME).dll > > > > <Command.MSFT, Command.INTEL> > > @@ -303,6 +306,11 @@ > <Command.CLANGPDB> > > "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) > @$(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) > > > > + <Command.CLANGDWARF> > > + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) > > + "$(CP)" ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).debug > > + "$(OBJCOPY)" --strip-unneeded -R .eh_frame ${dst} > > + > > <Command.GCC> > > "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start- > group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) > $(DLINK2_FLAGS) > > "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} > > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index 498696e583..390e297cc1 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -2828,6 +2828,104 @@ NOOPT_CLANGPDB_X64_DLINK_FLAGS = > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE > NOOPT_CLANGPDB_X64_DLINK2_FLAGS = > > NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable > > > > +######################################################### > ########################### > > +# > > +# CLANGDWARF - This configuration is used to compile under > Windows/Linux/Mac to produce > > +# ELF binaries using LLVM/Clang/LLD with Link Time Optimization enabled > > +# > > +######################################################### > ########################### > > +*_CLANGDWARF_*_*_FAMILY = GCC > > +*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGDWARF > > +*_CLANGDWARF_*_MAKE_PATH = ENV(CLANG_HOST_BIN)make > > +*_CLANGDWARF_*_*_DLL = ENV(CLANGPDB_DLL) > > +*_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) > > + > > +*_CLANGDWARF_*_APP_FLAGS = > > +*_CLANGDWARF_*_ASL_FLAGS = DEF(DEFAULT_WIN_ASL_FLAGS) > > +*_CLANGDWARF_*_ASL_OUTFLAGS = > DEF(DEFAULT_WIN_ASL_OUTFLAGS) > > +*_CLANGDWARF_*_ASLDLINK_FLAGS = DEF(MSFT_ASLDLINK_FLAGS) > > +*_CLANGDWARF_*_DEPS_FLAGS = DEF(GCC_DEPS_FLAGS) > > + > > +DEFINE CLANGDWARF_IA32_PREFIX = ENV(CLANG_BIN) > > +DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN) > > + > > +DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu > > +DEFINE CLANGDWARF_X64_TARGET = -target x86_64-pc-linux-gnu > > + > > +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses- > equality -Wno-tautological-compare -Wno-tautological-constant-out-of- > range-compare -Wno-empty-body -Wno-unused-const-variable -Wno- > varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward- > reference > > +DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) > DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector - > funsigned-char -ftrap- > function=undefined_behavior_has_been_optimized_away_by_clang -Wno- > address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno- > incompatible-library-redeclaration -Wno-null-dereference -mno-implicit- > float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh- > exceptions > > + > > +########################### > > +# CLANGDWARF IA32 definitions > > +########################### > > +*_CLANGDWARF_IA32_CC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_SLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-ar > > +*_CLANGDWARF_IA32_DLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)ld.lld > > +*_CLANGDWARF_IA32_ASLDLINK_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASM_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_PP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_VFRPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLCC_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_ASLPP_PATH = > DEF(CLANGDWARF_IA32_PREFIX)clang > > +*_CLANGDWARF_IA32_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 > -fno-lto DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 - > march=i386 DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_OBJCOPY_FLAGS = > > +*_CLANGDWARF_IA32_NASM_FLAGS = -f elf32 > > +*_CLANGDWARF_IA32_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > +*_CLANGDWARF_IA32_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_IA32_TARGET) > > + > > +DEBUG_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +DEBUG_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +DEBUG_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +RELEASE_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > DEF(CLANGDWARF_IA32_TARGET) > > +RELEASE_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 -- > format=elf > > +RELEASE_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +NOOPT_CLANGDWARF_IA32_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -O0 -march=i586 > DEF(CLANGDWARF_IA32_TARGET) -g > > +NOOPT_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_i386 -- > format=elf > > +NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = > > + > > +########################## > > +# CLANGDWARF X64 definitions > > +########################## > > +*_CLANGDWARF_X64_CC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_SLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)llvm-ar > > +*_CLANGDWARF_X64_DLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)ld.lld > > +*_CLANGDWARF_X64_ASLDLINK_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASM_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_PP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_VFRPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLCC_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_ASLPP_PATH = > DEF(CLANGDWARF_X64_PREFIX)clang > > +*_CLANGDWARF_X64_OBJCOPY_PATH = > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > + > > +*_CLANGDWARF_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 > -fno-lto DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64 > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_OBJCOPY_FLAGS = > > +*_CLANGDWARF_X64_NASM_FLAGS = -f elf64 > > +*_CLANGDWARF_X64_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > +*_CLANGDWARF_X64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) > DEF(CLANGDWARF_X64_TARGET) > > + > > +DEBUG_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) -g > > +DEBUG_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +DEBUG_CLANGDWARF_X64_DLINK2_FLAGS = > > +DEBUG_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > +RELEASE_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > -flto DEF(CLANGDWARF_X64_TARGET) > > +RELEASE_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > melf_x86_64 --format=elf -pie > > +RELEASE_CLANGDWARF_X64_DLINK2_FLAGS = > > +RELEASE_CLANGDWARF_X64_GENFW_FLAGS = > > + > > +NOOPT_CLANGDWARF_X64_CC_FLAGS = > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 > DEF(CLANGDWARF_X64_TARGET) -g > > +NOOPT_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q --gc- > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 - > melf_x86_64 --format=elf -pie > > +NOOPT_CLANGDWARF_X64_DLINK2_FLAGS = > > +NOOPT_CLANGDWARF_X64_GENFW_FLAGS = --keepexceptiontable > > + > > # > > # > > # XCODE5 support > > -- > 2.31.1.windows.1 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#75599): https://edk2.groups.io/g/devel/message/75599 > Mute This Topic: https://groups.io/mt/83095853/1781003 > Group Owner: mailto:devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > -=-=-=-=-=-= > ^ permalink raw reply [flat|nested] 14+ messages in thread
* 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain 2021-06-01 15:11 ` Ni, Ray @ 2021-06-02 2:18 ` gaoliming 0 siblings, 0 replies; 14+ messages in thread From: gaoliming @ 2021-06-02 2:18 UTC (permalink / raw) To: devel, ray.ni, 'Shi, Steven' Cc: 'Leif Lindholm', 'Ard Biesheuvel', 'Andrew Fish', 'Justen, Jordan L' Ray: Original CLANGELF tool chain is verified on CLANG8. Can you verify it to see whether it meet with your requirement? If yes, this tool chain can be renamed to CLANGDWARF to match current CLANGPDB tool chain. Thanks Liming > -----邮件原件----- > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Ni, Ray > 发送时间: 2021年6月1日 23:11 > 收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn; Shi, Steven > <steven.shi@intel.com> > 抄送: Leif Lindholm <leif@nuviainc.com>; Ard Biesheuvel > <ardb+tianocore@kernel.org>; 'Andrew Fish (afish@apple.com)' > <afish@apple.com>; Justen, Jordan L <jordan.l.justen@intel.com> > 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Liming, > I happen to notice the below patches which you sent out two years ago: > https://edk2.groups.io/g/devel/topic/31354044#41053 > > It seems to me that I can drop my CLANGDWARF change completely and use > your patches. > > Correct? > > Thanks, > Ray > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming > Sent: Monday, May 31, 2021 11:23 AM > To: Ni, Ray <ray.ni@intel.com>; devel@edk2.groups.io; Shi, Steven > <steven.shi@intel.com> > Subject: 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Ray: > If the tool chain generates ELF image, its ELF image can be converted to EFI > image by Edk2 GenFw tool. Then, this tool chain can be used for EFI > development. > > So, I propose to make CLANGDWARF tool chain generate ELF image and EFI > image both. It can support the usage of ELF image generation. > > Thanks > Liming > 发件人: Ni, Ray <mailto:ray.ni@intel.com> > 发送时间: 2021年5月28日 22:31 > 收件人: mailto:devel@edk2.groups.io; mailto:gaoliming@byosoft.com.cn; Shi, > Steven <mailto:steven.shi@intel.com> > 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Liming, > that is not the intention of this new toolchain. > we want to have a toolchain that can generate elf. or can you suggest a new > name for this toolchain? > > thanks, > ray > ________________________________________ > From: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io> on > behalf of gaoliming <mailto:gaoliming@byosoft.com.cn> > Sent: Friday, May 28, 2021 10:52:06 AM > To: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io>; Shi, Steven > <mailto:steven.shi@intel.com>; Ni, Ray <mailto:ray.ni@intel.com> > Subject: 回复: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Ray: > I would like to suggest CLANGDWARF also generate EFI image. If so, the > people can use this tool chain for EFI development with DWARF format debug > symbol. > > In dll generation phase, CLANGDWARF still generates dll image, then copy > dll image to elf image. In EFI generation phase, dll image will be converted to > EFI image. > > Thanks > Liming > 发件人: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io> 代表 > Steven Shi > 发送时间: 2021年5月26日 19:35 > 收件人: mailto:devel@edk2.groups.io; Ni, Ray <mailto:ray.ni@intel.com> > 主题: Re: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > toolchain > > Some suggestions: > > 1. There are many blanks appending the line “+ "$(DLINK)" -o > ${dst} $(DLINK_FLAGS) @$(STATIC_LIBRARY_FILES_LIST) “ > > > > 2. We need a toolchain dependency descirption in the > BaseTools\Conf\tools_def.template. Below is the example for CLANGPDB. > Please add one for the CLANGDWARF. > # CLANGPDB -Linux, Windows, Mac- Requires: > # Clang 9 or above from > http://releases.llvm.org/ > # Optional: > # Required to compile nasm > source: > # nasm compiler from > # NASM -- > http://www.nasm.us/ > # Required to build platforms or > ACPI tables: > # Intel(r) ACPI Compiler from > # https://acpica.org/download > s > > 3. We could merge the CLANG38 and the CLANGDWARF toolchains together > in the future. > > > Thanks > Steven Shi > > > > -----Original Message----- > > From: mailto:devel@edk2.groups.io <mailto:devel@edk2.groups.io> On > Behalf Of Ni, Ray > > Sent: Wednesday, May 26, 2021 4:23 PM > > To: mailto:devel@edk2.groups.io > > Subject: [edk2-devel] [PATCH 1/4] BaseTools: Create CLANGDWARF > > toolchain > > > > Signed-off-by: Ray Ni <mailto:ray.ni@intel.com> > > --- > > BaseTools/Conf/build_rule.template | 10 ++- > > BaseTools/Conf/tools_def.template | 98 > > ++++++++++++++++++++++++++++++ > > 2 files changed, 107 insertions(+), 1 deletion(-) > > > > diff --git a/BaseTools/Conf/build_rule.template > > b/BaseTools/Conf/build_rule.template > > index 1395792cd6..e69f963cc8 100755 > > --- a/BaseTools/Conf/build_rule.template > > +++ b/BaseTools/Conf/build_rule.template > > @@ -293,7 +293,10 @@ > > <ExtraDependency> > > > > $(MAKE_FILE) > > > > > > > > - <OutputFile> > > > > + <OutputFile.CLANGDWARF> > > > > + $(DEBUG_DIR)(+)$(MODULE_NAME).elf > > > > + > > > > + <OutputFile.MSFT, OutputFile.INTEL, OutputFile.GCC> > > > > $(DEBUG_DIR)(+)$(MODULE_NAME).dll > > > > > > > > <Command.MSFT, Command.INTEL> > > > > @@ -303,6 +306,11 @@ > > <Command.CLANGPDB> > > > > "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) > > @$(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS) > > > > > > > > + <Command.CLANGDWARF> > > > > + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) > @$(STATIC_LIBRARY_FILES_LIST) > > > > + "$(CP)" ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).debug > > > > + "$(OBJCOPY)" --strip-unneeded -R .eh_frame ${dst} > > > > + > > > > <Command.GCC> > > > > "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start- > > group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) > > $(DLINK2_FLAGS) > > > > "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} > > > > diff --git a/BaseTools/Conf/tools_def.template > > b/BaseTools/Conf/tools_def.template > > index 498696e583..390e297cc1 100755 > > --- a/BaseTools/Conf/tools_def.template > > +++ b/BaseTools/Conf/tools_def.template > > @@ -2828,6 +2828,104 @@ > NOOPT_CLANGPDB_X64_DLINK_FLAGS = > > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE > > NOOPT_CLANGPDB_X64_DLINK2_FLAGS = > > > > NOOPT_CLANGPDB_X64_GENFW_FLAGS = --keepexceptiontable > > > > > > > > +######################################################### > > ########################### > > > > +# > > > > +# CLANGDWARF - This configuration is used to compile under > > Windows/Linux/Mac to produce > > > > +# ELF binaries using LLVM/Clang/LLD with Link Time Optimization > enabled > > > > +# > > > > +######################################################### > > ########################### > > > > +*_CLANGDWARF_*_*_FAMILY = GCC > > > > +*_CLANGDWARF_*_*_BUILDRULEFAMILY = CLANGDWARF > > > > +*_CLANGDWARF_*_MAKE_PATH = > ENV(CLANG_HOST_BIN)make > > > > +*_CLANGDWARF_*_*_DLL = > ENV(CLANGPDB_DLL) > > > > +*_CLANGDWARF_*_ASL_PATH = DEF(UNIX_IASL_BIN) > > > > + > > > > +*_CLANGDWARF_*_APP_FLAGS = > > > > +*_CLANGDWARF_*_ASL_FLAGS = > DEF(DEFAULT_WIN_ASL_FLAGS) > > > > +*_CLANGDWARF_*_ASL_OUTFLAGS = > > DEF(DEFAULT_WIN_ASL_OUTFLAGS) > > > > +*_CLANGDWARF_*_ASLDLINK_FLAGS = > DEF(MSFT_ASLDLINK_FLAGS) > > > > +*_CLANGDWARF_*_DEPS_FLAGS = > DEF(GCC_DEPS_FLAGS) > > > > + > > > > +DEFINE CLANGDWARF_IA32_PREFIX = ENV(CLANG_BIN) > > > > +DEFINE CLANGDWARF_X64_PREFIX = ENV(CLANG_BIN) > > > > + > > > > +DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu > > > > +DEFINE CLANGDWARF_X64_TARGET = -target > x86_64-pc-linux-gnu > > > > + > > > > +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses- > > equality -Wno-tautological-compare -Wno-tautological-constant-out-of- > > range-compare -Wno-empty-body -Wno-unused-const-variable -Wno- > > varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward- > > reference > > > > +DEFINE CLANGDWARF_ALL_CC_FLAGS = > DEF(GCC48_ALL_CC_FLAGS) > > DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector - > > funsigned-char -ftrap- > > function=undefined_behavior_has_been_optimized_away_by_clang -Wno- > > address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno- > > incompatible-library-redeclaration -Wno-null-dereference -mno-implicit- > > float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh- > > exceptions > > > > + > > > > +########################### > > > > +# CLANGDWARF IA32 definitions > > > > +########################### > > > > +*_CLANGDWARF_IA32_CC_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)clang > > > > +*_CLANGDWARF_IA32_SLINK_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)llvm-ar > > > > +*_CLANGDWARF_IA32_DLINK_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)ld.lld > > > > +*_CLANGDWARF_IA32_ASLDLINK_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)clang > > > > +*_CLANGDWARF_IA32_ASM_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)clang > > > > +*_CLANGDWARF_IA32_PP_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)clang > > > > +*_CLANGDWARF_IA32_VFRPP_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)clang > > > > +*_CLANGDWARF_IA32_ASLCC_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)clang > > > > +*_CLANGDWARF_IA32_ASLPP_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)clang > > > > +*_CLANGDWARF_IA32_OBJCOPY_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > > > + > > > > +*_CLANGDWARF_IA32_ASLCC_FLAGS = > DEF(GCC_ASLCC_FLAGS) -m32 > > -fno-lto DEF(CLANGDWARF_IA32_TARGET) > > > > +*_CLANGDWARF_IA32_ASM_FLAGS = > DEF(GCC_ASM_FLAGS) -m32 - > > march=i386 DEF(CLANGDWARF_IA32_TARGET) > > > > +*_CLANGDWARF_IA32_OBJCOPY_FLAGS = > > > > +*_CLANGDWARF_IA32_NASM_FLAGS = -f elf32 > > > > +*_CLANGDWARF_IA32_PP_FLAGS = > DEF(GCC_PP_FLAGS) > > DEF(CLANGDWARF_IA32_TARGET) > > > > +*_CLANGDWARF_IA32_ASLPP_FLAGS = > DEF(GCC_ASLPP_FLAGS) > > DEF(CLANGDWARF_IA32_TARGET) > > > > +*_CLANGDWARF_IA32_VFRPP_FLAGS = > DEF(GCC_VFRPP_FLAGS) > > DEF(CLANGDWARF_IA32_TARGET) > > > > + > > > > +DEBUG_CLANGDWARF_IA32_CC_FLAGS = > > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > > DEF(CLANGDWARF_IA32_TARGET) -g > > > > +DEBUG_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q > --gc- > > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 > -- > > format=elf > > > > +DEBUG_CLANGDWARF_IA32_DLINK2_FLAGS = > > > > + > > > > +RELEASE_CLANGDWARF_IA32_CC_FLAGS = > > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 > > DEF(CLANGDWARF_IA32_TARGET) > > > > +RELEASE_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q > --gc- > > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 -melf_i386 > -- > > format=elf > > > > +RELEASE_CLANGDWARF_IA32_DLINK2_FLAGS = > > > > + > > > > +NOOPT_CLANGDWARF_IA32_CC_FLAGS = > > DEF(CLANGDWARF_ALL_CC_FLAGS) -m32 -O0 -march=i586 > > DEF(CLANGDWARF_IA32_TARGET) -g > > > > +NOOPT_CLANGDWARF_IA32_DLINK_FLAGS = --eh-frame-hdr -q > --gc- > > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 -melf_i386 > -- > > format=elf > > > > +NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = > > > > + > > > > +########################## > > > > +# CLANGDWARF X64 definitions > > > > +########################## > > > > +*_CLANGDWARF_X64_CC_PATH = > > DEF(CLANGDWARF_X64_PREFIX)clang > > > > +*_CLANGDWARF_X64_SLINK_PATH = > > DEF(CLANGDWARF_X64_PREFIX)llvm-ar > > > > +*_CLANGDWARF_X64_DLINK_PATH = > > DEF(CLANGDWARF_X64_PREFIX)ld.lld > > > > +*_CLANGDWARF_X64_ASLDLINK_PATH = > > DEF(CLANGDWARF_X64_PREFIX)clang > > > > +*_CLANGDWARF_X64_ASM_PATH = > > DEF(CLANGDWARF_X64_PREFIX)clang > > > > +*_CLANGDWARF_X64_PP_PATH = > > DEF(CLANGDWARF_X64_PREFIX)clang > > > > +*_CLANGDWARF_X64_VFRPP_PATH = > > DEF(CLANGDWARF_X64_PREFIX)clang > > > > +*_CLANGDWARF_X64_ASLCC_PATH = > > DEF(CLANGDWARF_X64_PREFIX)clang > > > > +*_CLANGDWARF_X64_ASLPP_PATH = > > DEF(CLANGDWARF_X64_PREFIX)clang > > > > +*_CLANGDWARF_X64_OBJCOPY_PATH = > > DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy > > > > + > > > > +*_CLANGDWARF_X64_ASLCC_FLAGS = > DEF(GCC_ASLCC_FLAGS) -m64 > > -fno-lto DEF(CLANGDWARF_X64_TARGET) > > > > +*_CLANGDWARF_X64_ASM_FLAGS = > DEF(GCC_ASM_FLAGS) -m64 > > DEF(CLANGDWARF_X64_TARGET) > > > > +*_CLANGDWARF_X64_OBJCOPY_FLAGS = > > > > +*_CLANGDWARF_X64_NASM_FLAGS = -f elf64 > > > > +*_CLANGDWARF_X64_PP_FLAGS = > DEF(GCC_PP_FLAGS) > > DEF(CLANGDWARF_X64_TARGET) > > > > +*_CLANGDWARF_X64_ASLPP_FLAGS = > DEF(GCC_ASLPP_FLAGS) > > DEF(CLANGDWARF_X64_TARGET) > > > > +*_CLANGDWARF_X64_VFRPP_FLAGS = > DEF(GCC_VFRPP_FLAGS) > > DEF(CLANGDWARF_X64_TARGET) > > > > + > > > > +DEBUG_CLANGDWARF_X64_CC_FLAGS = > > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > > -flto DEF(CLANGDWARF_X64_TARGET) -g > > > > +DEBUG_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q > --gc- > > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > > melf_x86_64 --format=elf -pie > > > > +DEBUG_CLANGDWARF_X64_DLINK2_FLAGS = > > > > +DEBUG_CLANGDWARF_X64_GENFW_FLAGS = > --keepexceptiontable > > > > + > > > > +RELEASE_CLANGDWARF_X64_CC_FLAGS = > > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz > > -flto DEF(CLANGDWARF_X64_TARGET) > > > > +RELEASE_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q > --gc- > > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O3 - > > melf_x86_64 --format=elf -pie > > > > +RELEASE_CLANGDWARF_X64_DLINK2_FLAGS = > > > > +RELEASE_CLANGDWARF_X64_GENFW_FLAGS = > > > > + > > > > +NOOPT_CLANGDWARF_X64_CC_FLAGS = > > DEF(CLANGDWARF_ALL_CC_FLAGS) -m64 "- > > DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 > > DEF(CLANGDWARF_X64_TARGET) -g > > > > +NOOPT_CLANGDWARF_X64_DLINK_FLAGS = --eh-frame-hdr -q > --gc- > > sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -Map > > $(DEST_DIR_DEBUG)/$(BASE_NAME).map --whole-archive -O0 - > > melf_x86_64 --format=elf -pie > > > > +NOOPT_CLANGDWARF_X64_DLINK2_FLAGS = > > > > +NOOPT_CLANGDWARF_X64_GENFW_FLAGS = > --keepexceptiontable > > > > + > > > > # > > > > # > > > > # XCODE5 support > > > > -- > > 2.31.1.windows.1 > > > > > > > > -=-=-=-=-=-= > > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#75599): > https://edk2.groups.io/g/devel/message/75599 > > Mute This Topic: https://groups.io/mt/83095853/1781003 > > Group Owner: mailto:devel+owner@edk2.groups.io > > Unsubscribe: https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > > -=-=-=-=-=-= > > > > > > > > ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/4] MdePkg/UniversalPayload: Add definition for extra info in payload 2021-05-26 8:23 [PATCH 0/4] Support payload in ELF format Ni, Ray 2021-05-26 8:23 ` [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ni, Ray @ 2021-05-26 8:23 ` Ni, Ray 2021-05-26 8:23 ` [PATCH 3/4] UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload Ni, Ray ` (2 subsequent siblings) 4 siblings, 0 replies; 14+ messages in thread From: Ni, Ray @ 2021-05-26 8:23 UTC (permalink / raw) To: devel; +Cc: Michael D Kinney, Liming Gao, Zhiguang Liu, Maurice Ma, Guo Dong The payload is in ELF format per the universal payload spec. PLD_INFO_HEADER is stored in the ELF payload as a separate section named ".upld_info". Extra data needed by payload is stored in sections whose name starts with ".upld.". Signed-off-by: Ray Ni <ray.ni@intel.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Zhiguang Liu <zhiguang.liu@intel.com> Cc: Maurice Ma <maurice.ma@intel.com> Cc: Guo Dong <guo.dong@intel.com> --- MdePkg/Include/UniversalPayload/ExtraData.h | 28 ++++++++++++++ .../UniversalPayload/UniversalPayload.h | 38 +++++++++++++++++++ MdePkg/MdePkg.dec | 3 ++ 3 files changed, 69 insertions(+) create mode 100644 MdePkg/Include/UniversalPayload/ExtraData.h create mode 100644 MdePkg/Include/UniversalPayload/UniversalPayload.h diff --git a/MdePkg/Include/UniversalPayload/ExtraData.h b/MdePkg/Include/UniversalPayload/ExtraData.h new file mode 100644 index 0000000000..07b7426683 --- /dev/null +++ b/MdePkg/Include/UniversalPayload/ExtraData.h @@ -0,0 +1,28 @@ +/** @file + + Copyright (c) 2021, Intel Corporation. All rights reserved.<BR> + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ +#ifndef __EXTRA_DATA_H__ +#define __EXTRA_DATA_H__ + +extern GUID gPldExtraDataGuid; + +#pragma pack(1) + +typedef struct { + CHAR8 Identifier[16]; + EFI_PHYSICAL_ADDRESS Base; + UINT64 Size; +} PLD_EXTRA_DATA_ENTRY; + +typedef struct { + PLD_GENERIC_HEADER PldHeader; + UINT32 Count; + PLD_EXTRA_DATA_ENTRY Entry[0]; +} PLD_EXTRA_DATA; + +#pragma pack() + +#endif diff --git a/MdePkg/Include/UniversalPayload/UniversalPayload.h b/MdePkg/Include/UniversalPayload/UniversalPayload.h new file mode 100644 index 0000000000..b8e9fe11a1 --- /dev/null +++ b/MdePkg/Include/UniversalPayload/UniversalPayload.h @@ -0,0 +1,38 @@ +/** @file + + Copyright (c) 2021, Intel Corporation. All rights reserved.<BR> + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ +#ifndef __UNIVERSAL_PAYLOAD_H__ +#define __UNIVERSAL_PAYLOAD_H__ + +typedef VOID (EFIAPI *UNIVERSAL_PAYLOAD_ENTRY) (VOID *HobList); + +#define PLD_IDENTIFIER SIGNATURE_32('U', 'P', 'L', 'D') +#define PLD_INFO_SEC_NAME ".upld_info" +#define PLD_EXTRA_SEC_NAME_PREFIX ".upld." +#define PLD_EXTRA_SEC_NAME_PREFIX_LENGTH (sizeof (PLD_EXTRA_SEC_NAME_PREFIX) - 1) + +#pragma pack(1) + +typedef struct { + UINT32 Identifier; + UINT32 HeaderLength; + UINT16 SpecRevision; + UINT8 Reserved[2]; + UINT32 Revision; + UINT32 Attribute; + UINT32 Capability; + CHAR8 ProducerId[16]; + CHAR8 ImageId[16]; +} PLD_INFO_HEADER; + +typedef struct { + UINT8 Revision; + UINT8 Reserved[3]; +} PLD_GENERIC_HEADER; + +#pragma pack() + +#endif diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index b49f88d8e1..638fe4c7e5 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -831,6 +831,9 @@ [Guids.IA32, Guids.X64] ## Include/Guid/Cper.h gEfiIa32X64ErrorTypeMsCheckGuid = { 0x48AB7F57, 0xDC34, 0x4f6c, { 0xA7, 0xD3, 0xB0, 0xB5, 0xB0, 0xA7, 0x43, 0x14 }} + ## Include/UniversalPayload/ExtraData.h + gPldExtraDataGuid = {0x15a5baf6, 0x1c91, 0x467d, {0x9d, 0xfb, 0x31, 0x9d, 0x17, 0x8d, 0x4b, 0xb4}} + [Ppis] ## Include/Ppi/MasterBootMode.h gEfiPeiMasterBootModePpiGuid = { 0x7408d748, 0xfc8c, 0x4ee6, {0x92, 0x88, 0xc4, 0xbe, 0xc0, 0x92, 0xa4, 0x10 } } -- 2.31.1.windows.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/4] UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload 2021-05-26 8:23 [PATCH 0/4] Support payload in ELF format Ni, Ray 2021-05-26 8:23 ` [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ni, Ray 2021-05-26 8:23 ` [PATCH 2/4] MdePkg/UniversalPayload: Add definition for extra info in payload Ni, Ray @ 2021-05-26 8:23 ` Ni, Ray 2021-06-02 4:35 ` Guo Dong 2021-05-26 8:23 ` [PATCH 4/4] PeiCore: Remove assertion when failing to load PE image Ni, Ray 2021-05-26 10:53 ` [edk2-devel] [PATCH 0/4] Support payload in ELF format Steven Shi 4 siblings, 1 reply; 14+ messages in thread From: Ni, Ray @ 2021-05-26 8:23 UTC (permalink / raw) To: devel; +Cc: Maurice Ma, Guo Dong, Benjamin You Per universal payload spec, the payload is in ELF format. The patch adds a payload loader that supports to load ELF image. The location of extra data sections whose names start with "upld." is stored in PLD_EXTRA_DATA HOB. Signed-off-by: Maurice Ma <maurice.ma@intel.com> Signed-off-by: Ray Ni <ray.ni@intel.com> Cc: Maurice Ma <maurice.ma@intel.com> Cc: Guo Dong <guo.dong@intel.com> Cc: Benjamin You <benjamin.you@intel.com> --- UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h | 122 +++ .../PayloadLoaderPeim/ElfLib/Elf32.h | 252 +++++ .../PayloadLoaderPeim/ElfLib/Elf32Lib.c | 398 +++++++ .../PayloadLoaderPeim/ElfLib/Elf64.h | 254 +++++ .../PayloadLoaderPeim/ElfLib/Elf64Lib.c | 407 ++++++++ .../PayloadLoaderPeim/ElfLib/ElfCommon.h | 983 ++++++++++++++++++ .../PayloadLoaderPeim/ElfLib/ElfLib.c | 499 +++++++++ .../PayloadLoaderPeim/ElfLib/ElfLibInternal.h | 88 ++ .../PayloadLoaderPeim/PayloadLoaderPeim.c | 187 ++++ .../PayloadLoaderPeim/PayloadLoaderPeim.inf | 59 ++ 10 files changed, 3249 insertions(+) create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h new file mode 100644 index 0000000000..17885aac78 --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h @@ -0,0 +1,122 @@ +/** @file + ELF library + + Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved.<BR> + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef __ELF_LIB_H__ +#define __ELF_LIB_H__ + +#include <PiPei.h> + +#define ELF_CLASS32 1 +#define ELF_CLASS64 2 + +#define ELF_PT_LOAD 1 + +typedef struct { + RETURN_STATUS ParseStatus; ///< Return the status after ParseElfImage(). + UINT8 *FileBase; ///< The source location in memory. + UINTN FileSize; ///< The size including sections that don't require loading. + UINT8 *PreferredImageAddress; ///< The preferred image to be loaded. No relocation is needed if loaded to this address. + BOOLEAN ReloadRequired; ///< The image needs a new memory location for running. + UINT8 *ImageAddress; ///< The destination memory address set by caller. + UINTN ImageSize; ///< The memory size for loading and execution. + UINT32 EiClass; + UINT32 ShNum; + UINT32 PhNum; + UINTN ShStrOff; + UINTN ShStrLen; + UINTN EntryPoint; ///< Return the actual entry point after LoadElfImage(). +} ELF_IMAGE_CONTEXT; + + +typedef struct { + UINT32 PtType; + UINTN Offset; + UINTN Length; + UINTN MemLen; + UINTN MemAddr; + UINTN Alignment; +} SEGMENT_INFO; + +/** + Parse the ELF image info. + + @param[in] ImageBase Memory address of an image. + @param[out] ElfCt The EFL image context pointer. + + @retval EFI_INVALID_PARAMETER Input parameters are not valid. + @retval EFI_UNSUPPORTED Unsupported binary type. + @retval EFI_LOAD_ERROR ELF binary loading error. + @retval EFI_SUCCESS ELF binary is loaded successfully. +**/ +EFI_STATUS +EFIAPI +ParseElfImage ( + IN VOID *ImageBase, + OUT ELF_IMAGE_CONTEXT *ElfCt + ); + +/** + Load the ELF segments to specified address in ELF header. + + This function loads ELF image segments into memory address specified + in ELF program header. + + @param[in] ElfCt ELF image context pointer. + + @retval EFI_INVALID_PARAMETER Input parameters are not valid. + @retval EFI_UNSUPPORTED Unsupported binary type. + @retval EFI_LOAD_ERROR ELF binary loading error. + @retval EFI_SUCCESS ELF binary is loaded successfully. +**/ +EFI_STATUS +EFIAPI +LoadElfImage ( + IN ELF_IMAGE_CONTEXT *ElfCt + ); + +/** + Get a ELF section name from its index. + + @param[in] ElfCt ELF image context pointer. + @param[in] SectionIndex ELF section index. + @param[out] SectionName The pointer to the section name. + + @retval EFI_INVALID_PARAMETER ElfCt or SecName is NULL. + @retval EFI_NOT_FOUND Could not find the section. + @retval EFI_SUCCESS Section name was filled successfully. +**/ +EFI_STATUS +EFIAPI +GetElfSectionName ( + IN ELF_IMAGE_CONTEXT *ElfCt, + IN UINT32 SectionIndex, + OUT CHAR8 **SectionName + ); + +/** + Get the offset and size of x-th ELF section. + + @param[in] ElfCt ELF image context pointer. + @param[in] Index ELF section index. + @param[out] Offset Return the offset of the specific section. + @param[out] Size Return the size of the specific section. + + @retval EFI_INVALID_PARAMETER ImageBase, Offset or Size is NULL. + @retval EFI_INVALID_PARAMETER EiClass doesn't equal to ELFCLASS32 or ELFCLASS64. + @retval EFI_NOT_FOUND Could not find the section. + @retval EFI_SUCCESS Offset and Size are returned. +**/ +EFI_STATUS +EFIAPI +GetElfSectionPos ( + IN ELF_IMAGE_CONTEXT *ElfCt, + IN UINT32 Index, + OUT UINTN *Offset, + OUT UINTN *Size + ); +#endif /* __ELF_LIB_H__ */ diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h new file mode 100644 index 0000000000..ebed5f00c3 --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h @@ -0,0 +1,252 @@ +/** @file +Ported ELF include files from FreeBSD + +Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> +SPDX-License-Identifier: BSD-2-Clause-Patent + + +**/ +/*- + * Copyright (c) 1996-1998 John D. Polstra. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sys/elf32.h,v 1.8.14.2 2007/12/03 21:30:36 marius Exp $ + */ + +#ifndef _SYS_ELF32_H_ +#define _SYS_ELF32_H_ 1 + + +/* + * ELF definitions common to all 32-bit architectures. + */ + +typedef UINT32 Elf32_Addr; +typedef UINT16 Elf32_Half; +typedef UINT32 Elf32_Off; +typedef INT32 Elf32_Sword; +typedef UINT32 Elf32_Word; +typedef UINT64 Elf32_Lword; + +typedef Elf32_Word Elf32_Hashelt; + +/* Non-standard class-dependent datatype used for abstraction. */ +typedef Elf32_Word Elf32_Size; +typedef Elf32_Sword Elf32_Ssize; + +/* + * ELF header. + */ + +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf32_Half e_type; /* File type. */ + Elf32_Half e_machine; /* Machine architecture. */ + Elf32_Word e_version; /* ELF format version. */ + Elf32_Addr e_entry; /* Entry point. */ + Elf32_Off e_phoff; /* Program header file offset. */ + Elf32_Off e_shoff; /* Section header file offset. */ + Elf32_Word e_flags; /* Architecture-specific flags. */ + Elf32_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf32_Half e_phentsize; /* Size of program header entry. */ + Elf32_Half e_phnum; /* Number of program header entries. */ + Elf32_Half e_shentsize; /* Size of section header entry. */ + Elf32_Half e_shnum; /* Number of section header entries. */ + Elf32_Half e_shstrndx; /* Section name strings section. */ +} Elf32_Ehdr; + +/* + * Section header. + */ + +typedef struct { + Elf32_Word sh_name; /* Section name (index into the + section header string table). */ + Elf32_Word sh_type; /* Section type. */ + Elf32_Word sh_flags; /* Section flags. */ + Elf32_Addr sh_addr; /* Address in memory image. */ + Elf32_Off sh_offset; /* Offset in file. */ + Elf32_Word sh_size; /* Size in bytes. */ + Elf32_Word sh_link; /* Index of a related section. */ + Elf32_Word sh_info; /* Depends on section type. */ + Elf32_Word sh_addralign; /* Alignment in bytes. */ + Elf32_Word sh_entsize; /* Size of each entry in section. */ +} Elf32_Shdr; + +/* + * Program header. + */ + +typedef struct { + Elf32_Word p_type; /* Entry type. */ + Elf32_Off p_offset; /* File offset of contents. */ + Elf32_Addr p_vaddr; /* Virtual address in memory image. */ + Elf32_Addr p_paddr; /* Physical address (not used). */ + Elf32_Word p_filesz; /* Size of contents in file. */ + Elf32_Word p_memsz; /* Size of contents in memory. */ + Elf32_Word p_flags; /* Access permission flags. */ + Elf32_Word p_align; /* Alignment in memory and file. */ +} Elf32_Phdr; + +/* + * Dynamic structure. The ".dynamic" section contains an array of them. + */ + +typedef struct { + Elf32_Sword d_tag; /* Entry type. */ + union { + Elf32_Word d_val; /* Integer value. */ + Elf32_Addr d_ptr; /* Address value. */ + } d_un; +} Elf32_Dyn; + +/* + * Relocation entries. + */ + +/* Relocations that don't need an addend field. */ +typedef struct { + Elf32_Addr r_offset; /* Location to be relocated. */ + Elf32_Word r_info; /* Relocation type and symbol index. */ +} Elf32_Rel; + +/* Relocations that need an addend field. */ +typedef struct { + Elf32_Addr r_offset; /* Location to be relocated. */ + Elf32_Word r_info; /* Relocation type and symbol index. */ + Elf32_Sword r_addend; /* Addend. */ +} Elf32_Rela; + +/* Macros for accessing the fields of r_info. */ +#define ELF32_R_SYM(info) ((info) >> 8) +#define ELF32_R_TYPE(info) ((unsigned char)(info)) + +/* Macro for constructing r_info from field values. */ +#define ELF32_R_INFO(sym, type) (((sym) << 8) + (unsigned char)(type)) + +/* + * Note entry header + */ +typedef Elf_Note Elf32_Nhdr; + +/* + * Move entry + */ +typedef struct { + Elf32_Lword m_value; /* symbol value */ + Elf32_Word m_info; /* size + index */ + Elf32_Word m_poffset; /* symbol offset */ + Elf32_Half m_repeat; /* repeat count */ + Elf32_Half m_stride; /* stride info */ +} Elf32_Move; + +/* + * The macros compose and decompose values for Move.r_info + * + * sym = ELF32_M_SYM(M.m_info) + * size = ELF32_M_SIZE(M.m_info) + * M.m_info = ELF32_M_INFO(sym, size) + */ +#define ELF32_M_SYM(info) ((info)>>8) +#define ELF32_M_SIZE(info) ((unsigned char)(info)) +#define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size)) + +/* + * Hardware/Software capabilities entry + */ +typedef struct { + Elf32_Word c_tag; /* how to interpret value */ + union { + Elf32_Word c_val; + Elf32_Addr c_ptr; + } c_un; +} Elf32_Cap; + +/* + * Symbol table entries. + */ + +typedef struct { + Elf32_Word st_name; /* String table index of name. */ + Elf32_Addr st_value; /* Symbol value. */ + Elf32_Word st_size; /* Size of associated object. */ + unsigned char st_info; /* Type and binding information. */ + unsigned char st_other; /* Reserved (not used). */ + Elf32_Half st_shndx; /* Section index of symbol. */ +} Elf32_Sym; + +/* Macros for accessing the fields of st_info. */ +#define ELF32_ST_BIND(info) ((info) >> 4) +#define ELF32_ST_TYPE(info) ((info) & 0xf) + +/* Macro for constructing st_info from field values. */ +#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) + +/* Macro for accessing the fields of st_other. */ +#define ELF32_ST_VISIBILITY(oth) ((oth) & 0x3) + +/* Structures used by Sun & GNU symbol versioning. */ +typedef struct +{ + Elf32_Half vd_version; + Elf32_Half vd_flags; + Elf32_Half vd_ndx; + Elf32_Half vd_cnt; + Elf32_Word vd_hash; + Elf32_Word vd_aux; + Elf32_Word vd_next; +} Elf32_Verdef; + +typedef struct +{ + Elf32_Word vda_name; + Elf32_Word vda_next; +} Elf32_Verdaux; + +typedef struct +{ + Elf32_Half vn_version; + Elf32_Half vn_cnt; + Elf32_Word vn_file; + Elf32_Word vn_aux; + Elf32_Word vn_next; +} Elf32_Verneed; + +typedef struct +{ + Elf32_Word vna_hash; + Elf32_Half vna_flags; + Elf32_Half vna_other; + Elf32_Word vna_name; + Elf32_Word vna_next; +} Elf32_Vernaux; + +typedef Elf32_Half Elf32_Versym; + +typedef struct { + Elf32_Half si_boundto; /* direct bindings - symbol bound to */ + Elf32_Half si_flags; /* per symbol flags */ +} Elf32_Syminfo; + +#endif /* !_SYS_ELF32_H_ */ diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c new file mode 100644 index 0000000000..4d8f155881 --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c @@ -0,0 +1,398 @@ +/** @file + ELF library + + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "ElfLibInternal.h" + +Elf32_Shdr * +GetElf32SectionByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ) +{ + Elf32_Ehdr *Ehdr; + + Ehdr = (Elf32_Ehdr *)ImageBase; + if (Index >= Ehdr->e_shnum) { + return NULL; + } + + return (Elf32_Shdr *)(ImageBase + Ehdr->e_shoff + Index * Ehdr->e_shentsize); +} + +Elf32_Phdr * +GetElf32SegmentByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ) +{ + Elf32_Ehdr *Ehdr; + + Ehdr = (Elf32_Ehdr *)ImageBase; + if (Index >= Ehdr->e_phnum) { + return NULL; + } + + return (Elf32_Phdr *)(ImageBase + Ehdr->e_phoff + Index * Ehdr->e_phentsize); +} + +Elf32_Shdr * +GetElf32SectionByRange ( + IN UINT8 *ImageBase, + IN UINT32 Offset, + IN UINT32 Size + ) +{ + UINT32 Index; + Elf32_Ehdr *Ehdr; + Elf32_Shdr *Shdr; + + Ehdr = (Elf32_Ehdr *)ImageBase; + + Shdr = (Elf32_Shdr *) (ImageBase + Ehdr->e_shoff); + for (Index = 0; Index < Ehdr->e_shnum; Index++) { + if ((Shdr->sh_offset == Offset) && (Shdr->sh_size == Size)) { + return Shdr; + } + Shdr = ELF_NEXT_ENTRY (Elf32_Shdr, Shdr, Ehdr->e_shentsize); + } + return NULL; +} + +EFI_STATUS +ProcessRelocation32 ( + IN Elf32_Rela *Rela, + IN UINT32 RelaSize, + IN UINT32 RelaEntrySize, + IN UINT32 RelaType, + IN INTN Delta, + IN BOOLEAN DynamicLinking + ) +{ + UINTN Index; + UINT32 *Ptr; + UINT32 Type; + + for ( Index = 0 + ; RelaEntrySize * Index < RelaSize + ; Index++, Rela = ELF_NEXT_ENTRY (Elf32_Rela, Rela, RelaEntrySize) + ) { + // + // r_offset is the virtual address of the storage unit affected by the relocation. + // + Ptr = (UINT32 *)(UINTN)(Rela->r_offset + Delta); + Type = ELF32_R_TYPE(Rela->r_info); + switch (Type) { + case R_386_NONE: + case R_386_PC32: + // + // No fixup entry required. + // + break; + + case R_386_32: + if (DynamicLinking) { + // + // Dynamic section doesn't contain entries of this type. + // + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); + ASSERT (FALSE); + } else { + *Ptr += (UINT32) Delta; + } + break; + + case R_386_RELATIVE: + if (DynamicLinking) { + // + // A: Represents the addend used to compute the value of the relocatable field. + // B: Represents the base address at which a shared object has been loaded into memory during execution. + // Generally, a shared object is built with a 0 base virtual address, but the execution address will be different. + // + // B (Base Address) in ELF spec is slightly different: + // An executable or shared object file's base address (on platforms that support the concept) is calculated during + // execution from three values: the virtual memory load address, the maximum page size, and the lowest virtual address + // of a program's loadable segment. To compute the base address, one determines the memory address associated with the + // lowest p_vaddr value for a PT_LOAD segment. This address is truncated to the nearest multiple of the maximum page size. + // The corresponding p_vaddr value itself is also truncated to the nearest multiple of the maximum page size. + // + // *** The base address is the difference between the truncated memory address and the truncated p_vaddr value. *** + // + // Delta in this function is B. + // + // Calculation: B + A + // + if (RelaType == SHT_RELA) { + ASSERT (*Ptr == 0); + *Ptr = (UINT32) Delta + Rela->r_addend; + } else { + // + // A is stored in the field of relocation for REL type. + // + *Ptr = (UINT32) Delta + *Ptr; + } + } else { + // + // non-Dynamic section doesn't contain entries of this type. + // + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); + ASSERT (FALSE); + } + break; + + default: + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); + } + } + return EFI_SUCCESS; +} + +EFI_STATUS +RelocateElf32Dynamic ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + UINT32 Index; + Elf32_Phdr *Phdr; + Elf32_Shdr *DynShdr; + Elf32_Shdr *RelShdr; + Elf32_Dyn *Dyn; + UINT32 RelaOffset; + UINT32 RelaCount; + UINT32 RelaSize; + UINT32 RelaEntrySize; + UINT32 RelaType; + + // + // 1. Locate the dynamic section. + // + // If an object file participates in dynamic linking, its program header table + // will have an element of type PT_DYNAMIC. + // This ``segment'' contains the .dynamic section. A special symbol, _DYNAMIC, + // labels the section, which contains an array of Elf32_Dyn or Elf64_Dyn. + // + DynShdr = NULL; + for (Index = 0; Index < ElfCt->PhNum; Index++) { + Phdr = GetElf32SegmentByIndex (ElfCt->FileBase, Index); + ASSERT (Phdr != NULL); + if (Phdr->p_type == PT_DYNAMIC) { + // + // Verify the existence of the dynamic section. + // + DynShdr = GetElf32SectionByRange (ElfCt->FileBase, Phdr->p_offset, Phdr->p_filesz); + break; + } + } + + // + // It's abnormal a DYN ELF doesn't contain a dynamic section. + // + ASSERT (DynShdr != NULL); + if (DynShdr == NULL) { + return EFI_UNSUPPORTED; + } + ASSERT (DynShdr->sh_type == SHT_DYNAMIC); + ASSERT (DynShdr->sh_entsize >= sizeof (*Dyn)); + + // + // 2. Locate the relocation section from the dynamic section. + // + RelaOffset = MAX_UINT32; + RelaSize = 0; + RelaCount = 0; + RelaEntrySize = 0; + RelaType = 0; + for ( Index = 0, Dyn = (Elf32_Dyn *) (ElfCt->FileBase + DynShdr->sh_offset) + ; Index < DynShdr->sh_size / DynShdr->sh_entsize + ; Index++, Dyn = ELF_NEXT_ENTRY (Elf32_Dyn, Dyn, DynShdr->sh_entsize) + ) { + switch (Dyn->d_tag) { + case DT_RELA: + case DT_REL: + // + // DT_REL represent program virtual addresses. + // A file's virtual addresses might not match the memory virtual addresses during execution. + // When interpreting addresses contained in the dynamic structure, the dynamic linker computes actual addresses, + // based on the original file value and the memory base address. + // For consistency, files do not contain relocation entries to ``correct'' addresses in the dynamic structure. + // + RelaOffset = Dyn->d_un.d_ptr - (UINT32) (UINTN) ElfCt->PreferredImageAddress; + RelaType = (Dyn->d_tag == DT_RELA) ? SHT_RELA: SHT_REL; + break; + case DT_RELACOUNT: + case DT_RELCOUNT: + RelaCount = Dyn->d_un.d_val; + break; + case DT_RELENT: + case DT_RELAENT: + RelaEntrySize = Dyn->d_un.d_val; + break; + case DT_RELSZ: + case DT_RELASZ: + RelaSize = Dyn->d_un.d_val; + break; + default: + break; + } + } + + if (RelaOffset == MAX_UINT64) { + ASSERT (RelaCount == 0); + ASSERT (RelaEntrySize == 0); + ASSERT (RelaSize == 0); + // + // It's fine that a DYN ELF doesn't contain relocation section. + // + return EFI_SUCCESS; + } + + // + // Verify the existence of the relocation section. + // + RelShdr = GetElf32SectionByRange (ElfCt->FileBase, RelaOffset, RelaSize); + ASSERT (RelShdr != NULL); + if (RelShdr == NULL) { + return EFI_UNSUPPORTED; + } + ASSERT (RelShdr->sh_type == RelaType); + ASSERT (RelShdr->sh_entsize == RelaEntrySize); + + // + // 3. Process the relocation section. + // + ProcessRelocation32 ( + (Elf32_Rela *) (ElfCt->FileBase + RelShdr->sh_offset), + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, + (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt->PreferredImageAddress, + TRUE + ); + return EFI_SUCCESS; +} + +EFI_STATUS +RelocateElf32Sections ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + EFI_STATUS Status; + Elf32_Ehdr *Ehdr; + Elf32_Shdr *RelShdr; + Elf32_Shdr *Shdr; + UINT32 Index; + UINTN Delta; + + Ehdr = (Elf32_Ehdr *)ElfCt->FileBase; + if (Ehdr->e_machine != EM_386) { + return EFI_UNSUPPORTED; + } + + Delta = (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt->PreferredImageAddress; + ElfCt->EntryPoint = (UINTN)(Ehdr->e_entry + Delta); + + // + // 1. Relocate dynamic ELF using the relocation section pointed by dynamic section + // + if (Ehdr->e_type == ET_DYN) { + DEBUG ((DEBUG_INFO, "DYN ELF: Relocate using dynamic sections...\n")); + Status = RelocateElf32Dynamic (ElfCt); + ASSERT_EFI_ERROR (Status); + return Status; + } + + // + // 2. Executable ELF: Fix up the delta between actual image address and preferred image address. + // + // Linker already fixed up EXEC ELF based on the preferred image address. + // A ELF loader in modern OS only loads it into the preferred image address. + // The below relocation is unneeded in that case. + // But the ELF loader in firmware supports to load the image to a different address. + // The below relocation is needed in this case. + // + DEBUG ((DEBUG_INFO, "EXEC ELF: Fix actual/preferred base address delta ...\n")); + for ( Index = 0, RelShdr = (Elf32_Shdr *) (ElfCt->FileBase + Ehdr->e_shoff) + ; Index < Ehdr->e_shnum + ; Index++, RelShdr = ELF_NEXT_ENTRY (Elf32_Shdr, RelShdr, Ehdr->e_shentsize) + ) { + if ((RelShdr->sh_type != SHT_REL) && (RelShdr->sh_type != SHT_RELA)) { + continue; + } + Shdr = GetElf32SectionByIndex (ElfCt->FileBase, RelShdr->sh_info); + if ((Shdr->sh_flags & SHF_ALLOC) == SHF_ALLOC) { + // + // Only fix up sections that occupy memory during process execution. + // + ProcessRelocation32 ( + (Elf32_Rela *)((UINT8*)Ehdr + RelShdr->sh_offset), + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, + Delta, FALSE + ); + } + } + + return EFI_SUCCESS; +} + +/** + Load ELF image which has 32-bit architecture. + + Caller should set Context.ImageAddress to a proper value, either pointing to + a new allocated memory whose size equal to Context.ImageSize, or pointing + to Context.PreferredImageAddress. + + @param[in] ElfCt ELF image context pointer. + + @retval EFI_SUCCESS ELF binary is loaded successfully. + @retval Others Loading ELF binary fails. + +**/ +EFI_STATUS +LoadElf32Image ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + Elf32_Ehdr *Ehdr; + Elf32_Phdr *Phdr; + UINT16 Index; + UINTN Delta; + + ASSERT (ElfCt != NULL); + + // + // Per the sprit of ELF, loading to memory only consumes info from program headers. + // + Ehdr = (Elf32_Ehdr *)ElfCt->FileBase; + + for ( Index = 0, Phdr = (Elf32_Phdr *)(ElfCt->FileBase + Ehdr->e_phoff) + ; Index < Ehdr->e_phnum + ; Index++, Phdr = ELF_NEXT_ENTRY (Elf32_Phdr, Phdr, Ehdr->e_phentsize) + ) { + // + // Skip segments that don't require load (type tells, or size is 0) + // + if ((Phdr->p_type != PT_LOAD) || + (Phdr->p_memsz == 0)) { + continue; + } + + // + // The memory offset of segment relative to the image base + // Note: CopyMem() does nothing when the dst equals to src. + // + Delta = Phdr->p_paddr - (UINT32) (UINTN) ElfCt->PreferredImageAddress; + CopyMem (ElfCt->ImageAddress + Delta, ElfCt->FileBase + Phdr->p_offset, Phdr->p_filesz); + ZeroMem (ElfCt->ImageAddress + Delta + Phdr->p_filesz, Phdr->p_memsz - Phdr->p_filesz); + } + + // + // Relocate when new new image base is not the preferred image base. + // + if (ElfCt->ImageAddress != ElfCt->PreferredImageAddress) { + RelocateElf32Sections (ElfCt); + } + + return EFI_SUCCESS; +} diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h new file mode 100644 index 0000000000..d64dc64a6a --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h @@ -0,0 +1,254 @@ +/** @file +Ported ELF include files from FreeBSD + +Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ +/*- + * Copyright (c) 1996-1998 John D. Polstra. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sys/elf64.h,v 1.10.14.2 2007/12/03 21:30:36 marius Exp $ + */ + +#ifndef _SYS_ELF64_H_ +#define _SYS_ELF64_H_ 1 + + +/* + * ELF definitions common to all 64-bit architectures. + */ + +typedef UINT64 Elf64_Addr; +typedef UINT16 Elf64_Half; +typedef UINT64 Elf64_Off; +typedef INT32 Elf64_Sword; +typedef INT64 Elf64_Sxword; +typedef UINT32 Elf64_Word; +typedef UINT64 Elf64_Lword; +typedef UINT64 Elf64_Xword; + +/* + * Types of dynamic symbol hash table bucket and chain elements. + * + * This is inconsistent among 64 bit architectures, so a machine dependent + * typedef is required. + */ + +typedef Elf64_Word Elf64_Hashelt; + +/* Non-standard class-dependent datatype used for abstraction. */ +typedef Elf64_Xword Elf64_Size; +typedef Elf64_Sxword Elf64_Ssize; + +/* + * ELF header. + */ + +typedef struct { + unsigned char e_ident[EI_NIDENT]; /* File identification. */ + Elf64_Half e_type; /* File type. */ + Elf64_Half e_machine; /* Machine architecture. */ + Elf64_Word e_version; /* ELF format version. */ + Elf64_Addr e_entry; /* Entry point. */ + Elf64_Off e_phoff; /* Program header file offset. */ + Elf64_Off e_shoff; /* Section header file offset. */ + Elf64_Word e_flags; /* Architecture-specific flags. */ + Elf64_Half e_ehsize; /* Size of ELF header in bytes. */ + Elf64_Half e_phentsize; /* Size of program header entry. */ + Elf64_Half e_phnum; /* Number of program header entries. */ + Elf64_Half e_shentsize; /* Size of section header entry. */ + Elf64_Half e_shnum; /* Number of section header entries. */ + Elf64_Half e_shstrndx; /* Section name strings section. */ +} Elf64_Ehdr; + +/* + * Section header. + */ + +typedef struct { + Elf64_Word sh_name; /* Section name (index into the + section header string table). */ + Elf64_Word sh_type; /* Section type. */ + Elf64_Xword sh_flags; /* Section flags. */ + Elf64_Addr sh_addr; /* Address in memory image. */ + Elf64_Off sh_offset; /* Offset in file. */ + Elf64_Xword sh_size; /* Size in bytes. */ + Elf64_Word sh_link; /* Index of a related section. */ + Elf64_Word sh_info; /* Depends on section type. */ + Elf64_Xword sh_addralign; /* Alignment in bytes. */ + Elf64_Xword sh_entsize; /* Size of each entry in section. */ +} Elf64_Shdr; + +/* + * Program header. + */ + +typedef struct { + Elf64_Word p_type; /* Entry type. */ + Elf64_Word p_flags; /* Access permission flags. */ + Elf64_Off p_offset; /* File offset of contents. */ + Elf64_Addr p_vaddr; /* Virtual address in memory image. */ + Elf64_Addr p_paddr; /* Physical address (not used). */ + Elf64_Xword p_filesz; /* Size of contents in file. */ + Elf64_Xword p_memsz; /* Size of contents in memory. */ + Elf64_Xword p_align; /* Alignment in memory and file. */ +} Elf64_Phdr; + +/* + * Dynamic structure. The ".dynamic" section contains an array of them. + */ + +typedef struct { + Elf64_Sxword d_tag; /* Entry type. */ + union { + Elf64_Xword d_val; /* Integer value. */ + Elf64_Addr d_ptr; /* Address value. */ + } d_un; +} Elf64_Dyn; + +/* + * Relocation entries. + */ + +/* Relocations that don't need an addend field. */ +typedef struct { + Elf64_Addr r_offset; /* Location to be relocated. */ + Elf64_Xword r_info; /* Relocation type and symbol index. */ +} Elf64_Rel; + +/* Relocations that need an addend field. */ +typedef struct { + Elf64_Addr r_offset; /* Location to be relocated. */ + Elf64_Xword r_info; /* Relocation type and symbol index. */ + Elf64_Sxword r_addend; /* Addend. */ +} Elf64_Rela; + +/* Macros for accessing the fields of r_info. */ +#define ELF64_R_SYM(info) ((UINT32) RShiftU64 ((info), 32)) +#define ELF64_R_TYPE(info) ((info) & 0xffffffffL) + +/* Macro for constructing r_info from field values. */ +#define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL)) + +#define ELF64_R_TYPE_DATA(info) (((Elf64_Xword)(info)<<32)>>40) +#define ELF64_R_TYPE_ID(info) (((Elf64_Xword)(info)<<56)>>56) +#define ELF64_R_TYPE_INFO(data, type) \ + (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type)) + +/* + * Note entry header + */ +typedef Elf_Note Elf64_Nhdr; + +/* + * Move entry + */ +typedef struct { + Elf64_Lword m_value; /* symbol value */ + Elf64_Xword m_info; /* size + index */ + Elf64_Xword m_poffset; /* symbol offset */ + Elf64_Half m_repeat; /* repeat count */ + Elf64_Half m_stride; /* stride info */ +} Elf64_Move; + +#define ELF64_M_SYM(info) ((info)>>8) +#define ELF64_M_SIZE(info) ((unsigned char)(info)) +#define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size)) + +/* + * Hardware/Software capabilities entry + */ +typedef struct { + Elf64_Xword c_tag; /* how to interpret value */ + union { + Elf64_Xword c_val; + Elf64_Addr c_ptr; + } c_un; +} Elf64_Cap; + +/* + * Symbol table entries. + */ + +typedef struct { + Elf64_Word st_name; /* String table index of name. */ + unsigned char st_info; /* Type and binding information. */ + unsigned char st_other; /* Reserved (not used). */ + Elf64_Half st_shndx; /* Section index of symbol. */ + Elf64_Addr st_value; /* Symbol value. */ + Elf64_Xword st_size; /* Size of associated object. */ +} Elf64_Sym; + +/* Macros for accessing the fields of st_info. */ +#define ELF64_ST_BIND(info) ((info) >> 4) +#define ELF64_ST_TYPE(info) ((info) & 0xf) + +/* Macro for constructing st_info from field values. */ +#define ELF64_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) + +/* Macro for accessing the fields of st_other. */ +#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3) + +/* Structures used by Sun & GNU-style symbol versioning. */ +typedef struct { + Elf64_Half vd_version; + Elf64_Half vd_flags; + Elf64_Half vd_ndx; + Elf64_Half vd_cnt; + Elf64_Word vd_hash; + Elf64_Word vd_aux; + Elf64_Word vd_next; +} Elf64_Verdef; + +typedef struct { + Elf64_Word vda_name; + Elf64_Word vda_next; +} Elf64_Verdaux; + +typedef struct { + Elf64_Half vn_version; + Elf64_Half vn_cnt; + Elf64_Word vn_file; + Elf64_Word vn_aux; + Elf64_Word vn_next; +} Elf64_Verneed; + +typedef struct { + Elf64_Word vna_hash; + Elf64_Half vna_flags; + Elf64_Half vna_other; + Elf64_Word vna_name; + Elf64_Word vna_next; +} Elf64_Vernaux; + +typedef Elf64_Half Elf64_Versym; + +typedef struct { + Elf64_Half si_boundto; /* direct bindings - symbol bound to */ + Elf64_Half si_flags; /* per symbol flags */ +} Elf64_Syminfo; + +#endif /* !_SYS_ELF64_H_ */ diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c new file mode 100644 index 0000000000..c3fb252c7e --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c @@ -0,0 +1,407 @@ +/** @file + ELF library + + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "ElfLibInternal.h" + +Elf64_Shdr * +GetElf64SectionByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ) +{ + Elf64_Ehdr *Ehdr; + + Ehdr = (Elf64_Ehdr *)ImageBase; + if (Index >= Ehdr->e_shnum) { + return NULL; + } + + return (Elf64_Shdr *)(ImageBase + Ehdr->e_shoff + Index * Ehdr->e_shentsize); +} + +Elf64_Phdr * +GetElf64SegmentByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ) +{ + Elf64_Ehdr *Ehdr; + + Ehdr = (Elf64_Ehdr *)ImageBase; + if (Index >= Ehdr->e_phnum) { + return NULL; + } + + return (Elf64_Phdr *)(ImageBase + Ehdr->e_phoff + Index * Ehdr->e_phentsize); +} + +Elf64_Shdr * +GetElf64SectionByRange ( + IN UINT8 *ImageBase, + IN UINT64 Offset, + IN UINT64 Size + ) +{ + UINT32 Index; + Elf64_Ehdr *Ehdr; + Elf64_Shdr *Shdr; + + Ehdr = (Elf64_Ehdr *)ImageBase; + + Shdr = (Elf64_Shdr *) (ImageBase + Ehdr->e_shoff); + for (Index = 0; Index < Ehdr->e_shnum; Index++) { + if ((Shdr->sh_offset == Offset) && (Shdr->sh_size == Size)) { + return Shdr; + } + Shdr = ELF_NEXT_ENTRY (Elf64_Shdr, Shdr, Ehdr->e_shentsize); + } + return NULL; +} + +EFI_STATUS +ProcessRelocation64 ( + IN Elf64_Rela *Rela, + IN UINT64 RelaSize, + IN UINT64 RelaEntrySize, + IN UINT64 RelaType, + IN INTN Delta, + IN BOOLEAN DynamicLinking + ) +{ + UINTN Index; + UINT64 *Ptr; + UINT32 Type; + + for ( Index = 0 + ; MultU64x64 (RelaEntrySize, Index) < RelaSize + ; Index++, Rela = ELF_NEXT_ENTRY (Elf64_Rela, Rela, RelaEntrySize) + ) { + // + // r_offset is the virtual address of the storage unit affected by the relocation. + // + Ptr = (UINT64 *)(UINTN)(Rela->r_offset + Delta); + Type = ELF64_R_TYPE(Rela->r_info); + switch (Type) { + case R_X86_64_NONE: + case R_X86_64_PC32: + case R_X86_64_PLT32: + case R_X86_64_GOTPCREL: + case R_X86_64_GOTPCRELX: + case R_X86_64_REX_GOTPCRELX: + break; + + case R_X86_64_64: + if (DynamicLinking) { + // + // Dynamic section doesn't contain entries of this type. + // + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); + ASSERT (FALSE); + } else { + *Ptr += Delta; + } + break; + + case R_X86_64_32: + // + // Dynamic section doesn't contain entries of this type. + // + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); + ASSERT (FALSE); + break; + + case R_X86_64_RELATIVE: + if (DynamicLinking) { + // + // A: Represents the addend used to compute the value of the relocatable field. + // B: Represents the base address at which a shared object has been loaded into memory during execution. + // Generally, a shared object is built with a 0 base virtual address, but the execution address will be different. + // + // B (Base Address) in ELF spec is slightly different: + // An executable or shared object file's base address (on platforms that support the concept) is calculated during + // execution from three values: the virtual memory load address, the maximum page size, and the lowest virtual address + // of a program's loadable segment. To compute the base address, one determines the memory address associated with the + // lowest p_vaddr value for a PT_LOAD segment. This address is truncated to the nearest multiple of the maximum page size. + // The corresponding p_vaddr value itself is also truncated to the nearest multiple of the maximum page size. + // + // *** The base address is the difference between the truncated memory address and the truncated p_vaddr value. *** + // + // Delta in this function is B. + // + // Calculation: B + A + // + if (RelaType == SHT_RELA) { + ASSERT (*Ptr == 0); + *Ptr = Delta + Rela->r_addend; + } else { + // + // A is stored in the field of relocation for REL type. + // + *Ptr = Delta + *Ptr; + } + } else { + // + // non-Dynamic section doesn't contain entries of this type. + // + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); + ASSERT (FALSE); + } + break; + + default: + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); + } + } + return EFI_SUCCESS; +} + +EFI_STATUS +RelocateElf64Dynamic ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + UINT32 Index; + Elf64_Phdr *Phdr; + Elf64_Shdr *DynShdr; + Elf64_Shdr *RelShdr; + Elf64_Dyn *Dyn; + UINT64 RelaOffset; + UINT64 RelaCount; + UINT64 RelaSize; + UINT64 RelaEntrySize; + UINT64 RelaType; + + // + // 1. Locate the dynamic section. + // + // If an object file participates in dynamic linking, its program header table + // will have an element of type PT_DYNAMIC. + // This ``segment'' contains the .dynamic section. A special symbol, _DYNAMIC, + // labels the section, which contains an array of Elf32_Dyn or Elf64_Dyn. + // + DynShdr = NULL; + for (Index = 0; Index < ElfCt->PhNum; Index++) { + Phdr = GetElf64SegmentByIndex (ElfCt->FileBase, Index); + ASSERT (Phdr != NULL); + if (Phdr->p_type == PT_DYNAMIC) { + // + // Verify the existence of the dynamic section. + // + DynShdr = GetElf64SectionByRange (ElfCt->FileBase, Phdr->p_offset, Phdr->p_filesz); + break; + } + } + + // + // It's abnormal a DYN ELF doesn't contain a dynamic section. + // + ASSERT (DynShdr != NULL); + if (DynShdr == NULL) { + return EFI_UNSUPPORTED; + } + ASSERT (DynShdr->sh_type == SHT_DYNAMIC); + ASSERT (DynShdr->sh_entsize >= sizeof (*Dyn)); + + // + // 2. Locate the relocation section from the dynamic section. + // + RelaOffset = MAX_UINT64; + RelaSize = 0; + RelaCount = 0; + RelaEntrySize = 0; + RelaType = 0; + for ( Index = 0, Dyn = (Elf64_Dyn *) (ElfCt->FileBase + DynShdr->sh_offset) + ; Index < DivU64x64Remainder (DynShdr->sh_size, DynShdr->sh_entsize, NULL) + ; Index++, Dyn = ELF_NEXT_ENTRY (Elf64_Dyn, Dyn, DynShdr->sh_entsize) + ) { + switch (Dyn->d_tag) { + case DT_RELA: + case DT_REL: + // + // DT_REL represent program virtual addresses. + // A file's virtual addresses might not match the memory virtual addresses during execution. + // When interpreting addresses contained in the dynamic structure, the dynamic linker computes actual addresses, + // based on the original file value and the memory base address. + // For consistency, files do not contain relocation entries to ``correct'' addresses in the dynamic structure. + // + RelaOffset = Dyn->d_un.d_ptr - (UINTN) ElfCt->PreferredImageAddress; + RelaType = (Dyn->d_tag == DT_RELA) ? SHT_RELA: SHT_REL; + break; + case DT_RELACOUNT: + case DT_RELCOUNT: + RelaCount = Dyn->d_un.d_val; + break; + case DT_RELENT: + case DT_RELAENT: + RelaEntrySize = Dyn->d_un.d_val; + break; + case DT_RELSZ: + case DT_RELASZ: + RelaSize = Dyn->d_un.d_val; + break; + default: + break; + } + } + + if (RelaOffset == MAX_UINT64) { + ASSERT (RelaCount == 0); + ASSERT (RelaEntrySize == 0); + ASSERT (RelaSize == 0); + // + // It's fine that a DYN ELF doesn't contain relocation section. + // + return EFI_SUCCESS; + } + + // + // Verify the existence of the relocation section. + // + RelShdr = GetElf64SectionByRange (ElfCt->FileBase, RelaOffset, RelaSize); + ASSERT (RelShdr != NULL); + if (RelShdr == NULL) { + return EFI_UNSUPPORTED; + } + ASSERT (RelShdr->sh_type == RelaType); + ASSERT (RelShdr->sh_entsize == RelaEntrySize); + + // + // 3. Process the relocation section. + // + ProcessRelocation64 ( + (Elf64_Rela *) (ElfCt->FileBase + RelShdr->sh_offset), + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, + (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt->PreferredImageAddress, + TRUE + ); + return EFI_SUCCESS; +} + +EFI_STATUS +RelocateElf64Sections ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + EFI_STATUS Status; + Elf64_Ehdr *Ehdr; + Elf64_Shdr *RelShdr; + Elf64_Shdr *Shdr; + UINT32 Index; + UINTN Delta; + + Ehdr = (Elf64_Ehdr *)ElfCt->FileBase; + if (Ehdr->e_machine != EM_X86_64) { + return EFI_UNSUPPORTED; + } + + Delta = (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt->PreferredImageAddress; + ElfCt->EntryPoint = (UINTN)(Ehdr->e_entry + Delta); + + // + // 1. Relocate dynamic ELF using the relocation section pointed by dynamic section + // + if (Ehdr->e_type == ET_DYN) { + DEBUG ((DEBUG_INFO, "DYN ELF: Relocate using dynamic sections...\n")); + Status = RelocateElf64Dynamic (ElfCt); + ASSERT_EFI_ERROR (Status); + return Status; + } + + // + // 2. Executable ELF: Fix up the delta between actual image address and preferred image address. + // + // Linker already fixed up EXEC ELF based on the preferred image address. + // A ELF loader in modern OS only loads it into the preferred image address. + // The below relocation is unneeded in that case. + // But the ELF loader in firmware supports to load the image to a different address. + // The below relocation is needed in this case. + // + DEBUG ((DEBUG_INFO, "EXEC ELF: Fix actual/preferred base address delta ...\n")); + for ( Index = 0, RelShdr = (Elf64_Shdr *) (ElfCt->FileBase + Ehdr->e_shoff) + ; Index < Ehdr->e_shnum + ; Index++, RelShdr = ELF_NEXT_ENTRY (Elf64_Shdr, RelShdr, Ehdr->e_shentsize) + ) { + if ((RelShdr->sh_type != SHT_REL) && (RelShdr->sh_type != SHT_RELA)) { + continue; + } + Shdr = GetElf64SectionByIndex (ElfCt->FileBase, RelShdr->sh_info); + if ((Shdr->sh_flags & SHF_ALLOC) == SHF_ALLOC) { + // + // Only fix up sections that occupy memory during process execution. + // + ProcessRelocation64 ( + (Elf64_Rela *)((UINT8*)Ehdr + RelShdr->sh_offset), + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, + Delta, FALSE + ); + } + } + + return EFI_SUCCESS; +} + +/** + Load ELF image which has 64-bit architecture. + + Caller should set Context.ImageAddress to a proper value, either pointing to + a new allocated memory whose size equal to Context.ImageSize, or pointing + to Context.PreferredImageAddress. + + @param[in] ElfCt ELF image context pointer. + + @retval EFI_SUCCESS ELF binary is loaded successfully. + @retval Others Loading ELF binary fails. + +**/ +EFI_STATUS +LoadElf64Image ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + Elf64_Ehdr *Ehdr; + Elf64_Phdr *Phdr; + UINT16 Index; + UINTN Delta; + + ASSERT (ElfCt != NULL); + + // + // Per the sprit of ELF, loading to memory only consumes info from program headers. + // + Ehdr = (Elf64_Ehdr *)ElfCt->FileBase; + + for ( Index = 0, Phdr = (Elf64_Phdr *)(ElfCt->FileBase + Ehdr->e_phoff) + ; Index < Ehdr->e_phnum + ; Index++, Phdr = ELF_NEXT_ENTRY (Elf64_Phdr, Phdr, Ehdr->e_phentsize) + ) { + // + // Skip segments that don't require load (type tells, or size is 0) + // + if ((Phdr->p_type != PT_LOAD) || + (Phdr->p_memsz == 0)) { + continue; + } + + // + // The memory offset of segment relative to the image base + // Note: CopyMem() does nothing when the dst equals to src. + // + Delta = (UINTN) Phdr->p_paddr - (UINTN) ElfCt->PreferredImageAddress; + CopyMem (ElfCt->ImageAddress + Delta, ElfCt->FileBase + (UINTN) Phdr->p_offset, (UINTN) Phdr->p_filesz); + ZeroMem (ElfCt->ImageAddress + Delta + (UINTN) Phdr->p_filesz, (UINTN) (Phdr->p_memsz - Phdr->p_filesz)); + } + + // + // Relocate when new new image base is not the preferred image base. + // + if (ElfCt->ImageAddress != ElfCt->PreferredImageAddress) { + RelocateElf64Sections (ElfCt); + } + + return EFI_SUCCESS; +} diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h new file mode 100644 index 0000000000..15c9e33d3f --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h @@ -0,0 +1,983 @@ +/** @file +Ported ELF include files from FreeBSD + +Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> +Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR> +SPDX-License-Identifier: BSD-2-Clause-Patent + + +**/ +/*- + * Copyright (c) 1998 John D. Polstra. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sys/elf_common.h,v 1.15.8.2 2007/12/03 21:30:36 marius Exp $ + */ + +#ifndef _SYS_ELF_COMMON_H_ +#define _SYS_ELF_COMMON_H_ 1 + +/* + * ELF definitions that are independent of architecture or word size. + */ + +/* + * Note header. The ".note" section contains an array of notes. Each + * begins with this header, aligned to a word boundary. Immediately + * following the note header is n_namesz bytes of name, padded to the + * next word boundary. Then comes n_descsz bytes of descriptor, again + * padded to a word boundary. The values of n_namesz and n_descsz do + * not include the padding. + */ + +typedef struct { + UINT32 n_namesz; /* Length of name. */ + UINT32 n_descsz; /* Length of descriptor. */ + UINT32 n_type; /* Type of this note. */ +} Elf_Note; + +/* Indexes into the e_ident array. Keep synced with + http://www.sco.com/developers/gabi/latest/ch4.eheader.html */ +#define EI_MAG0 0 /* Magic number, byte 0. */ +#define EI_MAG1 1 /* Magic number, byte 1. */ +#define EI_MAG2 2 /* Magic number, byte 2. */ +#define EI_MAG3 3 /* Magic number, byte 3. */ +#define EI_CLASS 4 /* Class of machine. */ +#define EI_DATA 5 /* Data format. */ +#define EI_VERSION 6 /* ELF format version. */ +#define EI_OSABI 7 /* Operating system / ABI identification */ +#define EI_ABIVERSION 8 /* ABI version */ +#define OLD_EI_BRAND 8 /* Start of architecture identification. */ +#define EI_PAD 9 /* Start of padding (per SVR4 ABI). */ +#define EI_NIDENT 16 /* Size of e_ident array. */ + +/* Values for the magic number bytes. */ +#define ELFMAG0 0x7f +#define ELFMAG1 'E' +#define ELFMAG2 'L' +#define ELFMAG3 'F' +#define ELFMAG "\177ELF" /* magic string */ +#define SELFMAG 4 /* magic string size */ + +/* Values for e_ident[EI_VERSION] and e_version. */ +#define EV_NONE 0 +#define EV_CURRENT 1 + +/* Values for e_ident[EI_CLASS]. */ +#define ELFCLASSNONE 0 /* Unknown class. */ +#define ELFCLASS32 1 /* 32-bit architecture. */ +#define ELFCLASS64 2 /* 64-bit architecture. */ + +/* Values for e_ident[EI_DATA]. */ +#define ELFDATANONE 0 /* Unknown data format. */ +#define ELFDATA2LSB 1 /* 2's complement little-endian. */ +#define ELFDATA2MSB 2 /* 2's complement big-endian. */ + +/* Values for e_ident[EI_OSABI]. */ +#define ELFOSABI_NONE 0 /* UNIX System V ABI */ +#define ELFOSABI_HPUX 1 /* HP-UX operating system */ +#define ELFOSABI_NETBSD 2 /* NetBSD */ +#define ELFOSABI_LINUX 3 /* GNU/Linux */ +#define ELFOSABI_HURD 4 /* GNU/Hurd */ +#define ELFOSABI_86OPEN 5 /* 86Open common IA32 ABI */ +#define ELFOSABI_SOLARIS 6 /* Solaris */ +#define ELFOSABI_AIX 7 /* AIX */ +#define ELFOSABI_IRIX 8 /* IRIX */ +#define ELFOSABI_FREEBSD 9 /* FreeBSD */ +#define ELFOSABI_TRU64 10 /* TRU64 UNIX */ +#define ELFOSABI_MODESTO 11 /* Novell Modesto */ +#define ELFOSABI_OPENBSD 12 /* OpenBSD */ +#define ELFOSABI_OPENVMS 13 /* Open VMS */ +#define ELFOSABI_NSK 14 /* HP Non-Stop Kernel */ +#define ELFOSABI_ARM 97 /* ARM */ +#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */ + +#define ELFOSABI_SYSV ELFOSABI_NONE /* symbol used in old spec */ +#define ELFOSABI_MONTEREY ELFOSABI_AIX /* Monterey */ + +/* e_ident */ +#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \ + (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \ + (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \ + (ehdr).e_ident[EI_MAG3] == ELFMAG3) + +/* Values for e_type. */ +#define ET_NONE 0 /* Unknown type. */ +#define ET_REL 1 /* Relocatable. */ +#define ET_EXEC 2 /* Executable. */ +#define ET_DYN 3 /* Shared object. */ +#define ET_CORE 4 /* Core file. */ +#define ET_LOOS 0xfe00 /* First operating system specific. */ +#define ET_HIOS 0xfeff /* Last operating system-specific. */ +#define ET_LOPROC 0xff00 /* First processor-specific. */ +#define ET_HIPROC 0xffff /* Last processor-specific. */ + +/* Values for e_machine. */ +#define EM_NONE 0 /* Unknown machine. */ +#define EM_M32 1 /* AT&T WE32100. */ +#define EM_SPARC 2 /* Sun SPARC. */ +#define EM_386 3 /* Intel i386. */ +#define EM_68K 4 /* Motorola 68000. */ +#define EM_88K 5 /* Motorola 88000. */ +#define EM_860 7 /* Intel i860. */ +#define EM_MIPS 8 /* MIPS R3000 Big-Endian only. */ +#define EM_S370 9 /* IBM System/370. */ +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 Little-Endian. */ +#define EM_PARISC 15 /* HP PA-RISC. */ +#define EM_VPP500 17 /* Fujitsu VPP500. */ +#define EM_SPARC32PLUS 18 /* SPARC v8plus. */ +#define EM_960 19 /* Intel 80960. */ +#define EM_PPC 20 /* PowerPC 32-bit. */ +#define EM_PPC64 21 /* PowerPC 64-bit. */ +#define EM_S390 22 /* IBM System/390. */ +#define EM_V800 36 /* NEC V800. */ +#define EM_FR20 37 /* Fujitsu FR20. */ +#define EM_RH32 38 /* TRW RH-32. */ +#define EM_RCE 39 /* Motorola RCE. */ +#define EM_ARM 40 /* ARM. */ +#define EM_SH 42 /* Hitachi SH. */ +#define EM_SPARCV9 43 /* SPARC v9 64-bit. */ +#define EM_TRICORE 44 /* Siemens TriCore embedded processor. */ +#define EM_ARC 45 /* Argonaut RISC Core. */ +#define EM_H8_300 46 /* Hitachi H8/300. */ +#define EM_H8_300H 47 /* Hitachi H8/300H. */ +#define EM_H8S 48 /* Hitachi H8S. */ +#define EM_H8_500 49 /* Hitachi H8/500. */ +#define EM_MIPS_X 51 /* Stanford MIPS-X. */ +#define EM_COLDFIRE 52 /* Motorola ColdFire. */ +#define EM_68HC12 53 /* Motorola M68HC12. */ +#define EM_MMA 54 /* Fujitsu MMA. */ +#define EM_PCP 55 /* Siemens PCP. */ +#define EM_NCPU 56 /* Sony nCPU. */ +#define EM_NDR1 57 /* Denso NDR1 microprocessor. */ +#define EM_STARCORE 58 /* Motorola Star*Core processor. */ +#define EM_ME16 59 /* Toyota ME16 processor. */ +#define EM_ST100 60 /* STMicroelectronics ST100 processor. */ +#define EM_TINYJ 61 /* Advanced Logic Corp. TinyJ processor. */ +#define EM_X86_64 62 /* Advanced Micro Devices x86-64 */ +#define EM_AMD64 EM_X86_64 /* Advanced Micro Devices x86-64 (compat) */ +#define EM_AARCH64 183 /* ARM 64bit Architecture */ + +/* Non-standard or deprecated. */ +#define EM_486 6 /* Intel i486. */ +#define EM_MIPS_RS4_BE 10 /* MIPS R4000 Big-Endian */ +#define EM_ALPHA_STD 41 /* Digital Alpha (standard value). */ +#define EM_ALPHA 0x9026 /* Alpha (written in the absence of an ABI) */ + +/* Special section indexes. */ +#define SHN_UNDEF 0 /* Undefined, missing, irrelevant. */ +#define SHN_LORESERVE 0xff00 /* First of reserved range. */ +#define SHN_LOPROC 0xff00 /* First processor-specific. */ +#define SHN_HIPROC 0xff1f /* Last processor-specific. */ +#define SHN_LOOS 0xff20 /* First operating system-specific. */ +#define SHN_HIOS 0xff3f /* Last operating system-specific. */ +#define SHN_ABS 0xfff1 /* Absolute values. */ +#define SHN_COMMON 0xfff2 /* Common data. */ +#define SHN_XINDEX 0xffff /* Escape -- index stored elsewhere. */ +#define SHN_HIRESERVE 0xffff /* Last of reserved range. */ + +/* sh_type */ +#define SHT_NULL 0 /* inactive */ +#define SHT_PROGBITS 1 /* program defined information */ +#define SHT_SYMTAB 2 /* symbol table section */ +#define SHT_STRTAB 3 /* string table section */ +#define SHT_RELA 4 /* relocation section with addends */ +#define SHT_HASH 5 /* symbol hash table section */ +#define SHT_DYNAMIC 6 /* dynamic section */ +#define SHT_NOTE 7 /* note section */ +#define SHT_NOBITS 8 /* no space section */ +#define SHT_REL 9 /* relocation section - no addends */ +#define SHT_SHLIB 10 /* reserved - purpose unknown */ +#define SHT_DYNSYM 11 /* dynamic symbol table section */ +#define SHT_INIT_ARRAY 14 /* Initialization function pointers. */ +#define SHT_FINI_ARRAY 15 /* Termination function pointers. */ +#define SHT_PREINIT_ARRAY 16 /* Pre-initialization function ptrs. */ +#define SHT_GROUP 17 /* Section group. */ +#define SHT_SYMTAB_SHNDX 18 /* Section indexes (see SHN_XINDEX). */ +#define SHT_LOOS 0x60000000 /* First of OS specific semantics */ +#define SHT_LOSUNW 0x6ffffff4 +#define SHT_SUNW_dof 0x6ffffff4 +#define SHT_SUNW_cap 0x6ffffff5 +#define SHT_SUNW_SIGNATURE 0x6ffffff6 +#define SHT_SUNW_ANNOTATE 0x6ffffff7 +#define SHT_SUNW_DEBUGSTR 0x6ffffff8 +#define SHT_SUNW_DEBUG 0x6ffffff9 +#define SHT_SUNW_move 0x6ffffffa +#define SHT_SUNW_COMDAT 0x6ffffffb +#define SHT_SUNW_syminfo 0x6ffffffc +#define SHT_SUNW_verdef 0x6ffffffd +#define SHT_GNU_verdef 0x6ffffffd /* Symbol versions provided */ +#define SHT_SUNW_verneed 0x6ffffffe +#define SHT_GNU_verneed 0x6ffffffe /* Symbol versions required */ +#define SHT_SUNW_versym 0x6fffffff +#define SHT_GNU_versym 0x6fffffff /* Symbol version table */ +#define SHT_HISUNW 0x6fffffff +#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ +#define SHT_LOPROC 0x70000000 /* reserved range for processor */ +#define SHT_AMD64_UNWIND 0x70000001 /* unwind information */ +#define SHT_HIPROC 0x7fffffff /* specific section header types */ +#define SHT_LOUSER 0x80000000 /* reserved range for application */ +#define SHT_HIUSER 0xffffffff /* specific indexes */ + +/* Flags for sh_flags. */ +#define SHF_WRITE 0x1 /* Section contains writable data. */ +#define SHF_ALLOC 0x2 /* Section occupies memory. */ +#define SHF_EXECINSTR 0x4 /* Section contains instructions. */ +#define SHF_MERGE 0x10 /* Section may be merged. */ +#define SHF_STRINGS 0x20 /* Section contains strings. */ +#define SHF_INFO_LINK 0x40 /* sh_info holds section index. */ +#define SHF_LINK_ORDER 0x80 /* Special ordering requirements. */ +#define SHF_OS_NONCONFORMING 0x100 /* OS-specific processing required. */ +#define SHF_GROUP 0x200 /* Member of section group. */ +#define SHF_TLS 0x400 /* Section contains TLS data. */ +#define SHF_MASKOS 0x0ff00000 /* OS-specific semantics. */ +#define SHF_MASKPROC 0xf0000000 /* Processor-specific semantics. */ + +/* Values for p_type. */ +#define PT_NULL 0 /* Unused entry. */ +#define PT_LOAD 1 /* Loadable segment. */ +#define PT_DYNAMIC 2 /* Dynamic linking information segment. */ +#define PT_INTERP 3 /* Pathname of interpreter. */ +#define PT_NOTE 4 /* Auxiliary information. */ +#define PT_SHLIB 5 /* Reserved (not used). */ +#define PT_PHDR 6 /* Location of program header itself. */ +#define PT_TLS 7 /* Thread local storage segment */ +#define PT_LOOS 0x60000000 /* First OS-specific. */ +#define PT_SUNW_UNWIND 0x6464e550 /* amd64 UNWIND program header */ +#define PT_GNU_EH_FRAME 0x6474e550 +#define PT_LOSUNW 0x6ffffffa +#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ +#define PT_SUNWSTACK 0x6ffffffb /* describes the stack segment */ +#define PT_SUNWDTRACE 0x6ffffffc /* private */ +#define PT_SUNWCAP 0x6ffffffd /* hard/soft capabilities segment */ +#define PT_HISUNW 0x6fffffff +#define PT_HIOS 0x6fffffff /* Last OS-specific. */ +#define PT_LOPROC 0x70000000 /* First processor-specific type. */ +#define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ + +/* Values for p_flags. */ +#define PF_X 0x1 /* Executable. */ +#define PF_W 0x2 /* Writable. */ +#define PF_R 0x4 /* Readable. */ +#define PF_MASKOS 0x0ff00000 /* Operating system-specific. */ +#define PF_MASKPROC 0xf0000000 /* Processor-specific. */ + +/* Extended program header index. */ +#define PN_XNUM 0xffff + +/* Values for d_tag. */ +#define DT_NULL 0 /* Terminating entry. */ +#define DT_NEEDED 1 /* String table offset of a needed shared + library. */ +#define DT_PLTRELSZ 2 /* Total size in bytes of PLT relocations. */ +#define DT_PLTGOT 3 /* Processor-dependent address. */ +#define DT_HASH 4 /* Address of symbol hash table. */ +#define DT_STRTAB 5 /* Address of string table. */ +#define DT_SYMTAB 6 /* Address of symbol table. */ +#define DT_RELA 7 /* Address of ElfNN_Rela relocations. */ +#define DT_RELASZ 8 /* Total size of ElfNN_Rela relocations. */ +#define DT_RELAENT 9 /* Size of each ElfNN_Rela relocation entry. */ +#define DT_STRSZ 10 /* Size of string table. */ +#define DT_SYMENT 11 /* Size of each symbol table entry. */ +#define DT_INIT 12 /* Address of initialization function. */ +#define DT_FINI 13 /* Address of finalization function. */ +#define DT_SONAME 14 /* String table offset of shared object + name. */ +#define DT_RPATH 15 /* String table offset of library path. [sup] */ +#define DT_SYMBOLIC 16 /* Indicates "symbolic" linking. [sup] */ +#define DT_REL 17 /* Address of ElfNN_Rel relocations. */ +#define DT_RELSZ 18 /* Total size of ElfNN_Rel relocations. */ +#define DT_RELENT 19 /* Size of each ElfNN_Rel relocation. */ +#define DT_PLTREL 20 /* Type of relocation used for PLT. */ +#define DT_DEBUG 21 /* Reserved (not used). */ +#define DT_TEXTREL 22 /* Indicates there may be relocations in + non-writable segments. [sup] */ +#define DT_JMPREL 23 /* Address of PLT relocations. */ +#define DT_BIND_NOW 24 /* [sup] */ +#define DT_INIT_ARRAY 25 /* Address of the array of pointers to + initialization functions */ +#define DT_FINI_ARRAY 26 /* Address of the array of pointers to + termination functions */ +#define DT_INIT_ARRAYSZ 27 /* Size in bytes of the array of + initialization functions. */ +#define DT_FINI_ARRAYSZ 28 /* Size in bytes of the array of + terminationfunctions. */ +#define DT_RUNPATH 29 /* String table offset of a null-terminated + library search path string. */ +#define DT_FLAGS 30 /* Object specific flag values. */ +#define DT_ENCODING 32 /* Values greater than or equal to DT_ENCODING + and less than DT_LOOS follow the rules for + the interpretation of the d_un union + as follows: even == 'd_ptr', even == 'd_val' + or none */ +#define DT_PREINIT_ARRAY 32 /* Address of the array of pointers to + pre-initialization functions. */ +#define DT_PREINIT_ARRAYSZ 33 /* Size in bytes of the array of + pre-initialization functions. */ +#define DT_MAXPOSTAGS 34 /* number of positive tags */ +#define DT_LOOS 0x6000000d /* First OS-specific */ +#define DT_SUNW_AUXILIARY 0x6000000d /* symbol auxiliary name */ +#define DT_SUNW_RTLDINF 0x6000000e /* ld.so.1 info (private) */ +#define DT_SUNW_FILTER 0x6000000f /* symbol filter name */ +#define DT_SUNW_CAP 0x60000010 /* hardware/software */ +#define DT_HIOS 0x6ffff000 /* Last OS-specific */ + +/* + * DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the + * Dyn.d_un.d_val field of the Elf*_Dyn structure. + */ +#define DT_VALRNGLO 0x6ffffd00 +#define DT_CHECKSUM 0x6ffffdf8 /* elf checksum */ +#define DT_PLTPADSZ 0x6ffffdf9 /* pltpadding size */ +#define DT_MOVEENT 0x6ffffdfa /* move table entry size */ +#define DT_MOVESZ 0x6ffffdfb /* move table size */ +#define DT_FEATURE_1 0x6ffffdfc /* feature holder */ +#define DT_POSFLAG_1 0x6ffffdfd /* flags for DT_* entries, effecting */ + /* the following DT_* entry. */ + /* See DF_P1_* definitions */ +#define DT_SYMINSZ 0x6ffffdfe /* syminfo table size (in bytes) */ +#define DT_SYMINENT 0x6ffffdff /* syminfo entry size (in bytes) */ +#define DT_VALRNGHI 0x6ffffdff + +/* + * DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the + * Dyn.d_un.d_ptr field of the Elf*_Dyn structure. + * + * If any adjustment is made to the ELF object after it has been + * built, these entries will need to be adjusted. + */ +#define DT_ADDRRNGLO 0x6ffffe00 +#define DT_CONFIG 0x6ffffefa /* configuration information */ +#define DT_DEPAUDIT 0x6ffffefb /* dependency auditing */ +#define DT_AUDIT 0x6ffffefc /* object auditing */ +#define DT_PLTPAD 0x6ffffefd /* pltpadding (sparcv9) */ +#define DT_MOVETAB 0x6ffffefe /* move table */ +#define DT_SYMINFO 0x6ffffeff /* syminfo table */ +#define DT_ADDRRNGHI 0x6ffffeff + +#define DT_VERSYM 0x6ffffff0 /* Address of versym section. */ +#define DT_RELACOUNT 0x6ffffff9 /* number of RELATIVE relocations */ +#define DT_RELCOUNT 0x6ffffffa /* number of RELATIVE relocations */ +#define DT_FLAGS_1 0x6ffffffb /* state flags - see DF_1_* defs */ +#define DT_VERDEF 0x6ffffffc /* Address of verdef section. */ +#define DT_VERDEFNUM 0x6ffffffd /* Number of elems in verdef section */ +#define DT_VERNEED 0x6ffffffe /* Address of verneed section. */ +#define DT_VERNEEDNUM 0x6fffffff /* Number of elems in verneed section */ + +#define DT_LOPROC 0x70000000 /* First processor-specific type. */ +#define DT_DEPRECATED_SPARC_REGISTER 0x7000001 +#define DT_AUXILIARY 0x7ffffffd /* shared library auxiliary name */ +#define DT_USED 0x7ffffffe /* ignored - same as needed */ +#define DT_FILTER 0x7fffffff /* shared library filter name */ +#define DT_HIPROC 0x7fffffff /* Last processor-specific type. */ + +/* Values for DT_FLAGS */ +#define DF_ORIGIN 0x0001 /* Indicates that the object being loaded may + make reference to the $ORIGIN substitution + string */ +#define DF_SYMBOLIC 0x0002 /* Indicates "symbolic" linking. */ +#define DF_TEXTREL 0x0004 /* Indicates there may be relocations in + non-writable segments. */ +#define DF_BIND_NOW 0x0008 /* Indicates that the dynamic linker should + process all relocations for the object + containing this entry before transferring + control to the program. */ +#define DF_STATIC_TLS 0x0010 /* Indicates that the shared object or + executable contains code using a static + thread-local storage scheme. */ + +/* Values for n_type. Used in core files. */ +#define NT_PRSTATUS 1 /* Process status. */ +#define NT_FPREGSET 2 /* Floating point registers. */ +#define NT_PRPSINFO 3 /* Process state info. */ + +/* Symbol Binding - ELFNN_ST_BIND - st_info */ +#define STB_LOCAL 0 /* Local symbol */ +#define STB_GLOBAL 1 /* Global symbol */ +#define STB_WEAK 2 /* like global - lower precedence */ +#define STB_LOOS 10 /* Reserved range for operating system */ +#define STB_HIOS 12 /* specific semantics. */ +#define STB_LOPROC 13 /* reserved range for processor */ +#define STB_HIPROC 15 /* specific semantics. */ + +/* Symbol type - ELFNN_ST_TYPE - st_info */ +#define STT_NOTYPE 0 /* Unspecified type. */ +#define STT_OBJECT 1 /* Data object. */ +#define STT_FUNC 2 /* Function. */ +#define STT_SECTION 3 /* Section. */ +#define STT_FILE 4 /* Source file. */ +#define STT_COMMON 5 /* Uninitialized common block. */ +#define STT_TLS 6 /* TLS object. */ +#define STT_NUM 7 +#define STT_LOOS 10 /* Reserved range for operating system */ +#define STT_HIOS 12 /* specific semantics. */ +#define STT_LOPROC 13 /* reserved range for processor */ +#define STT_HIPROC 15 /* specific semantics. */ + +/* Symbol visibility - ELFNN_ST_VISIBILITY - st_other */ +#define STV_DEFAULT 0x0 /* Default visibility (see binding). */ +#define STV_INTERNAL 0x1 /* Special meaning in relocatable objects. */ +#define STV_HIDDEN 0x2 /* Not visible. */ +#define STV_PROTECTED 0x3 /* Visible but not preemptible. */ + +/* Special symbol table indexes. */ +#define STN_UNDEF 0 /* Undefined symbol index. */ + +/* Symbol versioning flags. */ +#define VER_DEF_CURRENT 1 +#define VER_DEF_IDX(x) VER_NDX(x) + +#define VER_FLG_BASE 0x01 +#define VER_FLG_WEAK 0x02 + +#define VER_NEED_CURRENT 1 +#define VER_NEED_WEAK (1u << 15) +#define VER_NEED_HIDDEN VER_NDX_HIDDEN +#define VER_NEED_IDX(x) VER_NDX(x) + +#define VER_NDX_LOCAL 0 +#define VER_NDX_GLOBAL 1 +#define VER_NDX_GIVEN 2 + +#define VER_NDX_HIDDEN (1u << 15) +#define VER_NDX(x) ((x) & ~(1u << 15)) + +#define CA_SUNW_NULL 0 +#define CA_SUNW_HW_1 1 /* first hardware capabilities entry */ +#define CA_SUNW_SF_1 2 /* first software capabilities entry */ + +/* + * Syminfo flag values + */ +#define SYMINFO_FLG_DIRECT 0x0001 /* symbol ref has direct association */ + /* to object containing defn. */ +#define SYMINFO_FLG_PASSTHRU 0x0002 /* ignored - see SYMINFO_FLG_FILTER */ +#define SYMINFO_FLG_COPY 0x0004 /* symbol is a copy-reloc */ +#define SYMINFO_FLG_LAZYLOAD 0x0008 /* object containing defn should be */ + /* lazily-loaded */ +#define SYMINFO_FLG_DIRECTBIND 0x0010 /* ref should be bound directly to */ + /* object containing defn. */ +#define SYMINFO_FLG_NOEXTDIRECT 0x0020 /* don't let an external reference */ + /* directly bind to this symbol */ +#define SYMINFO_FLG_FILTER 0x0002 /* symbol ref is associated to a */ +#define SYMINFO_FLG_AUXILIARY 0x0040 /* standard or auxiliary filter */ + +/* + * Syminfo.si_boundto values. + */ +#define SYMINFO_BT_SELF 0xffff /* symbol bound to self */ +#define SYMINFO_BT_PARENT 0xfffe /* symbol bound to parent */ +#define SYMINFO_BT_NONE 0xfffd /* no special symbol binding */ +#define SYMINFO_BT_EXTERN 0xfffc /* symbol defined as external */ +#define SYMINFO_BT_LOWRESERVE 0xff00 /* beginning of reserved entries */ + +/* + * Syminfo version values. + */ +#define SYMINFO_NONE 0 /* Syminfo version */ +#define SYMINFO_CURRENT 1 +#define SYMINFO_NUM 2 + +/* + * Relocation types. + * + * All machine architectures are defined here to allow tools on one to + * handle others. + */ + +#define R_386_NONE 0 /* No relocation. */ +#define R_386_32 1 /* Add symbol value. */ +#define R_386_PC32 2 /* Add PC-relative symbol value. */ +#define R_386_GOT32 3 /* Add PC-relative GOT offset. */ +#define R_386_PLT32 4 /* Add PC-relative PLT offset. */ +#define R_386_COPY 5 /* Copy data from shared object. */ +#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ +#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */ +#define R_386_RELATIVE 8 /* Add load address of shared object. */ +#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */ +#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */ +#define R_386_TLS_TPOFF 14 /* Negative offset in static TLS block */ +#define R_386_TLS_IE 15 /* Absolute address of GOT for -ve static TLS */ +#define R_386_TLS_GOTIE 16 /* GOT entry for negative static TLS block */ +#define R_386_TLS_LE 17 /* Negative offset relative to static TLS */ +#define R_386_TLS_GD 18 /* 32 bit offset to GOT (index,off) pair */ +#define R_386_TLS_LDM 19 /* 32 bit offset to GOT (index,zero) pair */ +#define R_386_TLS_GD_32 24 /* 32 bit offset to GOT (index,off) pair */ +#define R_386_TLS_GD_PUSH 25 /* pushl instruction for Sun ABI GD sequence */ +#define R_386_TLS_GD_CALL 26 /* call instruction for Sun ABI GD sequence */ +#define R_386_TLS_GD_POP 27 /* popl instruction for Sun ABI GD sequence */ +#define R_386_TLS_LDM_32 28 /* 32 bit offset to GOT (index,zero) pair */ +#define R_386_TLS_LDM_PUSH 29 /* pushl instruction for Sun ABI LD sequence */ +#define R_386_TLS_LDM_CALL 30 /* call instruction for Sun ABI LD sequence */ +#define R_386_TLS_LDM_POP 31 /* popl instruction for Sun ABI LD sequence */ +#define R_386_TLS_LDO_32 32 /* 32 bit offset from start of TLS block */ +#define R_386_TLS_IE_32 33 /* 32 bit offset to GOT static TLS offset entry */ +#define R_386_TLS_LE_32 34 /* 32 bit offset within static TLS block */ +#define R_386_TLS_DTPMOD32 35 /* GOT entry containing TLS index */ +#define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */ +#define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */ + +/* Null relocation */ +#define R_AARCH64_NONE 256 /* No relocation */ +/* Static AArch64 relocations */ + /* Static data relocations */ +#define R_AARCH64_ABS64 257 /* S + A */ +#define R_AARCH64_ABS32 258 /* S + A */ +#define R_AARCH64_ABS16 259 /* S + A */ +#define R_AARCH64_PREL64 260 /* S + A - P */ +#define R_AARCH64_PREL32 261 /* S + A - P */ +#define R_AARCH64_PREL16 262 /* S + A - P */ + /* Group relocations to create a 16, 32, 48, or 64 bit unsigned data value or address inline */ +#define R_AARCH64_MOVW_UABS_G0 263 /* S + A */ +#define R_AARCH64_MOVW_UABS_G0_NC 264 /* S + A */ +#define R_AARCH64_MOVW_UABS_G1 265 /* S + A */ +#define R_AARCH64_MOVW_UABS_G1_NC 266 /* S + A */ +#define R_AARCH64_MOVW_UABS_G2 267 /* S + A */ +#define R_AARCH64_MOVW_UABS_G2_NC 268 /* S + A */ +#define R_AARCH64_MOVW_UABS_G3 269 /* S + A */ + /* Group relocations to create a 16, 32, 48, or 64 bit signed data or offset value inline */ +#define R_AARCH64_MOVW_SABS_G0 270 /* S + A */ +#define R_AARCH64_MOVW_SABS_G1 271 /* S + A */ +#define R_AARCH64_MOVW_SABS_G2 272 /* S + A */ + /* Relocations to generate 19, 21 and 33 bit PC-relative addresses */ +#define R_AARCH64_LD_PREL_LO19 273 /* S + A - P */ +#define R_AARCH64_ADR_PREL_LO21 274 /* S + A - P */ +#define R_AARCH64_ADR_PREL_PG_HI21 275 /* Page(S+A) - Page(P) */ +#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Page(S+A) - Page(P) */ +#define R_AARCH64_ADD_ABS_LO12_NC 277 /* S + A */ +#define R_AARCH64_LDST8_ABS_LO12_NC 278 /* S + A */ +#define R_AARCH64_LDST16_ABS_LO12_NC 284 /* S + A */ +#define R_AARCH64_LDST32_ABS_LO12_NC 285 /* S + A */ +#define R_AARCH64_LDST64_ABS_LO12_NC 286 /* S + A */ +#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* S + A */ + /* Relocations for control-flow instructions - all offsets are a multiple of 4 */ +#define R_AARCH64_TSTBR14 279 /* S+A-P */ +#define R_AARCH64_CONDBR19 280 /* S+A-P */ +#define R_AARCH64_JUMP26 282 /* S+A-P */ +#define R_AARCH64_CALL26 283 /* S+A-P */ + /* Group relocations to create a 16, 32, 48, or 64 bit PC-relative offset inline */ +#define R_AARCH64_MOVW_PREL_G0 287 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G0_NC 288 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G1 289 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G1_NC 290 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G2 291 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G2_NC 292 /* S+A-P */ +#define R_AARCH64_MOVW_PREL_G3 293 /* S+A-P */ + /* Group relocations to create a 16, 32, 48, or 64 bit GOT-relative offsets inline */ +#define R_AARCH64_MOVW_GOTOFF_G0 300 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G0_NC 301 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G1 302 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G1_NC 303 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G2 304 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G2_NC 305 /* G(S)-GOT */ +#define R_AARCH64_MOVW_GOTOFF_G3 306 /* G(S)-GOT */ + /* GOT-relative data relocations */ +#define R_AARCH64_GOTREL64 307 /* S+A-GOT */ +#define R_AARCH64_GOTREL32 308 /* S+A-GOT */ + /* GOT-relative instruction relocations */ +#define R_AARCH64_GOT_LD_PREL19 309 /* G(S)-P */ +#define R_AARCH64_LD64_GOTOFF_LO15 310 /* G(S)-GOT */ +#define R_AARCH64_ADR_GOT_PAGE 311 /* Page(G(S))-Page(P) */ +#define R_AARCH64_LD64_GOT_LO12_NC 312 /* G(S) */ +#define R_AARCH64_LD64_GOTPAGE_LO15 313 /* G(S)-Page(GOT) */ +/* Relocations for thread-local storage */ + /* General Dynamic TLS relocations */ +#define R_AARCH64_TLSGD_ADR_PREL21 512 /* G(TLSIDX(S+A)) - P */ +#define R_AARCH64_TLSGD_ADR_PAGE21 513 /* Page(G(TLSIDX(S+A))) - Page(P) */ +#define R_AARCH64_TLSGD_ADD_LO12_NC 514 /* G(TLSIDX(S+A)) */ +#define R_AARCH64_TLSGD_MOVW_G1 515 /* G(TLSIDX(S+A)) - GOT */ +#define R_AARCH64_TLSGD_MOVW_G0_NC 516 /* G(TLSIDX(S+A)) - GOT */ + /* Local Dynamic TLS relocations */ +#define R_AARCH64_TLSLD_ADR_PREL21 517 /* G(LDM(S))) - P */ +#define R_AARCH64_TLSLD_ADR_PAGE21 518 /* Page(G(LDM(S)))-Page(P) */ +#define R_AARCH64_TLSLD_ADD_LO12_NC 519 /* G(LDM(S)) */ +#define R_AARCH64_TLSLD_MOVW_G1 520 /* G(LDM(S)) - GOT */ +#define R_AARCH64_TLSLD_MOVW_G0_NC 521 /* G(LDM(S)) - GOT */ +#define R_AARCH64_TLSLD_LD_PREL19 522 /* G(LDM(S)) - P */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537 /* DTPREL(S+A) */ +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538 /* DTPREL(S+A) */ + /* Initial Exec TLS relocations */ +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539 /* G(TPREL(S+A)) - GOT */ +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540 /* G(TPREL(S+A)) - GOT */ +#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541 /* Page(G(TPREL(S+A))) - Page(P) */ +#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542 /* G(TPREL(S+A)) */ +#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543 /* G(TPREL(S+A)) - P */ + /* Local Exec TLS relocations */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558 /* TPREL(S+A) */ +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559 /* TPREL(S+A) */ +/* Dynamic relocations */ + /* Dynamic relocations */ +#define R_AARCH64_COPY 1024 +#define R_AARCH64_GLOB_DAT 1025 /* S + A */ +#define R_AARCH64_JUMP_SLOT 1026 /* S + A */ +#define R_AARCH64_RELATIVE 1027 /* Delta(S) + A , Delta(P) + A */ +#define R_AARCH64_TLS_DTPREL64 1028 /* DTPREL(S+A) */ +#define R_AARCH64_TLS_DTPMOD64 1029 /* LDM(S) */ +#define R_AARCH64_TLS_TPREL64 1030 /* TPREL(S+A) */ +#define R_AARCH64_TLS_DTPREL32 1031 /* DTPREL(S+A) */ +#define R_AARCH64_TLS_DTPMOD32 1032 /* LDM(S) */ +#define R_AARCH64_TLS_TPREL32 1033 /* DTPREL(S+A) */ + +#define R_ALPHA_NONE 0 /* No reloc */ +#define R_ALPHA_REFLONG 1 /* Direct 32 bit */ +#define R_ALPHA_REFQUAD 2 /* Direct 64 bit */ +#define R_ALPHA_GPREL32 3 /* GP relative 32 bit */ +#define R_ALPHA_LITERAL 4 /* GP relative 16 bit w/optimization */ +#define R_ALPHA_LITUSE 5 /* Optimization hint for LITERAL */ +#define R_ALPHA_GPDISP 6 /* Add displacement to GP */ +#define R_ALPHA_BRADDR 7 /* PC+4 relative 23 bit shifted */ +#define R_ALPHA_HINT 8 /* PC+4 relative 16 bit shifted */ +#define R_ALPHA_SREL16 9 /* PC relative 16 bit */ +#define R_ALPHA_SREL32 10 /* PC relative 32 bit */ +#define R_ALPHA_SREL64 11 /* PC relative 64 bit */ +#define R_ALPHA_OP_PUSH 12 /* OP stack push */ +#define R_ALPHA_OP_STORE 13 /* OP stack pop and store */ +#define R_ALPHA_OP_PSUB 14 /* OP stack subtract */ +#define R_ALPHA_OP_PRSHIFT 15 /* OP stack right shift */ +#define R_ALPHA_GPVALUE 16 +#define R_ALPHA_GPRELHIGH 17 +#define R_ALPHA_GPRELLOW 18 +#define R_ALPHA_IMMED_GP_16 19 +#define R_ALPHA_IMMED_GP_HI32 20 +#define R_ALPHA_IMMED_SCN_HI32 21 +#define R_ALPHA_IMMED_BR_HI32 22 +#define R_ALPHA_IMMED_LO32 23 +#define R_ALPHA_COPY 24 /* Copy symbol at runtime */ +#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */ +#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */ +#define R_ALPHA_RELATIVE 27 /* Adjust by program base */ + +#define R_ARM_NONE 0 /* No relocation. */ +#define R_ARM_PC24 1 +#define R_ARM_ABS32 2 +#define R_ARM_REL32 3 +#define R_ARM_PC13 4 +#define R_ARM_ABS16 5 +#define R_ARM_ABS12 6 +#define R_ARM_THM_ABS5 7 +#define R_ARM_ABS8 8 +#define R_ARM_SBREL32 9 +#define R_ARM_THM_PC22 10 +#define R_ARM_THM_PC8 11 +#define R_ARM_AMP_VCALL9 12 +#define R_ARM_SWI24 13 +#define R_ARM_THM_SWI8 14 +#define R_ARM_XPC25 15 +#define R_ARM_THM_XPC22 16 +#define R_ARM_COPY 20 /* Copy data from shared object. */ +#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ +#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ +#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ +#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ +#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ +#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ +#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ +#define R_ARM_CALL 28 +#define R_ARM_JMP24 29 +#define R_ARM_THM_MOVW_ABS_NC 47 +#define R_ARM_THM_MOVT_ABS 48 + +// Block of PC-relative relocations added to work around gcc putting +// object relocations in static executables. +#define R_ARM_THM_JUMP24 30 +#define R_ARM_PREL31 42 +#define R_ARM_MOVW_PREL_NC 45 +#define R_ARM_MOVT_PREL 46 +#define R_ARM_THM_MOVW_PREL_NC 49 +#define R_ARM_THM_MOVT_PREL 50 +#define R_ARM_THM_JMP6 52 +#define R_ARM_THM_ALU_PREL_11_0 53 +#define R_ARM_THM_PC12 54 +#define R_ARM_REL32_NOI 56 +#define R_ARM_ALU_PC_G0_NC 57 +#define R_ARM_ALU_PC_G0 58 +#define R_ARM_ALU_PC_G1_NC 59 +#define R_ARM_ALU_PC_G1 60 +#define R_ARM_ALU_PC_G2 61 +#define R_ARM_LDR_PC_G1 62 +#define R_ARM_LDR_PC_G2 63 +#define R_ARM_LDRS_PC_G0 64 +#define R_ARM_LDRS_PC_G1 65 +#define R_ARM_LDRS_PC_G2 66 +#define R_ARM_LDC_PC_G0 67 +#define R_ARM_LDC_PC_G1 68 +#define R_ARM_LDC_PC_G2 69 +#define R_ARM_GOT_PREL 96 +#define R_ARM_THM_JUMP11 102 +#define R_ARM_THM_JUMP8 103 +#define R_ARM_TLS_GD32 104 +#define R_ARM_TLS_LDM32 105 +#define R_ARM_TLS_IE32 107 + +#define R_ARM_THM_JUMP19 51 +#define R_ARM_GNU_VTENTRY 100 +#define R_ARM_GNU_VTINHERIT 101 +#define R_ARM_RSBREL32 250 +#define R_ARM_THM_RPC22 251 +#define R_ARM_RREL32 252 +#define R_ARM_RABS32 253 +#define R_ARM_RPC24 254 +#define R_ARM_RBASE 255 + +#define R_PPC_NONE 0 /* No relocation. */ +#define R_PPC_ADDR32 1 +#define R_PPC_ADDR24 2 +#define R_PPC_ADDR16 3 +#define R_PPC_ADDR16_LO 4 +#define R_PPC_ADDR16_HI 5 +#define R_PPC_ADDR16_HA 6 +#define R_PPC_ADDR14 7 +#define R_PPC_ADDR14_BRTAKEN 8 +#define R_PPC_ADDR14_BRNTAKEN 9 +#define R_PPC_REL24 10 +#define R_PPC_REL14 11 +#define R_PPC_REL14_BRTAKEN 12 +#define R_PPC_REL14_BRNTAKEN 13 +#define R_PPC_GOT16 14 +#define R_PPC_GOT16_LO 15 +#define R_PPC_GOT16_HI 16 +#define R_PPC_GOT16_HA 17 +#define R_PPC_PLTREL24 18 +#define R_PPC_COPY 19 +#define R_PPC_GLOB_DAT 20 +#define R_PPC_JMP_SLOT 21 +#define R_PPC_RELATIVE 22 +#define R_PPC_LOCAL24PC 23 +#define R_PPC_UADDR32 24 +#define R_PPC_UADDR16 25 +#define R_PPC_REL32 26 +#define R_PPC_PLT32 27 +#define R_PPC_PLTREL32 28 +#define R_PPC_PLT16_LO 29 +#define R_PPC_PLT16_HI 30 +#define R_PPC_PLT16_HA 31 +#define R_PPC_SDAREL16 32 +#define R_PPC_SECTOFF 33 +#define R_PPC_SECTOFF_LO 34 +#define R_PPC_SECTOFF_HI 35 +#define R_PPC_SECTOFF_HA 36 + +/* + * TLS relocations + */ +#define R_PPC_TLS 67 +#define R_PPC_DTPMOD32 68 +#define R_PPC_TPREL16 69 +#define R_PPC_TPREL16_LO 70 +#define R_PPC_TPREL16_HI 71 +#define R_PPC_TPREL16_HA 72 +#define R_PPC_TPREL32 73 +#define R_PPC_DTPREL16 74 +#define R_PPC_DTPREL16_LO 75 +#define R_PPC_DTPREL16_HI 76 +#define R_PPC_DTPREL16_HA 77 +#define R_PPC_DTPREL32 78 +#define R_PPC_GOT_TLSGD16 79 +#define R_PPC_GOT_TLSGD16_LO 80 +#define R_PPC_GOT_TLSGD16_HI 81 +#define R_PPC_GOT_TLSGD16_HA 82 +#define R_PPC_GOT_TLSLD16 83 +#define R_PPC_GOT_TLSLD16_LO 84 +#define R_PPC_GOT_TLSLD16_HI 85 +#define R_PPC_GOT_TLSLD16_HA 86 +#define R_PPC_GOT_TPREL16 87 +#define R_PPC_GOT_TPREL16_LO 88 +#define R_PPC_GOT_TPREL16_HI 89 +#define R_PPC_GOT_TPREL16_HA 90 + +/* + * The remaining relocs are from the Embedded ELF ABI, and are not in the + * SVR4 ELF ABI. + */ + +#define R_PPC_EMB_NADDR32 101 +#define R_PPC_EMB_NADDR16 102 +#define R_PPC_EMB_NADDR16_LO 103 +#define R_PPC_EMB_NADDR16_HI 104 +#define R_PPC_EMB_NADDR16_HA 105 +#define R_PPC_EMB_SDAI16 106 +#define R_PPC_EMB_SDA2I16 107 +#define R_PPC_EMB_SDA2REL 108 +#define R_PPC_EMB_SDA21 109 +#define R_PPC_EMB_MRKREF 110 +#define R_PPC_EMB_RELSEC16 111 +#define R_PPC_EMB_RELST_LO 112 +#define R_PPC_EMB_RELST_HI 113 +#define R_PPC_EMB_RELST_HA 114 +#define R_PPC_EMB_BIT_FLD 115 +#define R_PPC_EMB_RELSDA 116 + +#define R_SPARC_NONE 0 +#define R_SPARC_8 1 +#define R_SPARC_16 2 +#define R_SPARC_32 3 +#define R_SPARC_DISP8 4 +#define R_SPARC_DISP16 5 +#define R_SPARC_DISP32 6 +#define R_SPARC_WDISP30 7 +#define R_SPARC_WDISP22 8 +#define R_SPARC_HI22 9 +#define R_SPARC_22 10 +#define R_SPARC_13 11 +#define R_SPARC_LO10 12 +#define R_SPARC_GOT10 13 +#define R_SPARC_GOT13 14 +#define R_SPARC_GOT22 15 +#define R_SPARC_PC10 16 +#define R_SPARC_PC22 17 +#define R_SPARC_WPLT30 18 +#define R_SPARC_COPY 19 +#define R_SPARC_GLOB_DAT 20 +#define R_SPARC_JMP_SLOT 21 +#define R_SPARC_RELATIVE 22 +#define R_SPARC_UA32 23 +#define R_SPARC_PLT32 24 +#define R_SPARC_HIPLT22 25 +#define R_SPARC_LOPLT10 26 +#define R_SPARC_PCPLT32 27 +#define R_SPARC_PCPLT22 28 +#define R_SPARC_PCPLT10 29 +#define R_SPARC_10 30 +#define R_SPARC_11 31 +#define R_SPARC_64 32 +#define R_SPARC_OLO10 33 +#define R_SPARC_HH22 34 +#define R_SPARC_HM10 35 +#define R_SPARC_LM22 36 +#define R_SPARC_PC_HH22 37 +#define R_SPARC_PC_HM10 38 +#define R_SPARC_PC_LM22 39 +#define R_SPARC_WDISP16 40 +#define R_SPARC_WDISP19 41 +#define R_SPARC_GLOB_JMP 42 +#define R_SPARC_7 43 +#define R_SPARC_5 44 +#define R_SPARC_6 45 +#define R_SPARC_DISP64 46 +#define R_SPARC_PLT64 47 +#define R_SPARC_HIX22 48 +#define R_SPARC_LOX10 49 +#define R_SPARC_H44 50 +#define R_SPARC_M44 51 +#define R_SPARC_L44 52 +#define R_SPARC_REGISTER 53 +#define R_SPARC_UA64 54 +#define R_SPARC_UA16 55 +#define R_SPARC_TLS_GD_HI22 56 +#define R_SPARC_TLS_GD_LO10 57 +#define R_SPARC_TLS_GD_ADD 58 +#define R_SPARC_TLS_GD_CALL 59 +#define R_SPARC_TLS_LDM_HI22 60 +#define R_SPARC_TLS_LDM_LO10 61 +#define R_SPARC_TLS_LDM_ADD 62 +#define R_SPARC_TLS_LDM_CALL 63 +#define R_SPARC_TLS_LDO_HIX22 64 +#define R_SPARC_TLS_LDO_LOX10 65 +#define R_SPARC_TLS_LDO_ADD 66 +#define R_SPARC_TLS_IE_HI22 67 +#define R_SPARC_TLS_IE_LO10 68 +#define R_SPARC_TLS_IE_LD 69 +#define R_SPARC_TLS_IE_LDX 70 +#define R_SPARC_TLS_IE_ADD 71 +#define R_SPARC_TLS_LE_HIX22 72 +#define R_SPARC_TLS_LE_LOX10 73 +#define R_SPARC_TLS_DTPMOD32 74 +#define R_SPARC_TLS_DTPMOD64 75 +#define R_SPARC_TLS_DTPOFF32 76 +#define R_SPARC_TLS_DTPOFF64 77 +#define R_SPARC_TLS_TPOFF32 78 +#define R_SPARC_TLS_TPOFF64 79 + +#define R_X86_64_NONE 0 /* No relocation. */ +#define R_X86_64_64 1 /* Add 64 bit symbol value. */ +#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ +#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ +#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ +#define R_X86_64_COPY 5 /* Copy data from shared object. */ +#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ +#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ +#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ +#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ +#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ +#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ +#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ +#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ +#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ +#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ +#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ +#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ +#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ +#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ +#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ +#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ +#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ +#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ +#define R_X86_64_PC64 24 /* PC relative 64 bit */ +#define R_X86_64_GOTOFF64 25 /* 64 bit offset to GOT */ +#define R_X86_64_GOTPC3 26 /* 32 bit signed pc relative offset to GOT */ +#define R_X86_64_GOT64 27 /* 64-bit GOT entry offset */ +#define R_X86_64_GOTPCREL64 28 /* 64-bit PC relative offset to GOT entry */ +#define R_X86_64_GOTPC64 29 /* 64-bit PC relative offset to GOT */ +#define R_X86_64_GOTPLT64 30 /* like GOT64, says PLT entry needed */ +#define R_X86_64_PLTOFF64 31 /* 64-bit GOT relative offset to PLT entry */ +#define R_X86_64_SIZE32 32 /* Size of symbol plus 32-bit addend */ +#define R_X86_64_SIZE64 33 /* Size of symbol plus 64-bit addend */ +#define R_X86_64_GOTPC32_TLSDESC 34 /* GOT offset for TLS descriptor. */ +#define R_X86_64_TLSDESC_CALL 35 /* Marker for call through TLS descriptor. */ +#define R_X86_64_TLSDESC 36 /* TLS descriptor. */ +#define R_X86_64_IRELATIVE 37 /* Adjust indirectly by program base */ +#define R_X86_64_RELATIVE64 38 /* 64-bit adjust by program base */ +#define R_X86_64_GOTPCRELX 41 /* Load from 32 bit signed pc relative offset to GOT entry without REX prefix, relaxable. */ +#define R_X86_64_REX_GOTPCRELX 42 /* Load from 32 bit signed pc relative offset to GOT entry with REX prefix, relaxable. */ + + +#endif /* !_SYS_ELF_COMMON_H_ */ diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c new file mode 100644 index 0000000000..a8f1cf4b3e --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c @@ -0,0 +1,499 @@ +/** @file + ELF library + + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "ElfLibInternal.h" + +/** + Check if the ELF image is valid. + + @param[in] ImageBase Memory address of an image. + + @retval TRUE if valid. + +**/ +BOOLEAN +IsElfFormat ( + IN CONST UINT8 *ImageBase + ) +{ + Elf32_Ehdr *Elf32Hdr; + Elf64_Ehdr *Elf64Hdr; + + ASSERT (ImageBase != NULL); + + Elf32Hdr = (Elf32_Ehdr *)ImageBase; + + // + // Start with correct signature "\7fELF" + // + if ((Elf32Hdr->e_ident[EI_MAG0] != ELFMAG0) || + (Elf32Hdr->e_ident[EI_MAG1] != ELFMAG1) || + (Elf32Hdr->e_ident[EI_MAG1] != ELFMAG1) || + (Elf32Hdr->e_ident[EI_MAG2] != ELFMAG2) + ) { + return FALSE; + } + + // + // Support little-endian only + // + if (Elf32Hdr->e_ident[EI_DATA] != ELFDATA2LSB) { + return FALSE; + } + + // + // Check 32/64-bit architecture + // + if (Elf32Hdr->e_ident[EI_CLASS] == ELFCLASS64) { + Elf64Hdr = (Elf64_Ehdr *)Elf32Hdr; + Elf32Hdr = NULL; + } else if (Elf32Hdr->e_ident[EI_CLASS] == ELFCLASS32) { + Elf64Hdr = NULL; + } else { + return FALSE; + } + + if (Elf64Hdr != NULL) { + // + // Support intel architecture only for now + // + if (Elf64Hdr->e_machine != EM_X86_64) { + return FALSE; + } + + // + // Support ELF types: EXEC (Executable file), DYN (Shared object file) + // + if ((Elf64Hdr->e_type != ET_EXEC) && (Elf64Hdr->e_type != ET_DYN)) { + return FALSE; + } + + // + // Support current ELF version only + // + if (Elf64Hdr->e_version != EV_CURRENT) { + return FALSE; + } + } else { + // + // Support intel architecture only for now + // + if (Elf32Hdr->e_machine != EM_386) { + return FALSE; + } + + // + // Support ELF types: EXEC (Executable file), DYN (Shared object file) + // + if ((Elf32Hdr->e_type != ET_EXEC) && (Elf32Hdr->e_type != ET_DYN)) { + return FALSE; + } + + // + // Support current ELF version only + // + if (Elf32Hdr->e_version != EV_CURRENT) { + return FALSE; + } + } + return TRUE; +} + +/** + Calculate a ELF image size. + + @param[in] ElfCt ELF image context pointer. + + @retval EFI_INVALID_PARAMETER ElfCt or SecPos is NULL. + @retval EFI_NOT_FOUND Could not find the section. + @retval EFI_SUCCESS Section posistion was filled successfully. +**/ +EFI_STATUS +CalculateElfFileSize ( + IN ELF_IMAGE_CONTEXT *ElfCt, + OUT UINTN *FileSize + ) +{ + EFI_STATUS Status; + UINTN FileSize1; + UINTN FileSize2; + Elf32_Ehdr *Elf32Hdr; + Elf64_Ehdr *Elf64Hdr; + UINTN Offset; + UINTN Size; + + if ((ElfCt == NULL) || (FileSize == NULL)) { + return EFI_INVALID_PARAMETER; + } + + // Use last section as end of file + Status = GetElfSectionPos (ElfCt, ElfCt->ShNum - 1, &Offset, &Size); + if (EFI_ERROR(Status)) { + return EFI_UNSUPPORTED; + } + FileSize1 = Offset + Size; + + // Use end of section header as end of file + FileSize2 = 0; + if (ElfCt->EiClass == ELFCLASS32) { + Elf32Hdr = (Elf32_Ehdr *)ElfCt->FileBase; + FileSize2 = Elf32Hdr->e_shoff + Elf32Hdr->e_shentsize * Elf32Hdr->e_shnum; + } else if (ElfCt->EiClass == ELFCLASS64) { + Elf64Hdr = (Elf64_Ehdr *)ElfCt->FileBase; + FileSize2 = (UINTN)(Elf64Hdr->e_shoff + Elf64Hdr->e_shentsize * Elf64Hdr->e_shnum); + } + + *FileSize = MAX(FileSize1, FileSize2); + + return EFI_SUCCESS; +} + +/** + Get a ELF program segment loading info. + + @param[in] ImageBase Image base. + @param[in] EiClass ELF class. + @param[in] Index ELF segment index. + @param[out] SegInfo The pointer to the segment info. + + @retval EFI_INVALID_PARAMETER ElfCt or SecPos is NULL. + @retval EFI_NOT_FOUND Could not find the section. + @retval EFI_SUCCESS Section posistion was filled successfully. +**/ +EFI_STATUS +GetElfSegmentInfo ( + IN UINT8 *ImageBase, + IN UINT32 EiClass, + IN UINT32 Index, + OUT SEGMENT_INFO *SegInfo + ) +{ + Elf32_Phdr *Elf32Phdr; + Elf64_Phdr *Elf64Phdr; + + if ((ImageBase == NULL) || (SegInfo == NULL)) { + return EFI_INVALID_PARAMETER; + } + + if (EiClass == ELFCLASS32) { + Elf32Phdr = GetElf32SegmentByIndex (ImageBase, Index); + if (Elf32Phdr != NULL) { + SegInfo->PtType = Elf32Phdr->p_type; + SegInfo->Offset = Elf32Phdr->p_offset; + SegInfo->Length = Elf32Phdr->p_filesz; + SegInfo->MemLen = Elf32Phdr->p_memsz; + SegInfo->MemAddr = Elf32Phdr->p_paddr; + SegInfo->Alignment = Elf32Phdr->p_align; + return EFI_SUCCESS; + } + } else if (EiClass == ELFCLASS64) { + Elf64Phdr = GetElf64SegmentByIndex (ImageBase, Index); + if (Elf64Phdr != NULL) { + SegInfo->PtType = Elf64Phdr->p_type; + SegInfo->Offset = (UINTN)Elf64Phdr->p_offset; + SegInfo->Length = (UINTN)Elf64Phdr->p_filesz; + SegInfo->MemLen = (UINTN)Elf64Phdr->p_memsz; + SegInfo->MemAddr = (UINTN)Elf64Phdr->p_paddr; + SegInfo->Alignment = (UINTN)Elf64Phdr->p_align; + return EFI_SUCCESS; + } + } + + return EFI_NOT_FOUND; +} + +/** + Parse the ELF image info. + + On return, all fields in ElfCt are updated except ImageAddress. + + @param[in] ImageBase Memory address of an image. + @param[out] ElfCt The EFL image context pointer. + + @retval EFI_INVALID_PARAMETER Input parameters are not valid. + @retval EFI_UNSUPPORTED Unsupported binary type. + @retval EFI_LOAD_ERROR ELF binary loading error. + @retval EFI_SUCCESS ELF binary is loaded successfully. +**/ +EFI_STATUS +EFIAPI +ParseElfImage ( + IN VOID *ImageBase, + OUT ELF_IMAGE_CONTEXT *ElfCt + ) +{ + Elf32_Ehdr *Elf32Hdr; + Elf64_Ehdr *Elf64Hdr; + Elf32_Shdr *Elf32Shdr; + Elf64_Shdr *Elf64Shdr; + EFI_STATUS Status; + UINT32 Index; + SEGMENT_INFO SegInfo; + UINTN End; + UINTN Base; + + if (ElfCt == NULL) { + return EFI_INVALID_PARAMETER; + } + ZeroMem (ElfCt, sizeof(ELF_IMAGE_CONTEXT)); + + if (ImageBase == NULL) { + return (ElfCt->ParseStatus = EFI_INVALID_PARAMETER); + } + + ElfCt->FileBase = (UINT8 *)ImageBase; + if (!IsElfFormat (ElfCt->FileBase)) { + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); + } + + Elf32Hdr = (Elf32_Ehdr *)ElfCt->FileBase; + ElfCt->EiClass = Elf32Hdr->e_ident[EI_CLASS]; + if (ElfCt->EiClass == ELFCLASS32) { + if ((Elf32Hdr->e_type != ET_EXEC) && (Elf32Hdr->e_type != ET_DYN)) { + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); + } + Elf32Shdr = (Elf32_Shdr *)GetElf32SectionByIndex (ElfCt->FileBase, Elf32Hdr->e_shstrndx); + if (Elf32Shdr == NULL) { + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); + } + ElfCt->EntryPoint = (UINTN)Elf32Hdr->e_entry; + ElfCt->ShNum = Elf32Hdr->e_shnum; + ElfCt->PhNum = Elf32Hdr->e_phnum; + ElfCt->ShStrLen = Elf32Shdr->sh_size; + ElfCt->ShStrOff = Elf32Shdr->sh_offset; + } else { + Elf64Hdr = (Elf64_Ehdr *)Elf32Hdr; + if ((Elf64Hdr->e_type != ET_EXEC) && (Elf64Hdr->e_type != ET_DYN)) { + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); + } + Elf64Shdr = (Elf64_Shdr *)GetElf64SectionByIndex (ElfCt->FileBase, Elf64Hdr->e_shstrndx); + if (Elf64Shdr == NULL) { + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); + } + ElfCt->EntryPoint = (UINTN)Elf64Hdr->e_entry; + ElfCt->ShNum = Elf64Hdr->e_shnum; + ElfCt->PhNum = Elf64Hdr->e_phnum; + ElfCt->ShStrLen = (UINT32)Elf64Shdr->sh_size; + ElfCt->ShStrOff = (UINT32)Elf64Shdr->sh_offset; + } + + // + // Get the preferred image base and required memory size when loaded to new location. + // + End = 0; + Base = MAX_UINT32; + ElfCt->ReloadRequired = FALSE; + for (Index = 0; Index < ElfCt->PhNum; Index++) { + Status = GetElfSegmentInfo (ElfCt->FileBase, ElfCt->EiClass, Index, &SegInfo); + ASSERT_EFI_ERROR (Status); + + if (SegInfo.PtType != PT_LOAD) { + continue; + } + + if (SegInfo.MemLen != SegInfo.Length) { + // + // Not enough space to execute at current location. + // + ElfCt->ReloadRequired = TRUE; + } + + if (Base > (SegInfo.MemAddr & ~(EFI_PAGE_SIZE - 1))) { + Base = SegInfo.MemAddr & ~(EFI_PAGE_SIZE - 1); + } + if (End < ALIGN_VALUE (SegInfo.MemAddr + SegInfo.MemLen, EFI_PAGE_SIZE) - 1) { + End = ALIGN_VALUE (SegInfo.MemAddr + SegInfo.MemLen, EFI_PAGE_SIZE) - 1; + } + } + // + // 0 - MAX_UINT32 + 1 equals to 0. + // + ElfCt->ImageSize = End - Base + 1; + ElfCt->PreferredImageAddress = (VOID *) Base; + + CalculateElfFileSize (ElfCt, &ElfCt->FileSize); + return (ElfCt->ParseStatus = EFI_SUCCESS);; +} + +/** + Load the ELF image to Context.ImageAddress. + + Context should be initialized by ParseElfImage(). + Caller should set Context.ImageAddress to a proper value, either pointing to + a new allocated memory whose size equal to Context.ImageSize, or pointing + to Context.PreferredImageAddress. + + @param[in] ElfCt ELF image context pointer. + + @retval EFI_INVALID_PARAMETER Input parameters are not valid. + @retval EFI_UNSUPPORTED Unsupported binary type. + @retval EFI_LOAD_ERROR ELF binary loading error. + @retval EFI_SUCCESS ELF binary is loaded successfully. +**/ +EFI_STATUS +EFIAPI +LoadElfImage ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + EFI_STATUS Status; + + if (ElfCt == NULL) { + return EFI_INVALID_PARAMETER; + } + + if (EFI_ERROR (ElfCt->ParseStatus)) { + return ElfCt->ParseStatus; + } + + if (ElfCt->ImageAddress == NULL) { + return EFI_INVALID_PARAMETER; + } + + Status = EFI_UNSUPPORTED; + if (ElfCt->EiClass == ELFCLASS32) { + Status = LoadElf32Image (ElfCt); + } else if (ElfCt->EiClass == ELFCLASS64) { + Status = LoadElf64Image (ElfCt); + } + + return Status; +} + + +/** + Get a ELF section name from its index. + + @param[in] ElfCt ELF image context pointer. + @param[in] SectionIndex ELF section index. + @param[out] SectionName The pointer to the section name. + + @retval EFI_INVALID_PARAMETER ElfCt or SecName is NULL. + @retval EFI_NOT_FOUND Could not find the section. + @retval EFI_SUCCESS Section name was filled successfully. +**/ +EFI_STATUS +EFIAPI +GetElfSectionName ( + IN ELF_IMAGE_CONTEXT *ElfCt, + IN UINT32 SectionIndex, + OUT CHAR8 **SectionName + ) +{ + Elf32_Shdr *Elf32Shdr; + Elf64_Shdr *Elf64Shdr; + CHAR8 *Name; + + if ((ElfCt == NULL) || (SectionName == NULL)) { + return EFI_INVALID_PARAMETER; + } + + if (EFI_ERROR (ElfCt->ParseStatus)) { + return ElfCt->ParseStatus; + } + + Name = NULL; + if (ElfCt->EiClass == ELFCLASS32) { + Elf32Shdr = GetElf32SectionByIndex (ElfCt->FileBase, SectionIndex); + if ((Elf32Shdr != NULL) && (Elf32Shdr->sh_name < ElfCt->ShStrLen)) { + Name = (CHAR8 *)(ElfCt->FileBase + ElfCt->ShStrOff + Elf32Shdr->sh_name); + } + } else if (ElfCt->EiClass == ELFCLASS64) { + Elf64Shdr = GetElf64SectionByIndex (ElfCt->FileBase, SectionIndex); + if ((Elf64Shdr != NULL) && (Elf64Shdr->sh_name < ElfCt->ShStrLen)) { + Name = (CHAR8 *)(ElfCt->FileBase + ElfCt->ShStrOff + Elf64Shdr->sh_name); + } + } + + if (Name == NULL) { + return EFI_NOT_FOUND; + } + + *SectionName = Name; + return EFI_SUCCESS; +} + + +/** + Get the offset and size of x-th ELF section. + + @param[in] ElfCt ELF image context pointer. + @param[in] Index ELF section index. + @param[out] Offset Return the offset of the specific section. + @param[out] Size Return the size of the specific section. + + @retval EFI_INVALID_PARAMETER ImageBase, Offset or Size is NULL. + @retval EFI_INVALID_PARAMETER EiClass doesn't equal to ELFCLASS32 or ELFCLASS64. + @retval EFI_NOT_FOUND Could not find the section. + @retval EFI_SUCCESS Offset and Size are returned. +**/ +EFI_STATUS +EFIAPI +GetElfSectionPos ( + IN ELF_IMAGE_CONTEXT *ElfCt, + IN UINT32 Index, + OUT UINTN *Offset, + OUT UINTN *Size + ) +{ + Elf32_Shdr *Elf32Shdr; + Elf64_Shdr *Elf64Shdr; + + if ((ElfCt == NULL) || (Offset == NULL) || (Size == NULL)) { + return EFI_INVALID_PARAMETER; + } + + if (EFI_ERROR (ElfCt->ParseStatus)) { + return ElfCt->ParseStatus; + } + + if (ElfCt->EiClass == ELFCLASS32) { + Elf32Shdr = GetElf32SectionByIndex (ElfCt->FileBase, Index); + if (Elf32Shdr != NULL) { + *Offset = (UINTN)Elf32Shdr->sh_offset; + *Size = (UINTN)Elf32Shdr->sh_size; + return EFI_SUCCESS; + } + } else if (ElfCt->EiClass == ELFCLASS64) { + Elf64Shdr = GetElf64SectionByIndex (ElfCt->FileBase, Index); + if (Elf64Shdr != NULL) { + *Offset = (UINTN)Elf64Shdr->sh_offset; + *Size = (UINTN)Elf64Shdr->sh_size; + return EFI_SUCCESS; + } + } + + return EFI_NOT_FOUND; +} + +/** + Relocate all sections in a ELF image to current location. + + @param[in] ElfCt ELF image context pointer. + + @retval EFI_INVALID_PARAMETER ElfCt is NULL. + @retval EFI_UNSUPPORTED Relocation is not supported. + @retval EFI_SUCCESS ELF image was relocated successfully. +**/ +EFI_STATUS +RelocateElfSections ( + IN ELF_IMAGE_CONTEXT *ElfCt + ) +{ + EFI_STATUS Status; + + ASSERT (ElfCt != NULL); + + Status = EFI_UNSUPPORTED; + if (ElfCt->EiClass == ELFCLASS32) { + Status = RelocateElf32Sections (ElfCt); + } else if (ElfCt->EiClass == ELFCLASS64) { + Status = RelocateElf64Sections (ElfCt); + } + return Status; +} diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h new file mode 100644 index 0000000000..b4b591d2e7 --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h @@ -0,0 +1,88 @@ +/** @file + ELF library + + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef _EFI_LIB_INTERNAL_H_ +#define _EFI_LIB_INTERNAL_H_ + +#include <Library/BaseLib.h> +#include <Library/DebugLib.h> +#include <Library/BaseMemoryLib.h> +#include "ElfLib.h" +#include "ElfCommon.h" +#include "Elf32.h" +#include "Elf64.h" + +#define ELF_NEXT_ENTRY(EntryType, Current, EntrySize) \ + ((EntryType *) ((UINT8 *)Current + EntrySize)) + +Elf32_Shdr * +GetElf32SectionByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ); + +Elf64_Shdr * +GetElf64SectionByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ); + +Elf32_Phdr * +GetElf32SegmentByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ); + +Elf64_Phdr * +GetElf64SegmentByIndex ( + IN UINT8 *ImageBase, + IN UINT32 Index + ); + +/** + Load ELF image which has 32-bit architecture + + @param[in] ElfCt ELF image context pointer. + + @retval EFI_SUCCESS ELF binary is loaded successfully. + @retval Others Loading ELF binary fails. + +**/ +EFI_STATUS +LoadElf32Image ( + IN ELF_IMAGE_CONTEXT *ElfCt + ); + +/** + Load ELF image which has 64-bit architecture + + @param[in] ImageBase Memory address of an image. + @param[out] EntryPoint The entry point of loaded ELF image. + + @retval EFI_SUCCESS ELF binary is loaded successfully. + @retval Others Loading ELF binary fails. + +**/ +EFI_STATUS +LoadElf64Image ( + IN ELF_IMAGE_CONTEXT *ElfCt + ); + + +EFI_STATUS +RelocateElf32Sections ( + IN ELF_IMAGE_CONTEXT *ElfCt + ); + + +EFI_STATUS +RelocateElf64Sections ( + IN ELF_IMAGE_CONTEXT *ElfCt + ); + +#endif diff --git a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c new file mode 100644 index 0000000000..ac27fcf267 --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c @@ -0,0 +1,187 @@ +/** @file + ELF Load Image Support + +Copyright (c) 2021, Intel Corporation. All rights reserved.<BR> +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include <PiPei.h> +#include <UniversalPayload/UniversalPayload.h> +#include <UniversalPayload/ExtraData.h> + +#include <Ppi/LoadFile.h> + +#include <Library/DebugLib.h> +#include <Library/HobLib.h> +#include <Library/PeiServicesLib.h> +#include <Library/MemoryAllocationLib.h> +#include <Library/BaseMemoryLib.h> + +#include "ElfLib.h" + +/** + The wrapper function of PeiLoadImageLoadImage(). + + @param This - Pointer to EFI_PEI_LOAD_FILE_PPI. + @param FileHandle - Pointer to the FFS file header of the image. + @param ImageAddressArg - Pointer to PE/TE image. + @param ImageSizeArg - Size of PE/TE image. + @param EntryPoint - Pointer to entry point of specified image file for output. + @param AuthenticationState - Pointer to attestation authentication state of image. + + @return Status of PeiLoadImageLoadImage(). + +**/ +EFI_STATUS +EFIAPI +PeiLoadFileLoadPayload ( + IN CONST EFI_PEI_LOAD_FILE_PPI *This, + IN EFI_PEI_FILE_HANDLE FileHandle, + OUT EFI_PHYSICAL_ADDRESS *ImageAddressArg, OPTIONAL + OUT UINT64 *ImageSizeArg, OPTIONAL + OUT EFI_PHYSICAL_ADDRESS *EntryPoint, + OUT UINT32 *AuthenticationState + ) +{ + EFI_STATUS Status; + VOID *Elf; + PLD_EXTRA_DATA *ExtraData; + ELF_IMAGE_CONTEXT Context; + PLD_INFO_HEADER *PldInfo; + UINT32 Index; + UINT16 ExtraDataIndex; + CHAR8 *SectionName; + UINTN Offset; + UINTN Size; + UINT32 ExtraDataCount; + UINTN Instance; + + // + // ELF is added to file as RAW section for EDKII bootloader. + // But RAW section might be added by build tool before the ELF RAW section when alignment is specified for ELF RAW section. + // Below loop skips the RAW section that doesn't contain valid ELF image. + // + Instance = 0; + do { + Status = PeiServicesFfsFindSectionData3 (EFI_SECTION_RAW, Instance++, FileHandle, &Elf, AuthenticationState); + if (EFI_ERROR (Status)) { + return Status; + } + + ZeroMem (&Context, sizeof (Context)); + Status = ParseElfImage (Elf, &Context); + } while (EFI_ERROR (Status)); + + DEBUG (( + DEBUG_INFO, "Payload File Size: 0x%08X, Mem Size: 0x%08x, Reload: %d\n", + Context.FileSize, Context.ImageSize, Context.ReloadRequired + )); + + // + // Get PLD_INFO and number of additional PLD sections. + // + PldInfo = NULL; + ExtraDataCount = 0; + for (Index = 0; Index < Context.ShNum; Index++) { + Status = GetElfSectionName (&Context, Index, &SectionName); + if (EFI_ERROR(Status)) { + continue; + } + DEBUG ((DEBUG_ERROR, "Payload Section[%d]: %a\n", Index, SectionName)); + if (AsciiStrCmp(SectionName, PLD_INFO_SEC_NAME) == 0) { + Status = GetElfSectionPos (&Context, Index, &Offset, &Size); + if (!EFI_ERROR(Status)) { + PldInfo = (PLD_INFO_HEADER *)(Context.FileBase + Offset); + } + } else if (AsciiStrnCmp(SectionName, PLD_EXTRA_SEC_NAME_PREFIX, PLD_EXTRA_SEC_NAME_PREFIX_LENGTH) == 0) { + Status = GetElfSectionPos (&Context, Index, &Offset, &Size); + if (!EFI_ERROR (Status)) { + ExtraDataCount++; + } + } + } + + // + // Report the additional PLD sections through HOB. + // + ExtraData = BuildGuidHob ( + &gPldExtraDataGuid, + sizeof (PLD_EXTRA_DATA) + ExtraDataCount * sizeof (PLD_EXTRA_DATA_ENTRY) + ); + ExtraData->Count = ExtraDataCount; + if (ExtraDataCount != 0) { + for (ExtraDataIndex = 0, Index = 0; Index < Context.ShNum; Index++) { + Status = GetElfSectionName (&Context, Index, &SectionName); + if (EFI_ERROR(Status)) { + continue; + } + if (AsciiStrnCmp(SectionName, PLD_EXTRA_SEC_NAME_PREFIX, PLD_EXTRA_SEC_NAME_PREFIX_LENGTH) == 0) { + Status = GetElfSectionPos (&Context, Index, &Offset, &Size); + if (!EFI_ERROR (Status)) { + ASSERT (ExtraDataIndex < ExtraDataCount); + AsciiStrCpyS ( + ExtraData->Entry[ExtraDataIndex].Identifier, + sizeof(ExtraData->Entry[ExtraDataIndex].Identifier), + SectionName + PLD_EXTRA_SEC_NAME_PREFIX_LENGTH + ); + ExtraData->Entry[ExtraDataIndex].Base = (UINTN)(Context.FileBase + Offset); + ExtraData->Entry[ExtraDataIndex].Size = Size; + ExtraDataIndex++; + } + } + } + } + + if (Context.ReloadRequired || Context.PreferredImageAddress != Context.FileBase) { + Context.ImageAddress = AllocatePages (EFI_SIZE_TO_PAGES (Context.ImageSize)); + } else { + Context.ImageAddress = Context.FileBase; + } + + // + // Load ELF into the required base + // + Status = LoadElfImage (&Context); + if (!EFI_ERROR(Status)) { + *ImageAddressArg = (UINTN) Context.ImageAddress; + *EntryPoint = Context.EntryPoint; + *ImageSizeArg = Context.ImageSize; + } + return Status; +} + + +EFI_PEI_LOAD_FILE_PPI mPeiLoadFilePpi = { + PeiLoadFileLoadPayload +}; + + +EFI_PEI_PPI_DESCRIPTOR gPpiLoadFilePpiList = { + (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), + &gEfiPeiLoadFilePpiGuid, + &mPeiLoadFilePpi +}; +/** + + Install Pei Load File PPI. + + @param FileHandle Handle of the file being invoked. + @param PeiServices Describes the list of possible PEI Services. + + @retval EFI_SUCESS The entry point executes successfully. + @retval Others Some error occurs during the execution of this function. + +**/ +EFI_STATUS +EFIAPI +InitializePayloadLoaderPeim ( + IN EFI_PEI_FILE_HANDLE FileHandle, + IN CONST EFI_PEI_SERVICES **PeiServices + ) +{ + EFI_STATUS Status; + Status = PeiServicesInstallPpi (&gPpiLoadFilePpiList); + + return Status; +} diff --git a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf new file mode 100644 index 0000000000..c45f3ecf2d --- /dev/null +++ b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf @@ -0,0 +1,59 @@ +## @file +# Produce LoadFile PPI for ELF loading. +# +# Copyright (c) 2021, Intel Corporation. All rights reserved.<BR> +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = ElfLoaderPeim + FILE_GUID = D071A3B4-3EC1-40C5-BEF8-D0BD4A2446F0 + MODULE_TYPE = PEIM + VERSION_STRING = 1.0 + + ENTRY_POINT = InitializePayloadLoaderPeim + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 +# + +[Sources] + PayloadLoaderPeim.c + ElfLib.h + ElfLib/ElfLibInternal.h + ElfLib/ElfCommon.h + ElfLib/Elf32.h + ElfLib/Elf64.h + ElfLib/ElfLibInternal.h + ElfLib/ElfLib.c + ElfLib/Elf32Lib.c + ElfLib/Elf64Lib.c + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + UefiPayloadPkg/UefiPayloadPkg.dec + +[LibraryClasses] + PcdLib + MemoryAllocationLib + BaseMemoryLib + PeiServicesLib + HobLib + BaseLib + PeimEntryPoint + DebugLib + +[Ppis] + gEfiPeiLoadFilePpiGuid ## PRODUCES + +[Guids] + gPldExtraDataGuid ## PRODUCES + +[Depex] + TRUE \ No newline at end of file -- 2.31.1.windows.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 3/4] UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload 2021-05-26 8:23 ` [PATCH 3/4] UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload Ni, Ray @ 2021-06-02 4:35 ` Guo Dong 0 siblings, 0 replies; 14+ messages in thread From: Guo Dong @ 2021-06-02 4:35 UTC (permalink / raw) To: Ni, Ray, devel@edk2.groups.io; +Cc: Ma, Maurice, You, Benjamin Add 2 minor comments. And some functions comments are missing, it would be great if they could be added. > -----Original Message----- > From: Ni, Ray <ray.ni@intel.com> > Sent: Wednesday, May 26, 2021 1:23 AM > To: devel@edk2.groups.io > Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo > <guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com> > Subject: [PATCH 3/4] UefiPayloadPkg: Add PayloadLoaderPeim which can > load ELF payload > > Per universal payload spec, the payload is in ELF format. > The patch adds a payload loader that supports to load ELF image. > > The location of extra data sections whose names start with "upld." > is stored in PLD_EXTRA_DATA HOB. > > Signed-off-by: Maurice Ma <maurice.ma@intel.com> > Signed-off-by: Ray Ni <ray.ni@intel.com> > Cc: Maurice Ma <maurice.ma@intel.com> > Cc: Guo Dong <guo.dong@intel.com> > Cc: Benjamin You <benjamin.you@intel.com> > --- > UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h | 122 +++ > .../PayloadLoaderPeim/ElfLib/Elf32.h | 252 +++++ > .../PayloadLoaderPeim/ElfLib/Elf32Lib.c | 398 +++++++ > .../PayloadLoaderPeim/ElfLib/Elf64.h | 254 +++++ > .../PayloadLoaderPeim/ElfLib/Elf64Lib.c | 407 ++++++++ > .../PayloadLoaderPeim/ElfLib/ElfCommon.h | 983 ++++++++++++++++++ > .../PayloadLoaderPeim/ElfLib/ElfLib.c | 499 +++++++++ > .../PayloadLoaderPeim/ElfLib/ElfLibInternal.h | 88 ++ > .../PayloadLoaderPeim/PayloadLoaderPeim.c | 187 ++++ > .../PayloadLoaderPeim/PayloadLoaderPeim.inf | 59 ++ > 10 files changed, 3249 insertions(+) > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h > new file mode 100644 > index 0000000000..17885aac78 > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h > @@ -0,0 +1,122 @@ > +/** @file > > + ELF library > > + > > + Copyright (c) 2018 - 2021, Intel Corporation. All rights reserved.<BR> > > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#ifndef __ELF_LIB_H__ > > +#define __ELF_LIB_H__ > > + > > +#include <PiPei.h> > > + > > +#define ELF_CLASS32 1 > > +#define ELF_CLASS64 2 > > + > > +#define ELF_PT_LOAD 1 > > + > > +typedef struct { > > + RETURN_STATUS ParseStatus; ///< Return the status after > ParseElfImage(). > > + UINT8 *FileBase; ///< The source location in memory. > > + UINTN FileSize; ///< The size including sections that don't > require loading. > > + UINT8 *PreferredImageAddress; ///< The preferred image to be > loaded. No relocation is needed if loaded to this address. > > + BOOLEAN ReloadRequired; ///< The image needs a new memory > location for running. > > + UINT8 *ImageAddress; ///< The destination memory address set > by caller. > > + UINTN ImageSize; ///< The memory size for loading and > execution. > > + UINT32 EiClass; > > + UINT32 ShNum; > > + UINT32 PhNum; > > + UINTN ShStrOff; > > + UINTN ShStrLen; > > + UINTN EntryPoint; ///< Return the actual entry point after > LoadElfImage(). > > +} ELF_IMAGE_CONTEXT; > > + > > + > > +typedef struct { > > + UINT32 PtType; > > + UINTN Offset; > > + UINTN Length; > > + UINTN MemLen; > > + UINTN MemAddr; > > + UINTN Alignment; > > +} SEGMENT_INFO; > > + > > +/** > > + Parse the ELF image info. > > + > > + @param[in] ImageBase Memory address of an image. > > + @param[out] ElfCt The EFL image context pointer. > > + > > + @retval EFI_INVALID_PARAMETER Input parameters are not valid. > > + @retval EFI_UNSUPPORTED Unsupported binary type. > > + @retval EFI_LOAD_ERROR ELF binary loading error. > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +ParseElfImage ( > > + IN VOID *ImageBase, > > + OUT ELF_IMAGE_CONTEXT *ElfCt > > + ); > > + > > +/** > > + Load the ELF segments to specified address in ELF header. > > + > > + This function loads ELF image segments into memory address specified > > + in ELF program header. > > + > > + @param[in] ElfCt ELF image context pointer. > > + > > + @retval EFI_INVALID_PARAMETER Input parameters are not valid. > > + @retval EFI_UNSUPPORTED Unsupported binary type. > > + @retval EFI_LOAD_ERROR ELF binary loading error. > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +LoadElfImage ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ); > > + > > +/** > > + Get a ELF section name from its index. > > + > > + @param[in] ElfCt ELF image context pointer. > > + @param[in] SectionIndex ELF section index. > > + @param[out] SectionName The pointer to the section name. > > + > > + @retval EFI_INVALID_PARAMETER ElfCt or SecName is NULL. > > + @retval EFI_NOT_FOUND Could not find the section. > > + @retval EFI_SUCCESS Section name was filled successfully. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +GetElfSectionName ( > > + IN ELF_IMAGE_CONTEXT *ElfCt, > > + IN UINT32 SectionIndex, > > + OUT CHAR8 **SectionName > > + ); > > + > > +/** > > + Get the offset and size of x-th ELF section. > > + > > + @param[in] ElfCt ELF image context pointer. > > + @param[in] Index ELF section index. > > + @param[out] Offset Return the offset of the specific section. > > + @param[out] Size Return the size of the specific section. > > + > > + @retval EFI_INVALID_PARAMETER ImageBase, Offset or Size is NULL. > > + @retval EFI_INVALID_PARAMETER EiClass doesn't equal to ELFCLASS32 or > ELFCLASS64. > > + @retval EFI_NOT_FOUND Could not find the section. > > + @retval EFI_SUCCESS Offset and Size are returned. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +GetElfSectionPos ( > > + IN ELF_IMAGE_CONTEXT *ElfCt, > > + IN UINT32 Index, > > + OUT UINTN *Offset, > > + OUT UINTN *Size > > + ); > > +#endif /* __ELF_LIB_H__ */ > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h > new file mode 100644 > index 0000000000..ebed5f00c3 > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h > @@ -0,0 +1,252 @@ > +/** @file > > +Ported ELF include files from FreeBSD > > + > > +Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> > > +SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > + > > +**/ > > +/*- > > + * Copyright (c) 1996-1998 John D. Polstra. > > + * All rights reserved. > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + * notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyright > > + * notice, this list of conditions and the following disclaimer in the > > + * documentation and/or other materials provided with the distribution. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED > TO, THE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS > BE LIABLE > > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > SUBSTITUTE GOODS > > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING > IN ANY WAY > > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > > + * SUCH DAMAGE. > > + * > > + * $FreeBSD: src/sys/sys/elf32.h,v 1.8.14.2 2007/12/03 21:30:36 marius Exp $ > > + */ > > + > > +#ifndef _SYS_ELF32_H_ > > +#define _SYS_ELF32_H_ 1 > > + > > + > > +/* > > + * ELF definitions common to all 32-bit architectures. > > + */ > > + > > +typedef UINT32 Elf32_Addr; > > +typedef UINT16 Elf32_Half; > > +typedef UINT32 Elf32_Off; > > +typedef INT32 Elf32_Sword; > > +typedef UINT32 Elf32_Word; > > +typedef UINT64 Elf32_Lword; > > + > > +typedef Elf32_Word Elf32_Hashelt; > > + > > +/* Non-standard class-dependent datatype used for abstraction. */ > > +typedef Elf32_Word Elf32_Size; > > +typedef Elf32_Sword Elf32_Ssize; > > + > > +/* > > + * ELF header. > > + */ > > + > > +typedef struct { > > + unsigned char e_ident[EI_NIDENT]; /* File identification. */ > > + Elf32_Half e_type; /* File type. */ > > + Elf32_Half e_machine; /* Machine architecture. */ > > + Elf32_Word e_version; /* ELF format version. */ > > + Elf32_Addr e_entry; /* Entry point. */ > > + Elf32_Off e_phoff; /* Program header file offset. */ > > + Elf32_Off e_shoff; /* Section header file offset. */ > > + Elf32_Word e_flags; /* Architecture-specific flags. */ > > + Elf32_Half e_ehsize; /* Size of ELF header in bytes. */ > > + Elf32_Half e_phentsize; /* Size of program header entry. */ > > + Elf32_Half e_phnum; /* Number of program header entries. */ > > + Elf32_Half e_shentsize; /* Size of section header entry. */ > > + Elf32_Half e_shnum; /* Number of section header entries. */ > > + Elf32_Half e_shstrndx; /* Section name strings section. */ > > +} Elf32_Ehdr; > > + > > +/* > > + * Section header. > > + */ > > + > > +typedef struct { > > + Elf32_Word sh_name; /* Section name (index into the > > + section header string table). */ > > + Elf32_Word sh_type; /* Section type. */ > > + Elf32_Word sh_flags; /* Section flags. */ > > + Elf32_Addr sh_addr; /* Address in memory image. */ > > + Elf32_Off sh_offset; /* Offset in file. */ > > + Elf32_Word sh_size; /* Size in bytes. */ > > + Elf32_Word sh_link; /* Index of a related section. */ > > + Elf32_Word sh_info; /* Depends on section type. */ > > + Elf32_Word sh_addralign; /* Alignment in bytes. */ > > + Elf32_Word sh_entsize; /* Size of each entry in section. */ > > +} Elf32_Shdr; > > + > > +/* > > + * Program header. > > + */ > > + > > +typedef struct { > > + Elf32_Word p_type; /* Entry type. */ > > + Elf32_Off p_offset; /* File offset of contents. */ > > + Elf32_Addr p_vaddr; /* Virtual address in memory image. */ > > + Elf32_Addr p_paddr; /* Physical address (not used). */ > > + Elf32_Word p_filesz; /* Size of contents in file. */ > > + Elf32_Word p_memsz; /* Size of contents in memory. */ > > + Elf32_Word p_flags; /* Access permission flags. */ > > + Elf32_Word p_align; /* Alignment in memory and file. */ > > +} Elf32_Phdr; > > + > > +/* > > + * Dynamic structure. The ".dynamic" section contains an array of them. > > + */ > > + > > +typedef struct { > > + Elf32_Sword d_tag; /* Entry type. */ > > + union { > > + Elf32_Word d_val; /* Integer value. */ > > + Elf32_Addr d_ptr; /* Address value. */ > > + } d_un; > > +} Elf32_Dyn; > > + > > +/* > > + * Relocation entries. > > + */ > > + > > +/* Relocations that don't need an addend field. */ > > +typedef struct { > > + Elf32_Addr r_offset; /* Location to be relocated. */ > > + Elf32_Word r_info; /* Relocation type and symbol index. */ > > +} Elf32_Rel; > > + > > +/* Relocations that need an addend field. */ > > +typedef struct { > > + Elf32_Addr r_offset; /* Location to be relocated. */ > > + Elf32_Word r_info; /* Relocation type and symbol index. */ > > + Elf32_Sword r_addend; /* Addend. */ > > +} Elf32_Rela; > > + > > +/* Macros for accessing the fields of r_info. */ > > +#define ELF32_R_SYM(info) ((info) >> 8) > > +#define ELF32_R_TYPE(info) ((unsigned char)(info)) > > + > > +/* Macro for constructing r_info from field values. */ > > +#define ELF32_R_INFO(sym, type) (((sym) << 8) + (unsigned char)(type)) > > + > > +/* > > + * Note entry header > > + */ > > +typedef Elf_Note Elf32_Nhdr; > > + > > +/* > > + * Move entry > > + */ > > +typedef struct { > > + Elf32_Lword m_value; /* symbol value */ > > + Elf32_Word m_info; /* size + index */ > > + Elf32_Word m_poffset; /* symbol offset */ > > + Elf32_Half m_repeat; /* repeat count */ > > + Elf32_Half m_stride; /* stride info */ > > +} Elf32_Move; > > + > > +/* > > + * The macros compose and decompose values for Move.r_info > > + * > > + * sym = ELF32_M_SYM(M.m_info) > > + * size = ELF32_M_SIZE(M.m_info) > > + * M.m_info = ELF32_M_INFO(sym, size) > > + */ > > +#define ELF32_M_SYM(info) ((info)>>8) > > +#define ELF32_M_SIZE(info) ((unsigned char)(info)) > > +#define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size)) > > + > > +/* > > + * Hardware/Software capabilities entry > > + */ > > +typedef struct { > > + Elf32_Word c_tag; /* how to interpret value */ > > + union { > > + Elf32_Word c_val; > > + Elf32_Addr c_ptr; > > + } c_un; > > +} Elf32_Cap; > > + > > +/* > > + * Symbol table entries. > > + */ > > + > > +typedef struct { > > + Elf32_Word st_name; /* String table index of name. */ > > + Elf32_Addr st_value; /* Symbol value. */ > > + Elf32_Word st_size; /* Size of associated object. */ > > + unsigned char st_info; /* Type and binding information. */ > > + unsigned char st_other; /* Reserved (not used). */ > > + Elf32_Half st_shndx; /* Section index of symbol. */ > > +} Elf32_Sym; > > + > > +/* Macros for accessing the fields of st_info. */ > > +#define ELF32_ST_BIND(info) ((info) >> 4) > > +#define ELF32_ST_TYPE(info) ((info) & 0xf) > > + > > +/* Macro for constructing st_info from field values. */ > > +#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) > > + > > +/* Macro for accessing the fields of st_other. */ > > +#define ELF32_ST_VISIBILITY(oth) ((oth) & 0x3) > > + > > +/* Structures used by Sun & GNU symbol versioning. */ > > +typedef struct > > +{ > > + Elf32_Half vd_version; > > + Elf32_Half vd_flags; > > + Elf32_Half vd_ndx; > > + Elf32_Half vd_cnt; > > + Elf32_Word vd_hash; > > + Elf32_Word vd_aux; > > + Elf32_Word vd_next; > > +} Elf32_Verdef; > > + > > +typedef struct > > +{ > > + Elf32_Word vda_name; > > + Elf32_Word vda_next; > > +} Elf32_Verdaux; > > + > > +typedef struct > > +{ > > + Elf32_Half vn_version; > > + Elf32_Half vn_cnt; > > + Elf32_Word vn_file; > > + Elf32_Word vn_aux; > > + Elf32_Word vn_next; > > +} Elf32_Verneed; > > + > > +typedef struct > > +{ > > + Elf32_Word vna_hash; > > + Elf32_Half vna_flags; > > + Elf32_Half vna_other; > > + Elf32_Word vna_name; > > + Elf32_Word vna_next; > > +} Elf32_Vernaux; > > + > > +typedef Elf32_Half Elf32_Versym; > > + > > +typedef struct { > > + Elf32_Half si_boundto; /* direct bindings - symbol bound to */ > > + Elf32_Half si_flags; /* per symbol flags */ > > +} Elf32_Syminfo; > > + > > +#endif /* !_SYS_ELF32_H_ */ > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c > new file mode 100644 > index 0000000000..4d8f155881 > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c > @@ -0,0 +1,398 @@ > +/** @file > > + ELF library > > + > > + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> > > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#include "ElfLibInternal.h" > > + > > +Elf32_Shdr * > > +GetElf32SectionByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ) > > +{ > > + Elf32_Ehdr *Ehdr; > > + > > + Ehdr = (Elf32_Ehdr *)ImageBase; > > + if (Index >= Ehdr->e_shnum) { > > + return NULL; > > + } > > + > > + return (Elf32_Shdr *)(ImageBase + Ehdr->e_shoff + Index * Ehdr- > >e_shentsize); > > +} > > + > > +Elf32_Phdr * > > +GetElf32SegmentByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ) > > +{ > > + Elf32_Ehdr *Ehdr; > > + > > + Ehdr = (Elf32_Ehdr *)ImageBase; > > + if (Index >= Ehdr->e_phnum) { > > + return NULL; > > + } > > + > > + return (Elf32_Phdr *)(ImageBase + Ehdr->e_phoff + Index * Ehdr- > >e_phentsize); > > +} > > + > > +Elf32_Shdr * > > +GetElf32SectionByRange ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Offset, > > + IN UINT32 Size > > + ) > > +{ > > + UINT32 Index; > > + Elf32_Ehdr *Ehdr; > > + Elf32_Shdr *Shdr; > > + > > + Ehdr = (Elf32_Ehdr *)ImageBase; > > + > > + Shdr = (Elf32_Shdr *) (ImageBase + Ehdr->e_shoff); > > + for (Index = 0; Index < Ehdr->e_shnum; Index++) { > > + if ((Shdr->sh_offset == Offset) && (Shdr->sh_size == Size)) { > > + return Shdr; > > + } > > + Shdr = ELF_NEXT_ENTRY (Elf32_Shdr, Shdr, Ehdr->e_shentsize); > > + } > > + return NULL; > > +} > > + > > +EFI_STATUS > > +ProcessRelocation32 ( > > + IN Elf32_Rela *Rela, > > + IN UINT32 RelaSize, > > + IN UINT32 RelaEntrySize, > > + IN UINT32 RelaType, > > + IN INTN Delta, > > + IN BOOLEAN DynamicLinking > > + ) > > +{ > > + UINTN Index; > > + UINT32 *Ptr; > > + UINT32 Type; > > + > > + for ( Index = 0 > > + ; RelaEntrySize * Index < RelaSize > > + ; Index++, Rela = ELF_NEXT_ENTRY (Elf32_Rela, Rela, RelaEntrySize) > > + ) { > > + // > > + // r_offset is the virtual address of the storage unit affected by the > relocation. > > + // > > + Ptr = (UINT32 *)(UINTN)(Rela->r_offset + Delta); > > + Type = ELF32_R_TYPE(Rela->r_info); > > + switch (Type) { > > + case R_386_NONE: > > + case R_386_PC32: > > + // > > + // No fixup entry required. > > + // > > + break; > > + > > + case R_386_32: > > + if (DynamicLinking) { > > + // > > + // Dynamic section doesn't contain entries of this type. > > + // > > + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", > Type)); > > + ASSERT (FALSE); > > + } else { > > + *Ptr += (UINT32) Delta; > > + } > > + break; > > + > > + case R_386_RELATIVE: > > + if (DynamicLinking) { > > + // > > + // A: Represents the addend used to compute the value of the > relocatable field. > > + // B: Represents the base address at which a shared object has been > loaded into memory during execution. > > + // Generally, a shared object is built with a 0 base virtual address, but > the execution address will be different. > > + // > > + // B (Base Address) in ELF spec is slightly different: > > + // An executable or shared object file's base address (on platforms > that support the concept) is calculated during > > + // execution from three values: the virtual memory load address, the > maximum page size, and the lowest virtual address > > + // of a program's loadable segment. To compute the base address, > one determines the memory address associated with the > > + // lowest p_vaddr value for a PT_LOAD segment. This address is > truncated to the nearest multiple of the maximum page size. > > + // The corresponding p_vaddr value itself is also truncated to the > nearest multiple of the maximum page size. > > + // > > + // *** The base address is the difference between the truncated > memory address and the truncated p_vaddr value. *** > > + // > > + // Delta in this function is B. > > + // > > + // Calculation: B + A > > + // > > + if (RelaType == SHT_RELA) { > > + ASSERT (*Ptr == 0); > > + *Ptr = (UINT32) Delta + Rela->r_addend; > > + } else { > > + // > > + // A is stored in the field of relocation for REL type. > > + // > > + *Ptr = (UINT32) Delta + *Ptr; > > + } > > + } else { > > + // > > + // non-Dynamic section doesn't contain entries of this type. > > + // > > + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", > Type)); > > + ASSERT (FALSE); > > + } > > + break; > > + > > + default: > > + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); > > + } > > + } > > + return EFI_SUCCESS; > > +} > > + > > +EFI_STATUS > > +RelocateElf32Dynamic ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + UINT32 Index; > > + Elf32_Phdr *Phdr; > > + Elf32_Shdr *DynShdr; > > + Elf32_Shdr *RelShdr; > > + Elf32_Dyn *Dyn; > > + UINT32 RelaOffset; > > + UINT32 RelaCount; > > + UINT32 RelaSize; > > + UINT32 RelaEntrySize; > > + UINT32 RelaType; > > + > > + // > > + // 1. Locate the dynamic section. > > + // > > + // If an object file participates in dynamic linking, its program header table > > + // will have an element of type PT_DYNAMIC. > > + // This ``segment'' contains the .dynamic section. A special symbol, > _DYNAMIC, > > + // labels the section, which contains an array of Elf32_Dyn or Elf64_Dyn. > > + // > > + DynShdr = NULL; > > + for (Index = 0; Index < ElfCt->PhNum; Index++) { > > + Phdr = GetElf32SegmentByIndex (ElfCt->FileBase, Index); > > + ASSERT (Phdr != NULL); > > + if (Phdr->p_type == PT_DYNAMIC) { > > + // > > + // Verify the existence of the dynamic section. > > + // > > + DynShdr = GetElf32SectionByRange (ElfCt->FileBase, Phdr->p_offset, > Phdr->p_filesz); > > + break; > > + } > > + } > > + > > + // > > + // It's abnormal a DYN ELF doesn't contain a dynamic section. > > + // > > + ASSERT (DynShdr != NULL); > > + if (DynShdr == NULL) { > > + return EFI_UNSUPPORTED; > > + } > > + ASSERT (DynShdr->sh_type == SHT_DYNAMIC); > > + ASSERT (DynShdr->sh_entsize >= sizeof (*Dyn)); > > + > > + // > > + // 2. Locate the relocation section from the dynamic section. > > + // > > + RelaOffset = MAX_UINT32; > > + RelaSize = 0; > > + RelaCount = 0; > > + RelaEntrySize = 0; > > + RelaType = 0; > > + for ( Index = 0, Dyn = (Elf32_Dyn *) (ElfCt->FileBase + DynShdr->sh_offset) > > + ; Index < DynShdr->sh_size / DynShdr->sh_entsize > > + ; Index++, Dyn = ELF_NEXT_ENTRY (Elf32_Dyn, Dyn, DynShdr- > >sh_entsize) > > + ) { > > + switch (Dyn->d_tag) { > > + case DT_RELA: > > + case DT_REL: > > + // > > + // DT_REL represent program virtual addresses. > > + // A file's virtual addresses might not match the memory virtual > addresses during execution. > > + // When interpreting addresses contained in the dynamic structure, the > dynamic linker computes actual addresses, > > + // based on the original file value and the memory base address. > > + // For consistency, files do not contain relocation entries to ``correct'' > addresses in the dynamic structure. > > + // > > + RelaOffset = Dyn->d_un.d_ptr - (UINT32) (UINTN) ElfCt- > >PreferredImageAddress; > > + RelaType = (Dyn->d_tag == DT_RELA) ? SHT_RELA: SHT_REL; > > + break; > > + case DT_RELACOUNT: > > + case DT_RELCOUNT: > > + RelaCount = Dyn->d_un.d_val; > > + break; > > + case DT_RELENT: > > + case DT_RELAENT: > > + RelaEntrySize = Dyn->d_un.d_val; > > + break; > > + case DT_RELSZ: > > + case DT_RELASZ: > > + RelaSize = Dyn->d_un.d_val; > > + break; > > + default: > > + break; > > + } > > + } > > + > > + if (RelaOffset == MAX_UINT64) { > > + ASSERT (RelaCount == 0); > > + ASSERT (RelaEntrySize == 0); > > + ASSERT (RelaSize == 0); > > + // > > + // It's fine that a DYN ELF doesn't contain relocation section. > > + // > > + return EFI_SUCCESS; > > + } > > + > > + // > > + // Verify the existence of the relocation section. > > + // > > + RelShdr = GetElf32SectionByRange (ElfCt->FileBase, RelaOffset, RelaSize); > > + ASSERT (RelShdr != NULL); > > + if (RelShdr == NULL) { > > + return EFI_UNSUPPORTED; > > + } > > + ASSERT (RelShdr->sh_type == RelaType); > > + ASSERT (RelShdr->sh_entsize == RelaEntrySize); > > + > > + // > > + // 3. Process the relocation section. > > + // > > + ProcessRelocation32 ( > > + (Elf32_Rela *) (ElfCt->FileBase + RelShdr->sh_offset), > > + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, > > + (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt->PreferredImageAddress, > > + TRUE > > + ); > > + return EFI_SUCCESS; > > +} > > + > > +EFI_STATUS > > +RelocateElf32Sections ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + EFI_STATUS Status; > > + Elf32_Ehdr *Ehdr; > > + Elf32_Shdr *RelShdr; > > + Elf32_Shdr *Shdr; > > + UINT32 Index; > > + UINTN Delta; > > + > > + Ehdr = (Elf32_Ehdr *)ElfCt->FileBase; > > + if (Ehdr->e_machine != EM_386) { > > + return EFI_UNSUPPORTED; > > + } > > + > > + Delta = (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt- > >PreferredImageAddress; > > + ElfCt->EntryPoint = (UINTN)(Ehdr->e_entry + Delta); > > + > > + // > > + // 1. Relocate dynamic ELF using the relocation section pointed by dynamic > section > > + // > > + if (Ehdr->e_type == ET_DYN) { > > + DEBUG ((DEBUG_INFO, "DYN ELF: Relocate using dynamic sections...\n")); > > + Status = RelocateElf32Dynamic (ElfCt); > > + ASSERT_EFI_ERROR (Status); > > + return Status; > > + } > > + > > + // > > + // 2. Executable ELF: Fix up the delta between actual image address and > preferred image address. > > + // > > + // Linker already fixed up EXEC ELF based on the preferred image address. > > + // A ELF loader in modern OS only loads it into the preferred image > address. > > + // The below relocation is unneeded in that case. > > + // But the ELF loader in firmware supports to load the image to a different > address. > > + // The below relocation is needed in this case. > > + // > > + DEBUG ((DEBUG_INFO, "EXEC ELF: Fix actual/preferred base address > delta ...\n")); > > + for ( Index = 0, RelShdr = (Elf32_Shdr *) (ElfCt->FileBase + Ehdr->e_shoff) > > + ; Index < Ehdr->e_shnum > > + ; Index++, RelShdr = ELF_NEXT_ENTRY (Elf32_Shdr, RelShdr, Ehdr- > >e_shentsize) > > + ) { > > + if ((RelShdr->sh_type != SHT_REL) && (RelShdr->sh_type != SHT_RELA)) { > > + continue; > > + } > > + Shdr = GetElf32SectionByIndex (ElfCt->FileBase, RelShdr->sh_info); > > + if ((Shdr->sh_flags & SHF_ALLOC) == SHF_ALLOC) { > > + // > > + // Only fix up sections that occupy memory during process execution. > > + // > > + ProcessRelocation32 ( > > + (Elf32_Rela *)((UINT8*)Ehdr + RelShdr->sh_offset), > > + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, > > + Delta, FALSE > > + ); > > + } > > + } > > + > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Load ELF image which has 32-bit architecture. > > + > > + Caller should set Context.ImageAddress to a proper value, either pointing > to > > + a new allocated memory whose size equal to Context.ImageSize, or > pointing > > + to Context.PreferredImageAddress. > > + > > + @param[in] ElfCt ELF image context pointer. > > + > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > + @retval Others Loading ELF binary fails. > > + > > +**/ > > +EFI_STATUS > > +LoadElf32Image ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + Elf32_Ehdr *Ehdr; > > + Elf32_Phdr *Phdr; > > + UINT16 Index; > > + UINTN Delta; > > + > > + ASSERT (ElfCt != NULL); > > + > > + // > > + // Per the sprit of ELF, loading to memory only consumes info from > program headers. > > + // > > + Ehdr = (Elf32_Ehdr *)ElfCt->FileBase; > > + > > + for ( Index = 0, Phdr = (Elf32_Phdr *)(ElfCt->FileBase + Ehdr->e_phoff) > > + ; Index < Ehdr->e_phnum > > + ; Index++, Phdr = ELF_NEXT_ENTRY (Elf32_Phdr, Phdr, Ehdr- > >e_phentsize) > > + ) { > > + // > > + // Skip segments that don't require load (type tells, or size is 0) > > + // > > + if ((Phdr->p_type != PT_LOAD) || > > + (Phdr->p_memsz == 0)) { > > + continue; > > + } > > + > > + // > > + // The memory offset of segment relative to the image base > > + // Note: CopyMem() does nothing when the dst equals to src. > > + // > > + Delta = Phdr->p_paddr - (UINT32) (UINTN) ElfCt- > >PreferredImageAddress; > > + CopyMem (ElfCt->ImageAddress + Delta, ElfCt->FileBase + Phdr- > >p_offset, Phdr->p_filesz); > > + ZeroMem (ElfCt->ImageAddress + Delta + Phdr->p_filesz, Phdr- > >p_memsz - Phdr->p_filesz); > > + } > > + > > + // > > + // Relocate when new new image base is not the preferred image base. > > + // > > + if (ElfCt->ImageAddress != ElfCt->PreferredImageAddress) { > > + RelocateElf32Sections (ElfCt); > > + } > > + > > + return EFI_SUCCESS; > > +} > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h > new file mode 100644 > index 0000000000..d64dc64a6a > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h > @@ -0,0 +1,254 @@ > +/** @file > > +Ported ELF include files from FreeBSD > > + > > +Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> > > +SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > +/*- > > + * Copyright (c) 1996-1998 John D. Polstra. > > + * All rights reserved. > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + * notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyright > > + * notice, this list of conditions and the following disclaimer in the > > + * documentation and/or other materials provided with the distribution. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED > TO, THE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS > BE LIABLE > > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > SUBSTITUTE GOODS > > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING > IN ANY WAY > > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > > + * SUCH DAMAGE. > > + * > > + * $FreeBSD: src/sys/sys/elf64.h,v 1.10.14.2 2007/12/03 21:30:36 marius Exp > $ > > + */ > > + > > +#ifndef _SYS_ELF64_H_ > > +#define _SYS_ELF64_H_ 1 > > + > > + > > +/* > > + * ELF definitions common to all 64-bit architectures. > > + */ > > + > > +typedef UINT64 Elf64_Addr; > > +typedef UINT16 Elf64_Half; > > +typedef UINT64 Elf64_Off; > > +typedef INT32 Elf64_Sword; > > +typedef INT64 Elf64_Sxword; > > +typedef UINT32 Elf64_Word; > > +typedef UINT64 Elf64_Lword; > > +typedef UINT64 Elf64_Xword; > > + > > +/* > > + * Types of dynamic symbol hash table bucket and chain elements. > > + * > > + * This is inconsistent among 64 bit architectures, so a machine dependent > > + * typedef is required. > > + */ > > + > > +typedef Elf64_Word Elf64_Hashelt; > > + > > +/* Non-standard class-dependent datatype used for abstraction. */ > > +typedef Elf64_Xword Elf64_Size; > > +typedef Elf64_Sxword Elf64_Ssize; > > + > > +/* > > + * ELF header. > > + */ > > + > > +typedef struct { > > + unsigned char e_ident[EI_NIDENT]; /* File identification. */ > > + Elf64_Half e_type; /* File type. */ > > + Elf64_Half e_machine; /* Machine architecture. */ > > + Elf64_Word e_version; /* ELF format version. */ > > + Elf64_Addr e_entry; /* Entry point. */ > > + Elf64_Off e_phoff; /* Program header file offset. */ > > + Elf64_Off e_shoff; /* Section header file offset. */ > > + Elf64_Word e_flags; /* Architecture-specific flags. */ > > + Elf64_Half e_ehsize; /* Size of ELF header in bytes. */ > > + Elf64_Half e_phentsize; /* Size of program header entry. */ > > + Elf64_Half e_phnum; /* Number of program header entries. */ > > + Elf64_Half e_shentsize; /* Size of section header entry. */ > > + Elf64_Half e_shnum; /* Number of section header entries. */ > > + Elf64_Half e_shstrndx; /* Section name strings section. */ > > +} Elf64_Ehdr; > > + > > +/* > > + * Section header. > > + */ > > + > > +typedef struct { > > + Elf64_Word sh_name; /* Section name (index into the > > + section header string table). */ > > + Elf64_Word sh_type; /* Section type. */ > > + Elf64_Xword sh_flags; /* Section flags. */ > > + Elf64_Addr sh_addr; /* Address in memory image. */ > > + Elf64_Off sh_offset; /* Offset in file. */ > > + Elf64_Xword sh_size; /* Size in bytes. */ > > + Elf64_Word sh_link; /* Index of a related section. */ > > + Elf64_Word sh_info; /* Depends on section type. */ > > + Elf64_Xword sh_addralign; /* Alignment in bytes. */ > > + Elf64_Xword sh_entsize; /* Size of each entry in section. */ > > +} Elf64_Shdr; > > + > > +/* > > + * Program header. > > + */ > > + > > +typedef struct { > > + Elf64_Word p_type; /* Entry type. */ > > + Elf64_Word p_flags; /* Access permission flags. */ > > + Elf64_Off p_offset; /* File offset of contents. */ > > + Elf64_Addr p_vaddr; /* Virtual address in memory image. */ > > + Elf64_Addr p_paddr; /* Physical address (not used). */ > > + Elf64_Xword p_filesz; /* Size of contents in file. */ > > + Elf64_Xword p_memsz; /* Size of contents in memory. */ > > + Elf64_Xword p_align; /* Alignment in memory and file. */ > > +} Elf64_Phdr; > > + > > +/* > > + * Dynamic structure. The ".dynamic" section contains an array of them. > > + */ > > + > > +typedef struct { > > + Elf64_Sxword d_tag; /* Entry type. */ > > + union { > > + Elf64_Xword d_val; /* Integer value. */ > > + Elf64_Addr d_ptr; /* Address value. */ > > + } d_un; > > +} Elf64_Dyn; > > + > > +/* > > + * Relocation entries. > > + */ > > + > > +/* Relocations that don't need an addend field. */ > > +typedef struct { > > + Elf64_Addr r_offset; /* Location to be relocated. */ > > + Elf64_Xword r_info; /* Relocation type and symbol index. */ > > +} Elf64_Rel; > > + > > +/* Relocations that need an addend field. */ > > +typedef struct { > > + Elf64_Addr r_offset; /* Location to be relocated. */ > > + Elf64_Xword r_info; /* Relocation type and symbol index. */ > > + Elf64_Sxword r_addend; /* Addend. */ > > +} Elf64_Rela; > > + > > +/* Macros for accessing the fields of r_info. */ > > +#define ELF64_R_SYM(info) ((UINT32) RShiftU64 ((info), 32)) > > +#define ELF64_R_TYPE(info) ((info) & 0xffffffffL) > > + > > +/* Macro for constructing r_info from field values. */ > > +#define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL)) > > + > > +#define ELF64_R_TYPE_DATA(info) (((Elf64_Xword)(info)<<32)>>40) > > +#define ELF64_R_TYPE_ID(info) (((Elf64_Xword)(info)<<56)>>56) > > +#define ELF64_R_TYPE_INFO(data, type) \ > > + (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type)) > > + > > +/* > > + * Note entry header > > + */ > > +typedef Elf_Note Elf64_Nhdr; > > + > > +/* > > + * Move entry > > + */ > > +typedef struct { > > + Elf64_Lword m_value; /* symbol value */ > > + Elf64_Xword m_info; /* size + index */ > > + Elf64_Xword m_poffset; /* symbol offset */ > > + Elf64_Half m_repeat; /* repeat count */ > > + Elf64_Half m_stride; /* stride info */ > > +} Elf64_Move; > > + > > +#define ELF64_M_SYM(info) ((info)>>8) > > +#define ELF64_M_SIZE(info) ((unsigned char)(info)) > > +#define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size)) > > + > > +/* > > + * Hardware/Software capabilities entry > > + */ > > +typedef struct { > > + Elf64_Xword c_tag; /* how to interpret value */ > > + union { > > + Elf64_Xword c_val; > > + Elf64_Addr c_ptr; > > + } c_un; > > +} Elf64_Cap; > > + > > +/* > > + * Symbol table entries. > > + */ > > + > > +typedef struct { > > + Elf64_Word st_name; /* String table index of name. */ > > + unsigned char st_info; /* Type and binding information. */ > > + unsigned char st_other; /* Reserved (not used). */ > > + Elf64_Half st_shndx; /* Section index of symbol. */ > > + Elf64_Addr st_value; /* Symbol value. */ > > + Elf64_Xword st_size; /* Size of associated object. */ > > +} Elf64_Sym; > > + > > +/* Macros for accessing the fields of st_info. */ > > +#define ELF64_ST_BIND(info) ((info) >> 4) > > +#define ELF64_ST_TYPE(info) ((info) & 0xf) > > + > > +/* Macro for constructing st_info from field values. */ > > +#define ELF64_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf)) > > + > > +/* Macro for accessing the fields of st_other. */ > > +#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3) > > + > > +/* Structures used by Sun & GNU-style symbol versioning. */ > > +typedef struct { > > + Elf64_Half vd_version; > > + Elf64_Half vd_flags; > > + Elf64_Half vd_ndx; > > + Elf64_Half vd_cnt; > > + Elf64_Word vd_hash; > > + Elf64_Word vd_aux; > > + Elf64_Word vd_next; > > +} Elf64_Verdef; > > + > > +typedef struct { > > + Elf64_Word vda_name; > > + Elf64_Word vda_next; > > +} Elf64_Verdaux; > > + > > +typedef struct { > > + Elf64_Half vn_version; > > + Elf64_Half vn_cnt; > > + Elf64_Word vn_file; > > + Elf64_Word vn_aux; > > + Elf64_Word vn_next; > > +} Elf64_Verneed; > > + > > +typedef struct { > > + Elf64_Word vna_hash; > > + Elf64_Half vna_flags; > > + Elf64_Half vna_other; > > + Elf64_Word vna_name; > > + Elf64_Word vna_next; > > +} Elf64_Vernaux; > > + > > +typedef Elf64_Half Elf64_Versym; > > + > > +typedef struct { > > + Elf64_Half si_boundto; /* direct bindings - symbol bound to */ > > + Elf64_Half si_flags; /* per symbol flags */ > > +} Elf64_Syminfo; > > + > > +#endif /* !_SYS_ELF64_H_ */ > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c > new file mode 100644 > index 0000000000..c3fb252c7e > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c > @@ -0,0 +1,407 @@ > +/** @file > > + ELF library > > + > > + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> > > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#include "ElfLibInternal.h" > > + > > +Elf64_Shdr * > > +GetElf64SectionByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ) > > +{ > > + Elf64_Ehdr *Ehdr; > > + > > + Ehdr = (Elf64_Ehdr *)ImageBase; > > + if (Index >= Ehdr->e_shnum) { > > + return NULL; > > + } > > + > > + return (Elf64_Shdr *)(ImageBase + Ehdr->e_shoff + Index * Ehdr- > >e_shentsize); > > +} > > + > > +Elf64_Phdr * > > +GetElf64SegmentByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ) > > +{ > > + Elf64_Ehdr *Ehdr; > > + > > + Ehdr = (Elf64_Ehdr *)ImageBase; > > + if (Index >= Ehdr->e_phnum) { > > + return NULL; > > + } > > + > > + return (Elf64_Phdr *)(ImageBase + Ehdr->e_phoff + Index * Ehdr- > >e_phentsize); > > +} > > + > > +Elf64_Shdr * > > +GetElf64SectionByRange ( > > + IN UINT8 *ImageBase, > > + IN UINT64 Offset, > > + IN UINT64 Size > > + ) > > +{ > > + UINT32 Index; > > + Elf64_Ehdr *Ehdr; > > + Elf64_Shdr *Shdr; > > + > > + Ehdr = (Elf64_Ehdr *)ImageBase; > > + > > + Shdr = (Elf64_Shdr *) (ImageBase + Ehdr->e_shoff); > > + for (Index = 0; Index < Ehdr->e_shnum; Index++) { > > + if ((Shdr->sh_offset == Offset) && (Shdr->sh_size == Size)) { > > + return Shdr; > > + } > > + Shdr = ELF_NEXT_ENTRY (Elf64_Shdr, Shdr, Ehdr->e_shentsize); > > + } > > + return NULL; > > +} > > + > > +EFI_STATUS > > +ProcessRelocation64 ( > > + IN Elf64_Rela *Rela, > > + IN UINT64 RelaSize, > > + IN UINT64 RelaEntrySize, > > + IN UINT64 RelaType, > > + IN INTN Delta, > > + IN BOOLEAN DynamicLinking > > + ) > > +{ > > + UINTN Index; > > + UINT64 *Ptr; > > + UINT32 Type; > > + > > + for ( Index = 0 > > + ; MultU64x64 (RelaEntrySize, Index) < RelaSize > > + ; Index++, Rela = ELF_NEXT_ENTRY (Elf64_Rela, Rela, RelaEntrySize) > > + ) { > > + // > > + // r_offset is the virtual address of the storage unit affected by the > relocation. > > + // > > + Ptr = (UINT64 *)(UINTN)(Rela->r_offset + Delta); > > + Type = ELF64_R_TYPE(Rela->r_info); > > + switch (Type) { > > + case R_X86_64_NONE: > > + case R_X86_64_PC32: > > + case R_X86_64_PLT32: > > + case R_X86_64_GOTPCREL: > > + case R_X86_64_GOTPCRELX: > > + case R_X86_64_REX_GOTPCRELX: > > + break; > > + > > + case R_X86_64_64: > > + if (DynamicLinking) { > > + // > > + // Dynamic section doesn't contain entries of this type. > > + // > > + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", > Type)); > > + ASSERT (FALSE); > > + } else { > > + *Ptr += Delta; > > + } > > + break; > > + > > + case R_X86_64_32: > > + // > > + // Dynamic section doesn't contain entries of this type. > > + // > > + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); > > + ASSERT (FALSE); > > + break; > > + > > + case R_X86_64_RELATIVE: > > + if (DynamicLinking) { > > + // > > + // A: Represents the addend used to compute the value of the > relocatable field. > > + // B: Represents the base address at which a shared object has been > loaded into memory during execution. > > + // Generally, a shared object is built with a 0 base virtual address, but > the execution address will be different. > > + // > > + // B (Base Address) in ELF spec is slightly different: > > + // An executable or shared object file's base address (on platforms > that support the concept) is calculated during > > + // execution from three values: the virtual memory load address, the > maximum page size, and the lowest virtual address > > + // of a program's loadable segment. To compute the base address, > one determines the memory address associated with the > > + // lowest p_vaddr value for a PT_LOAD segment. This address is > truncated to the nearest multiple of the maximum page size. > > + // The corresponding p_vaddr value itself is also truncated to the > nearest multiple of the maximum page size. > > + // > > + // *** The base address is the difference between the truncated > memory address and the truncated p_vaddr value. *** > > + // > > + // Delta in this function is B. > > + // > > + // Calculation: B + A > > + // > > + if (RelaType == SHT_RELA) { > > + ASSERT (*Ptr == 0); > > + *Ptr = Delta + Rela->r_addend; > > + } else { > > + // > > + // A is stored in the field of relocation for REL type. > > + // > > + *Ptr = Delta + *Ptr; > > + } > > + } else { > > + // > > + // non-Dynamic section doesn't contain entries of this type. > > + // > > + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", > Type)); > > + ASSERT (FALSE); > > + } > > + break; > > + > > + default: > > + DEBUG ((DEBUG_INFO, "Unsupported relocation type %02X\n", Type)); > > + } > > + } > > + return EFI_SUCCESS; > > +} > > + > > +EFI_STATUS > > +RelocateElf64Dynamic ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + UINT32 Index; > > + Elf64_Phdr *Phdr; > > + Elf64_Shdr *DynShdr; > > + Elf64_Shdr *RelShdr; > > + Elf64_Dyn *Dyn; > > + UINT64 RelaOffset; > > + UINT64 RelaCount; > > + UINT64 RelaSize; > > + UINT64 RelaEntrySize; > > + UINT64 RelaType; > > + > > + // > > + // 1. Locate the dynamic section. > > + // > > + // If an object file participates in dynamic linking, its program header table > > + // will have an element of type PT_DYNAMIC. > > + // This ``segment'' contains the .dynamic section. A special symbol, > _DYNAMIC, > > + // labels the section, which contains an array of Elf32_Dyn or Elf64_Dyn. > > + // > > + DynShdr = NULL; > > + for (Index = 0; Index < ElfCt->PhNum; Index++) { > > + Phdr = GetElf64SegmentByIndex (ElfCt->FileBase, Index); > > + ASSERT (Phdr != NULL); > > + if (Phdr->p_type == PT_DYNAMIC) { > > + // > > + // Verify the existence of the dynamic section. > > + // > > + DynShdr = GetElf64SectionByRange (ElfCt->FileBase, Phdr->p_offset, > Phdr->p_filesz); > > + break; > > + } > > + } > > + > > + // > > + // It's abnormal a DYN ELF doesn't contain a dynamic section. > > + // > > + ASSERT (DynShdr != NULL); > > + if (DynShdr == NULL) { > > + return EFI_UNSUPPORTED; > > + } > > + ASSERT (DynShdr->sh_type == SHT_DYNAMIC); > > + ASSERT (DynShdr->sh_entsize >= sizeof (*Dyn)); > > + > > + // > > + // 2. Locate the relocation section from the dynamic section. > > + // > > + RelaOffset = MAX_UINT64; > > + RelaSize = 0; > > + RelaCount = 0; > > + RelaEntrySize = 0; > > + RelaType = 0; > > + for ( Index = 0, Dyn = (Elf64_Dyn *) (ElfCt->FileBase + DynShdr->sh_offset) > > + ; Index < DivU64x64Remainder (DynShdr->sh_size, DynShdr->sh_entsize, > NULL) > > + ; Index++, Dyn = ELF_NEXT_ENTRY (Elf64_Dyn, Dyn, DynShdr- > >sh_entsize) > > + ) { > > + switch (Dyn->d_tag) { > > + case DT_RELA: > > + case DT_REL: > > + // > > + // DT_REL represent program virtual addresses. > > + // A file's virtual addresses might not match the memory virtual > addresses during execution. > > + // When interpreting addresses contained in the dynamic structure, the > dynamic linker computes actual addresses, > > + // based on the original file value and the memory base address. > > + // For consistency, files do not contain relocation entries to ``correct'' > addresses in the dynamic structure. > > + // > > + RelaOffset = Dyn->d_un.d_ptr - (UINTN) ElfCt- > >PreferredImageAddress; > > + RelaType = (Dyn->d_tag == DT_RELA) ? SHT_RELA: SHT_REL; > > + break; > > + case DT_RELACOUNT: > > + case DT_RELCOUNT: > > + RelaCount = Dyn->d_un.d_val; > > + break; > > + case DT_RELENT: > > + case DT_RELAENT: > > + RelaEntrySize = Dyn->d_un.d_val; > > + break; > > + case DT_RELSZ: > > + case DT_RELASZ: > > + RelaSize = Dyn->d_un.d_val; > > + break; > > + default: > > + break; > > + } > > + } > > + > > + if (RelaOffset == MAX_UINT64) { > > + ASSERT (RelaCount == 0); > > + ASSERT (RelaEntrySize == 0); > > + ASSERT (RelaSize == 0); > > + // > > + // It's fine that a DYN ELF doesn't contain relocation section. > > + // > > + return EFI_SUCCESS; > > + } > > + > > + // > > + // Verify the existence of the relocation section. > > + // > > + RelShdr = GetElf64SectionByRange (ElfCt->FileBase, RelaOffset, RelaSize); > > + ASSERT (RelShdr != NULL); > > + if (RelShdr == NULL) { > > + return EFI_UNSUPPORTED; > > + } > > + ASSERT (RelShdr->sh_type == RelaType); > > + ASSERT (RelShdr->sh_entsize == RelaEntrySize); > > + > > + // > > + // 3. Process the relocation section. > > + // > > + ProcessRelocation64 ( > > + (Elf64_Rela *) (ElfCt->FileBase + RelShdr->sh_offset), > > + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, > > + (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt->PreferredImageAddress, > > + TRUE > > + ); > > + return EFI_SUCCESS; > > +} > > + > > +EFI_STATUS > > +RelocateElf64Sections ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + EFI_STATUS Status; > > + Elf64_Ehdr *Ehdr; > > + Elf64_Shdr *RelShdr; > > + Elf64_Shdr *Shdr; > > + UINT32 Index; > > + UINTN Delta; > > + > > + Ehdr = (Elf64_Ehdr *)ElfCt->FileBase; > > + if (Ehdr->e_machine != EM_X86_64) { > > + return EFI_UNSUPPORTED; > > + } > > + > > + Delta = (UINTN) ElfCt->ImageAddress - (UINTN) ElfCt- > >PreferredImageAddress; > > + ElfCt->EntryPoint = (UINTN)(Ehdr->e_entry + Delta); > > + > > + // > > + // 1. Relocate dynamic ELF using the relocation section pointed by dynamic > section > > + // > > + if (Ehdr->e_type == ET_DYN) { > > + DEBUG ((DEBUG_INFO, "DYN ELF: Relocate using dynamic sections...\n")); > > + Status = RelocateElf64Dynamic (ElfCt); > > + ASSERT_EFI_ERROR (Status); > > + return Status; > > + } > > + > > + // > > + // 2. Executable ELF: Fix up the delta between actual image address and > preferred image address. > > + // > > + // Linker already fixed up EXEC ELF based on the preferred image address. > > + // A ELF loader in modern OS only loads it into the preferred image > address. > > + // The below relocation is unneeded in that case. > > + // But the ELF loader in firmware supports to load the image to a different > address. > > + // The below relocation is needed in this case. > > + // > > + DEBUG ((DEBUG_INFO, "EXEC ELF: Fix actual/preferred base address > delta ...\n")); > > + for ( Index = 0, RelShdr = (Elf64_Shdr *) (ElfCt->FileBase + Ehdr->e_shoff) > > + ; Index < Ehdr->e_shnum > > + ; Index++, RelShdr = ELF_NEXT_ENTRY (Elf64_Shdr, RelShdr, Ehdr- > >e_shentsize) > > + ) { > > + if ((RelShdr->sh_type != SHT_REL) && (RelShdr->sh_type != SHT_RELA)) { > > + continue; > > + } > > + Shdr = GetElf64SectionByIndex (ElfCt->FileBase, RelShdr->sh_info); > > + if ((Shdr->sh_flags & SHF_ALLOC) == SHF_ALLOC) { > > + // > > + // Only fix up sections that occupy memory during process execution. > > + // > > + ProcessRelocation64 ( > > + (Elf64_Rela *)((UINT8*)Ehdr + RelShdr->sh_offset), > > + RelShdr->sh_size, RelShdr->sh_entsize, RelShdr->sh_type, > > + Delta, FALSE > > + ); > > + } > > + } > > + > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Load ELF image which has 64-bit architecture. > > + > > + Caller should set Context.ImageAddress to a proper value, either pointing > to > > + a new allocated memory whose size equal to Context.ImageSize, or > pointing > > + to Context.PreferredImageAddress. > > + > > + @param[in] ElfCt ELF image context pointer. > > + > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > + @retval Others Loading ELF binary fails. > > + > > +**/ > > +EFI_STATUS > > +LoadElf64Image ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + Elf64_Ehdr *Ehdr; > > + Elf64_Phdr *Phdr; > > + UINT16 Index; > > + UINTN Delta; > > + > > + ASSERT (ElfCt != NULL); > > + > > + // > > + // Per the sprit of ELF, loading to memory only consumes info from > program headers. > > + // > > + Ehdr = (Elf64_Ehdr *)ElfCt->FileBase; > > + > > + for ( Index = 0, Phdr = (Elf64_Phdr *)(ElfCt->FileBase + Ehdr->e_phoff) > > + ; Index < Ehdr->e_phnum > > + ; Index++, Phdr = ELF_NEXT_ENTRY (Elf64_Phdr, Phdr, Ehdr- > >e_phentsize) > > + ) { > > + // > > + // Skip segments that don't require load (type tells, or size is 0) > > + // > > + if ((Phdr->p_type != PT_LOAD) || > > + (Phdr->p_memsz == 0)) { > > + continue; > > + } > > + > > + // > > + // The memory offset of segment relative to the image base > > + // Note: CopyMem() does nothing when the dst equals to src. > > + // > > + Delta = (UINTN) Phdr->p_paddr - (UINTN) ElfCt->PreferredImageAddress; > > + CopyMem (ElfCt->ImageAddress + Delta, ElfCt->FileBase + (UINTN) Phdr- > >p_offset, (UINTN) Phdr->p_filesz); > > + ZeroMem (ElfCt->ImageAddress + Delta + (UINTN) Phdr->p_filesz, > (UINTN) (Phdr->p_memsz - Phdr->p_filesz)); > > + } > > + > > + // > > + // Relocate when new new image base is not the preferred image base. > > + // > > + if (ElfCt->ImageAddress != ElfCt->PreferredImageAddress) { > > + RelocateElf64Sections (ElfCt); > > + } > > + > > + return EFI_SUCCESS; > > +} > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h > new file mode 100644 > index 0000000000..15c9e33d3f > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h > @@ -0,0 +1,983 @@ > +/** @file > > +Ported ELF include files from FreeBSD > > + > > +Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR> > > +Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR> > > +SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > + > > +**/ > > +/*- > > + * Copyright (c) 1998 John D. Polstra. > > + * All rights reserved. > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + * notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyright > > + * notice, this list of conditions and the following disclaimer in the > > + * documentation and/or other materials provided with the distribution. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS > IS'' AND > > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED > TO, THE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A > PARTICULAR PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS > BE LIABLE > > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > SUBSTITUTE GOODS > > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > INTERRUPTION) > > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > CONTRACT, STRICT > > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING > IN ANY WAY > > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > > + * SUCH DAMAGE. > > + * > > + * $FreeBSD: src/sys/sys/elf_common.h,v 1.15.8.2 2007/12/03 21:30:36 > marius Exp $ > > + */ > > + > > +#ifndef _SYS_ELF_COMMON_H_ > > +#define _SYS_ELF_COMMON_H_ 1 > > + > > +/* > > + * ELF definitions that are independent of architecture or word size. > > + */ > > + > > +/* > > + * Note header. The ".note" section contains an array of notes. Each > > + * begins with this header, aligned to a word boundary. Immediately > > + * following the note header is n_namesz bytes of name, padded to the > > + * next word boundary. Then comes n_descsz bytes of descriptor, again > > + * padded to a word boundary. The values of n_namesz and n_descsz do > > + * not include the padding. > > + */ > > + > > +typedef struct { > > + UINT32 n_namesz; /* Length of name. */ > > + UINT32 n_descsz; /* Length of descriptor. */ > > + UINT32 n_type; /* Type of this note. */ > > +} Elf_Note; > > + > > +/* Indexes into the e_ident array. Keep synced with > > + http://www.sco.com/developers/gabi/latest/ch4.eheader.html */ > > +#define EI_MAG0 0 /* Magic number, byte 0. */ > > +#define EI_MAG1 1 /* Magic number, byte 1. */ > > +#define EI_MAG2 2 /* Magic number, byte 2. */ > > +#define EI_MAG3 3 /* Magic number, byte 3. */ > > +#define EI_CLASS 4 /* Class of machine. */ > > +#define EI_DATA 5 /* Data format. */ > > +#define EI_VERSION 6 /* ELF format version. */ > > +#define EI_OSABI 7 /* Operating system / ABI identification */ > > +#define EI_ABIVERSION 8 /* ABI version */ > > +#define OLD_EI_BRAND 8 /* Start of architecture identification. */ > > +#define EI_PAD 9 /* Start of padding (per SVR4 ABI). */ > > +#define EI_NIDENT 16 /* Size of e_ident array. */ > > + > > +/* Values for the magic number bytes. */ > > +#define ELFMAG0 0x7f > > +#define ELFMAG1 'E' > > +#define ELFMAG2 'L' > > +#define ELFMAG3 'F' > > +#define ELFMAG "\177ELF" /* magic string */ > > +#define SELFMAG 4 /* magic string size */ > > + > > +/* Values for e_ident[EI_VERSION] and e_version. */ > > +#define EV_NONE 0 > > +#define EV_CURRENT 1 > > + > > +/* Values for e_ident[EI_CLASS]. */ > > +#define ELFCLASSNONE 0 /* Unknown class. */ > > +#define ELFCLASS32 1 /* 32-bit architecture. */ > > +#define ELFCLASS64 2 /* 64-bit architecture. */ > > + > > +/* Values for e_ident[EI_DATA]. */ > > +#define ELFDATANONE 0 /* Unknown data format. */ > > +#define ELFDATA2LSB 1 /* 2's complement little-endian. */ > > +#define ELFDATA2MSB 2 /* 2's complement big-endian. */ > > + > > +/* Values for e_ident[EI_OSABI]. */ > > +#define ELFOSABI_NONE 0 /* UNIX System V ABI */ > > +#define ELFOSABI_HPUX 1 /* HP-UX operating system */ > > +#define ELFOSABI_NETBSD 2 /* NetBSD */ > > +#define ELFOSABI_LINUX 3 /* GNU/Linux */ > > +#define ELFOSABI_HURD 4 /* GNU/Hurd */ > > +#define ELFOSABI_86OPEN 5 /* 86Open common IA32 ABI */ > > +#define ELFOSABI_SOLARIS 6 /* Solaris */ > > +#define ELFOSABI_AIX 7 /* AIX */ > > +#define ELFOSABI_IRIX 8 /* IRIX */ > > +#define ELFOSABI_FREEBSD 9 /* FreeBSD */ > > +#define ELFOSABI_TRU64 10 /* TRU64 UNIX */ > > +#define ELFOSABI_MODESTO 11 /* Novell Modesto */ > > +#define ELFOSABI_OPENBSD 12 /* OpenBSD */ > > +#define ELFOSABI_OPENVMS 13 /* Open VMS */ > > +#define ELFOSABI_NSK 14 /* HP Non-Stop Kernel */ > > +#define ELFOSABI_ARM 97 /* ARM */ > > +#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) > application */ > > + > > +#define ELFOSABI_SYSV ELFOSABI_NONE /* symbol used in old spec */ > > +#define ELFOSABI_MONTEREY ELFOSABI_AIX /* Monterey */ > > + > > +/* e_ident */ > > +#define IS_ELF(ehdr) ((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \ > > + (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \ > > + (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \ > > + (ehdr).e_ident[EI_MAG3] == ELFMAG3) > > + > > +/* Values for e_type. */ > > +#define ET_NONE 0 /* Unknown type. */ > > +#define ET_REL 1 /* Relocatable. */ > > +#define ET_EXEC 2 /* Executable. */ > > +#define ET_DYN 3 /* Shared object. */ > > +#define ET_CORE 4 /* Core file. */ > > +#define ET_LOOS 0xfe00 /* First operating system specific. */ > > +#define ET_HIOS 0xfeff /* Last operating system-specific. */ > > +#define ET_LOPROC 0xff00 /* First processor-specific. */ > > +#define ET_HIPROC 0xffff /* Last processor-specific. */ > > + > > +/* Values for e_machine. */ > > +#define EM_NONE 0 /* Unknown machine. */ > > +#define EM_M32 1 /* AT&T WE32100. */ > > +#define EM_SPARC 2 /* Sun SPARC. */ > > +#define EM_386 3 /* Intel i386. */ > > +#define EM_68K 4 /* Motorola 68000. */ > > +#define EM_88K 5 /* Motorola 88000. */ > > +#define EM_860 7 /* Intel i860. */ > > +#define EM_MIPS 8 /* MIPS R3000 Big-Endian only. */ > > +#define EM_S370 9 /* IBM System/370. */ > > +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 Little-Endian. */ > > +#define EM_PARISC 15 /* HP PA-RISC. */ > > +#define EM_VPP500 17 /* Fujitsu VPP500. */ > > +#define EM_SPARC32PLUS 18 /* SPARC v8plus. */ > > +#define EM_960 19 /* Intel 80960. */ > > +#define EM_PPC 20 /* PowerPC 32-bit. */ > > +#define EM_PPC64 21 /* PowerPC 64-bit. */ > > +#define EM_S390 22 /* IBM System/390. */ > > +#define EM_V800 36 /* NEC V800. */ > > +#define EM_FR20 37 /* Fujitsu FR20. */ > > +#define EM_RH32 38 /* TRW RH-32. */ > > +#define EM_RCE 39 /* Motorola RCE. */ > > +#define EM_ARM 40 /* ARM. */ > > +#define EM_SH 42 /* Hitachi SH. */ > > +#define EM_SPARCV9 43 /* SPARC v9 64-bit. */ > > +#define EM_TRICORE 44 /* Siemens TriCore embedded processor. */ > > +#define EM_ARC 45 /* Argonaut RISC Core. */ > > +#define EM_H8_300 46 /* Hitachi H8/300. */ > > +#define EM_H8_300H 47 /* Hitachi H8/300H. */ > > +#define EM_H8S 48 /* Hitachi H8S. */ > > +#define EM_H8_500 49 /* Hitachi H8/500. */ > > +#define EM_MIPS_X 51 /* Stanford MIPS-X. */ > > +#define EM_COLDFIRE 52 /* Motorola ColdFire. */ > > +#define EM_68HC12 53 /* Motorola M68HC12. */ > > +#define EM_MMA 54 /* Fujitsu MMA. */ > > +#define EM_PCP 55 /* Siemens PCP. */ > > +#define EM_NCPU 56 /* Sony nCPU. */ > > +#define EM_NDR1 57 /* Denso NDR1 microprocessor. */ > > +#define EM_STARCORE 58 /* Motorola Star*Core processor. */ > > +#define EM_ME16 59 /* Toyota ME16 processor. */ > > +#define EM_ST100 60 /* STMicroelectronics ST100 processor. */ > > +#define EM_TINYJ 61 /* Advanced Logic Corp. TinyJ processor. */ > > +#define EM_X86_64 62 /* Advanced Micro Devices x86-64 */ > > +#define EM_AMD64 EM_X86_64 /* Advanced Micro Devices x86-64 > (compat) */ > > +#define EM_AARCH64 183 /* ARM 64bit Architecture */ > > + > > +/* Non-standard or deprecated. */ > > +#define EM_486 6 /* Intel i486. */ > > +#define EM_MIPS_RS4_BE 10 /* MIPS R4000 Big-Endian */ > > +#define EM_ALPHA_STD 41 /* Digital Alpha (standard value). */ > > +#define EM_ALPHA 0x9026 /* Alpha (written in the absence of an ABI) */ > > + > > +/* Special section indexes. */ > > +#define SHN_UNDEF 0 /* Undefined, missing, irrelevant. */ > > +#define SHN_LORESERVE 0xff00 /* First of reserved range. */ > > +#define SHN_LOPROC 0xff00 /* First processor-specific. */ > > +#define SHN_HIPROC 0xff1f /* Last processor-specific. */ > > +#define SHN_LOOS 0xff20 /* First operating system-specific. */ > > +#define SHN_HIOS 0xff3f /* Last operating system-specific. */ > > +#define SHN_ABS 0xfff1 /* Absolute values. */ > > +#define SHN_COMMON 0xfff2 /* Common data. */ > > +#define SHN_XINDEX 0xffff /* Escape -- index stored elsewhere. */ > > +#define SHN_HIRESERVE 0xffff /* Last of reserved range. */ > > + > > +/* sh_type */ > > +#define SHT_NULL 0 /* inactive */ > > +#define SHT_PROGBITS 1 /* program defined information */ > > +#define SHT_SYMTAB 2 /* symbol table section */ > > +#define SHT_STRTAB 3 /* string table section */ > > +#define SHT_RELA 4 /* relocation section with addends */ > > +#define SHT_HASH 5 /* symbol hash table section */ > > +#define SHT_DYNAMIC 6 /* dynamic section */ > > +#define SHT_NOTE 7 /* note section */ > > +#define SHT_NOBITS 8 /* no space section */ > > +#define SHT_REL 9 /* relocation section - no addends */ > > +#define SHT_SHLIB 10 /* reserved - purpose unknown */ > > +#define SHT_DYNSYM 11 /* dynamic symbol table section */ > > +#define SHT_INIT_ARRAY 14 /* Initialization function pointers. */ > > +#define SHT_FINI_ARRAY 15 /* Termination function pointers. */ > > +#define SHT_PREINIT_ARRAY 16 /* Pre-initialization function ptrs. */ > > +#define SHT_GROUP 17 /* Section group. */ > > +#define SHT_SYMTAB_SHNDX 18 /* Section indexes (see SHN_XINDEX). */ > > +#define SHT_LOOS 0x60000000 /* First of OS specific semantics */ > > +#define SHT_LOSUNW 0x6ffffff4 > > +#define SHT_SUNW_dof 0x6ffffff4 > > +#define SHT_SUNW_cap 0x6ffffff5 > > +#define SHT_SUNW_SIGNATURE 0x6ffffff6 > > +#define SHT_SUNW_ANNOTATE 0x6ffffff7 > > +#define SHT_SUNW_DEBUGSTR 0x6ffffff8 > > +#define SHT_SUNW_DEBUG 0x6ffffff9 > > +#define SHT_SUNW_move 0x6ffffffa > > +#define SHT_SUNW_COMDAT 0x6ffffffb > > +#define SHT_SUNW_syminfo 0x6ffffffc > > +#define SHT_SUNW_verdef 0x6ffffffd > > +#define SHT_GNU_verdef 0x6ffffffd /* Symbol versions provided */ > > +#define SHT_SUNW_verneed 0x6ffffffe > > +#define SHT_GNU_verneed 0x6ffffffe /* Symbol versions required */ > > +#define SHT_SUNW_versym 0x6fffffff > > +#define SHT_GNU_versym 0x6fffffff /* Symbol version table */ > > +#define SHT_HISUNW 0x6fffffff > > +#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ > > +#define SHT_LOPROC 0x70000000 /* reserved range for processor */ > > +#define SHT_AMD64_UNWIND 0x70000001 /* unwind information */ > > +#define SHT_HIPROC 0x7fffffff /* specific section header types */ > > +#define SHT_LOUSER 0x80000000 /* reserved range for application */ > > +#define SHT_HIUSER 0xffffffff /* specific indexes */ > > + > > +/* Flags for sh_flags. */ > > +#define SHF_WRITE 0x1 /* Section contains writable data. */ > > +#define SHF_ALLOC 0x2 /* Section occupies memory. */ > > +#define SHF_EXECINSTR 0x4 /* Section contains instructions. */ > > +#define SHF_MERGE 0x10 /* Section may be merged. */ > > +#define SHF_STRINGS 0x20 /* Section contains strings. */ > > +#define SHF_INFO_LINK 0x40 /* sh_info holds section index. */ > > +#define SHF_LINK_ORDER 0x80 /* Special ordering requirements. */ > > +#define SHF_OS_NONCONFORMING 0x100 /* OS-specific processing > required. */ > > +#define SHF_GROUP 0x200 /* Member of section group. */ > > +#define SHF_TLS 0x400 /* Section contains TLS data. */ > > +#define SHF_MASKOS 0x0ff00000 /* OS-specific semantics. */ > > +#define SHF_MASKPROC 0xf0000000 /* Processor-specific semantics. */ > > + > > +/* Values for p_type. */ > > +#define PT_NULL 0 /* Unused entry. */ > > +#define PT_LOAD 1 /* Loadable segment. */ > > +#define PT_DYNAMIC 2 /* Dynamic linking information segment. */ > > +#define PT_INTERP 3 /* Pathname of interpreter. */ > > +#define PT_NOTE 4 /* Auxiliary information. */ > > +#define PT_SHLIB 5 /* Reserved (not used). */ > > +#define PT_PHDR 6 /* Location of program header itself. */ > > +#define PT_TLS 7 /* Thread local storage segment */ > > +#define PT_LOOS 0x60000000 /* First OS-specific. */ > > +#define PT_SUNW_UNWIND 0x6464e550 /* amd64 UNWIND program > header */ > > +#define PT_GNU_EH_FRAME 0x6474e550 > > +#define PT_LOSUNW 0x6ffffffa > > +#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ > > +#define PT_SUNWSTACK 0x6ffffffb /* describes the stack segment */ > > +#define PT_SUNWDTRACE 0x6ffffffc /* private */ > > +#define PT_SUNWCAP 0x6ffffffd /* hard/soft capabilities segment */ > > +#define PT_HISUNW 0x6fffffff > > +#define PT_HIOS 0x6fffffff /* Last OS-specific. */ > > +#define PT_LOPROC 0x70000000 /* First processor-specific type. */ > > +#define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ > > + > > +/* Values for p_flags. */ > > +#define PF_X 0x1 /* Executable. */ > > +#define PF_W 0x2 /* Writable. */ > > +#define PF_R 0x4 /* Readable. */ > > +#define PF_MASKOS 0x0ff00000 /* Operating system-specific. */ > > +#define PF_MASKPROC 0xf0000000 /* Processor-specific. */ > > + > > +/* Extended program header index. */ > > +#define PN_XNUM 0xffff > > + > > +/* Values for d_tag. */ > > +#define DT_NULL 0 /* Terminating entry. */ > > +#define DT_NEEDED 1 /* String table offset of a needed shared > > + library. */ > > +#define DT_PLTRELSZ 2 /* Total size in bytes of PLT relocations. */ > > +#define DT_PLTGOT 3 /* Processor-dependent address. */ > > +#define DT_HASH 4 /* Address of symbol hash table. */ > > +#define DT_STRTAB 5 /* Address of string table. */ > > +#define DT_SYMTAB 6 /* Address of symbol table. */ > > +#define DT_RELA 7 /* Address of ElfNN_Rela relocations. */ > > +#define DT_RELASZ 8 /* Total size of ElfNN_Rela relocations. */ > > +#define DT_RELAENT 9 /* Size of each ElfNN_Rela relocation entry. */ > > +#define DT_STRSZ 10 /* Size of string table. */ > > +#define DT_SYMENT 11 /* Size of each symbol table entry. */ > > +#define DT_INIT 12 /* Address of initialization function. */ > > +#define DT_FINI 13 /* Address of finalization function. */ > > +#define DT_SONAME 14 /* String table offset of shared object > > + name. */ > > +#define DT_RPATH 15 /* String table offset of library path. [sup] */ > > +#define DT_SYMBOLIC 16 /* Indicates "symbolic" linking. [sup] */ > > +#define DT_REL 17 /* Address of ElfNN_Rel relocations. */ > > +#define DT_RELSZ 18 /* Total size of ElfNN_Rel relocations. */ > > +#define DT_RELENT 19 /* Size of each ElfNN_Rel relocation. */ > > +#define DT_PLTREL 20 /* Type of relocation used for PLT. */ > > +#define DT_DEBUG 21 /* Reserved (not used). */ > > +#define DT_TEXTREL 22 /* Indicates there may be relocations in > > + non-writable segments. [sup] */ > > +#define DT_JMPREL 23 /* Address of PLT relocations. */ > > +#define DT_BIND_NOW 24 /* [sup] */ > > +#define DT_INIT_ARRAY 25 /* Address of the array of pointers to > > + initialization functions */ > > +#define DT_FINI_ARRAY 26 /* Address of the array of pointers to > > + termination functions */ > > +#define DT_INIT_ARRAYSZ 27 /* Size in bytes of the array of > > + initialization functions. */ > > +#define DT_FINI_ARRAYSZ 28 /* Size in bytes of the array of > > + terminationfunctions. */ > > +#define DT_RUNPATH 29 /* String table offset of a null-terminated > > + library search path string. */ > > +#define DT_FLAGS 30 /* Object specific flag values. */ > > +#define DT_ENCODING 32 /* Values greater than or equal to > DT_ENCODING > > + and less than DT_LOOS follow the rules for > > + the interpretation of the d_un union > > + as follows: even == 'd_ptr', even == 'd_val' > > + or none */ > > +#define DT_PREINIT_ARRAY 32 /* Address of the array of pointers to > > + pre-initialization functions. */ > > +#define DT_PREINIT_ARRAYSZ 33 /* Size in bytes of the array of > > + pre-initialization functions. */ > > +#define DT_MAXPOSTAGS 34 /* number of positive tags */ > > +#define DT_LOOS 0x6000000d /* First OS-specific */ > > +#define DT_SUNW_AUXILIARY 0x6000000d /* symbol auxiliary name */ > > +#define DT_SUNW_RTLDINF 0x6000000e /* ld.so.1 info (private) */ > > +#define DT_SUNW_FILTER 0x6000000f /* symbol filter name */ > > +#define DT_SUNW_CAP 0x60000010 /* hardware/software */ > > +#define DT_HIOS 0x6ffff000 /* Last OS-specific */ > > + > > +/* > > + * DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the > > + * Dyn.d_un.d_val field of the Elf*_Dyn structure. > > + */ > > +#define DT_VALRNGLO 0x6ffffd00 > > +#define DT_CHECKSUM 0x6ffffdf8 /* elf checksum */ > > +#define DT_PLTPADSZ 0x6ffffdf9 /* pltpadding size */ > > +#define DT_MOVEENT 0x6ffffdfa /* move table entry size */ > > +#define DT_MOVESZ 0x6ffffdfb /* move table size */ > > +#define DT_FEATURE_1 0x6ffffdfc /* feature holder */ > > +#define DT_POSFLAG_1 0x6ffffdfd /* flags for DT_* entries, effecting */ > > + /* the following DT_* entry. */ > > + /* See DF_P1_* definitions */ > > +#define DT_SYMINSZ 0x6ffffdfe /* syminfo table size (in bytes) */ > > +#define DT_SYMINENT 0x6ffffdff /* syminfo entry size (in bytes) */ > > +#define DT_VALRNGHI 0x6ffffdff > > + > > +/* > > + * DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use > the > > + * Dyn.d_un.d_ptr field of the Elf*_Dyn structure. > > + * > > + * If any adjustment is made to the ELF object after it has been > > + * built, these entries will need to be adjusted. > > + */ > > +#define DT_ADDRRNGLO 0x6ffffe00 > > +#define DT_CONFIG 0x6ffffefa /* configuration information */ > > +#define DT_DEPAUDIT 0x6ffffefb /* dependency auditing */ > > +#define DT_AUDIT 0x6ffffefc /* object auditing */ > > +#define DT_PLTPAD 0x6ffffefd /* pltpadding (sparcv9) */ > > +#define DT_MOVETAB 0x6ffffefe /* move table */ > > +#define DT_SYMINFO 0x6ffffeff /* syminfo table */ > > +#define DT_ADDRRNGHI 0x6ffffeff > > + > > +#define DT_VERSYM 0x6ffffff0 /* Address of versym section. */ > > +#define DT_RELACOUNT 0x6ffffff9 /* number of RELATIVE relocations */ > > +#define DT_RELCOUNT 0x6ffffffa /* number of RELATIVE relocations */ > > +#define DT_FLAGS_1 0x6ffffffb /* state flags - see DF_1_* defs */ > > +#define DT_VERDEF 0x6ffffffc /* Address of verdef section. */ > > +#define DT_VERDEFNUM 0x6ffffffd /* Number of elems in verdef section > */ > > +#define DT_VERNEED 0x6ffffffe /* Address of verneed section. */ > > +#define DT_VERNEEDNUM 0x6fffffff /* Number of elems in verneed > section */ > > + > > +#define DT_LOPROC 0x70000000 /* First processor-specific type. */ > > +#define DT_DEPRECATED_SPARC_REGISTER 0x7000001 > > +#define DT_AUXILIARY 0x7ffffffd /* shared library auxiliary name */ > > +#define DT_USED 0x7ffffffe /* ignored - same as needed */ > > +#define DT_FILTER 0x7fffffff /* shared library filter name */ > > +#define DT_HIPROC 0x7fffffff /* Last processor-specific type. */ > > + > > +/* Values for DT_FLAGS */ > > +#define DF_ORIGIN 0x0001 /* Indicates that the object being loaded may > > + make reference to the $ORIGIN substitution > > + string */ > > +#define DF_SYMBOLIC 0x0002 /* Indicates "symbolic" linking. */ > > +#define DF_TEXTREL 0x0004 /* Indicates there may be relocations in > > + non-writable segments. */ > > +#define DF_BIND_NOW 0x0008 /* Indicates that the dynamic linker > should > > + process all relocations for the object > > + containing this entry before transferring > > + control to the program. */ > > +#define DF_STATIC_TLS 0x0010 /* Indicates that the shared object or > > + executable contains code using a static > > + thread-local storage scheme. */ > > + > > +/* Values for n_type. Used in core files. */ > > +#define NT_PRSTATUS 1 /* Process status. */ > > +#define NT_FPREGSET 2 /* Floating point registers. */ > > +#define NT_PRPSINFO 3 /* Process state info. */ > > + > > +/* Symbol Binding - ELFNN_ST_BIND - st_info */ > > +#define STB_LOCAL 0 /* Local symbol */ > > +#define STB_GLOBAL 1 /* Global symbol */ > > +#define STB_WEAK 2 /* like global - lower precedence */ > > +#define STB_LOOS 10 /* Reserved range for operating system */ > > +#define STB_HIOS 12 /* specific semantics. */ > > +#define STB_LOPROC 13 /* reserved range for processor */ > > +#define STB_HIPROC 15 /* specific semantics. */ > > + > > +/* Symbol type - ELFNN_ST_TYPE - st_info */ > > +#define STT_NOTYPE 0 /* Unspecified type. */ > > +#define STT_OBJECT 1 /* Data object. */ > > +#define STT_FUNC 2 /* Function. */ > > +#define STT_SECTION 3 /* Section. */ > > +#define STT_FILE 4 /* Source file. */ > > +#define STT_COMMON 5 /* Uninitialized common block. */ > > +#define STT_TLS 6 /* TLS object. */ > > +#define STT_NUM 7 > > +#define STT_LOOS 10 /* Reserved range for operating system */ > > +#define STT_HIOS 12 /* specific semantics. */ > > +#define STT_LOPROC 13 /* reserved range for processor */ > > +#define STT_HIPROC 15 /* specific semantics. */ > > + > > +/* Symbol visibility - ELFNN_ST_VISIBILITY - st_other */ > > +#define STV_DEFAULT 0x0 /* Default visibility (see binding). */ > > +#define STV_INTERNAL 0x1 /* Special meaning in relocatable objects. */ > > +#define STV_HIDDEN 0x2 /* Not visible. */ > > +#define STV_PROTECTED 0x3 /* Visible but not preemptible. */ > > + > > +/* Special symbol table indexes. */ > > +#define STN_UNDEF 0 /* Undefined symbol index. */ > > + > > +/* Symbol versioning flags. */ > > +#define VER_DEF_CURRENT 1 > > +#define VER_DEF_IDX(x) VER_NDX(x) > > + > > +#define VER_FLG_BASE 0x01 > > +#define VER_FLG_WEAK 0x02 > > + > > +#define VER_NEED_CURRENT 1 > > +#define VER_NEED_WEAK (1u << 15) > > +#define VER_NEED_HIDDEN VER_NDX_HIDDEN > > +#define VER_NEED_IDX(x) VER_NDX(x) > > + > > +#define VER_NDX_LOCAL 0 > > +#define VER_NDX_GLOBAL 1 > > +#define VER_NDX_GIVEN 2 > > + > > +#define VER_NDX_HIDDEN (1u << 15) > > +#define VER_NDX(x) ((x) & ~(1u << 15)) > > + > > +#define CA_SUNW_NULL 0 > > +#define CA_SUNW_HW_1 1 /* first hardware capabilities entry */ > > +#define CA_SUNW_SF_1 2 /* first software capabilities entry */ > > + > > +/* > > + * Syminfo flag values > > + */ > > +#define SYMINFO_FLG_DIRECT 0x0001 /* symbol ref has direct association > */ > > + /* to object containing defn. */ > > +#define SYMINFO_FLG_PASSTHRU 0x0002 /* ignored - see > SYMINFO_FLG_FILTER */ > > +#define SYMINFO_FLG_COPY 0x0004 /* symbol is a copy-reloc */ > > +#define SYMINFO_FLG_LAZYLOAD 0x0008 /* object containing defn > should be */ > > + /* lazily-loaded */ > > +#define SYMINFO_FLG_DIRECTBIND 0x0010 /* ref should be bound > directly to */ > > + /* object containing defn. */ > > +#define SYMINFO_FLG_NOEXTDIRECT 0x0020 /* don't let an external > reference */ > > + /* directly bind to this symbol */ > > +#define SYMINFO_FLG_FILTER 0x0002 /* symbol ref is associated to a */ > > +#define SYMINFO_FLG_AUXILIARY 0x0040 /* standard or auxiliary filter > */ > > + > > +/* > > + * Syminfo.si_boundto values. > > + */ > > +#define SYMINFO_BT_SELF 0xffff /* symbol bound to self */ > > +#define SYMINFO_BT_PARENT 0xfffe /* symbol bound to parent */ > > +#define SYMINFO_BT_NONE 0xfffd /* no special symbol binding */ > > +#define SYMINFO_BT_EXTERN 0xfffc /* symbol defined as external */ > > +#define SYMINFO_BT_LOWRESERVE 0xff00 /* beginning of reserved > entries */ > > + > > +/* > > + * Syminfo version values. > > + */ > > +#define SYMINFO_NONE 0 /* Syminfo version */ > > +#define SYMINFO_CURRENT 1 > > +#define SYMINFO_NUM 2 > > + > > +/* > > + * Relocation types. > > + * > > + * All machine architectures are defined here to allow tools on one to > > + * handle others. > > + */ > > + > > +#define R_386_NONE 0 /* No relocation. */ > > +#define R_386_32 1 /* Add symbol value. */ > > +#define R_386_PC32 2 /* Add PC-relative symbol value. */ > > +#define R_386_GOT32 3 /* Add PC-relative GOT offset. */ > > +#define R_386_PLT32 4 /* Add PC-relative PLT offset. */ > > +#define R_386_COPY 5 /* Copy data from shared object. */ > > +#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ > > +#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */ > > +#define R_386_RELATIVE 8 /* Add load address of shared object. */ > > +#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */ > > +#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */ > > +#define R_386_TLS_TPOFF 14 /* Negative offset in static TLS block */ > > +#define R_386_TLS_IE 15 /* Absolute address of GOT for -ve static TLS */ > > +#define R_386_TLS_GOTIE 16 /* GOT entry for negative static TLS block > */ > > +#define R_386_TLS_LE 17 /* Negative offset relative to static TLS */ > > +#define R_386_TLS_GD 18 /* 32 bit offset to GOT (index,off) pair */ > > +#define R_386_TLS_LDM 19 /* 32 bit offset to GOT (index,zero) pair */ > > +#define R_386_TLS_GD_32 24 /* 32 bit offset to GOT (index,off) pair */ > > +#define R_386_TLS_GD_PUSH 25 /* pushl instruction for Sun ABI GD > sequence */ > > +#define R_386_TLS_GD_CALL 26 /* call instruction for Sun ABI GD > sequence */ > > +#define R_386_TLS_GD_POP 27 /* popl instruction for Sun ABI GD > sequence */ > > +#define R_386_TLS_LDM_32 28 /* 32 bit offset to GOT (index,zero) pair */ > > +#define R_386_TLS_LDM_PUSH 29 /* pushl instruction for Sun ABI LD > sequence */ > > +#define R_386_TLS_LDM_CALL 30 /* call instruction for Sun ABI LD > sequence */ > > +#define R_386_TLS_LDM_POP 31 /* popl instruction for Sun ABI LD > sequence */ > > +#define R_386_TLS_LDO_32 32 /* 32 bit offset from start of TLS block */ > > +#define R_386_TLS_IE_32 33 /* 32 bit offset to GOT static TLS offset entry > */ > > +#define R_386_TLS_LE_32 34 /* 32 bit offset within static TLS block */ > > +#define R_386_TLS_DTPMOD32 35 /* GOT entry containing TLS index */ > > +#define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */ > > +#define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */ > > + > > +/* Null relocation */ > > +#define R_AARCH64_NONE 256 /* No relocation */ > > +/* Static AArch64 relocations */ > > + /* Static data relocations */ > > +#define R_AARCH64_ABS64 257 /* S + A */ > > +#define R_AARCH64_ABS32 258 /* S + A */ > > +#define R_AARCH64_ABS16 259 /* S + A */ > > +#define R_AARCH64_PREL64 260 /* S + A - P */ > > +#define R_AARCH64_PREL32 261 /* S + A - P */ > > +#define R_AARCH64_PREL16 262 /* S + A - P */ > > + /* Group relocations to create a 16, 32, 48, or 64 bit unsigned data value or > address inline */ > > +#define R_AARCH64_MOVW_UABS_G0 263 /* S + A */ > > +#define R_AARCH64_MOVW_UABS_G0_NC 264 /* S + A */ > > +#define R_AARCH64_MOVW_UABS_G1 265 /* S + A */ > > +#define R_AARCH64_MOVW_UABS_G1_NC 266 /* S + A */ > > +#define R_AARCH64_MOVW_UABS_G2 267 /* S + A */ > > +#define R_AARCH64_MOVW_UABS_G2_NC 268 /* S + A */ > > +#define R_AARCH64_MOVW_UABS_G3 269 /* S + A */ > > + /* Group relocations to create a 16, 32, 48, or 64 bit signed data or offset > value inline */ > > +#define R_AARCH64_MOVW_SABS_G0 270 /* S + A */ > > +#define R_AARCH64_MOVW_SABS_G1 271 /* S + A */ > > +#define R_AARCH64_MOVW_SABS_G2 272 /* S + A */ > > + /* Relocations to generate 19, 21 and 33 bit PC-relative addresses */ > > +#define R_AARCH64_LD_PREL_LO19 273 /* S + A - P */ > > +#define R_AARCH64_ADR_PREL_LO21 274 /* S + A - P */ > > +#define R_AARCH64_ADR_PREL_PG_HI21 275 /* Page(S+A) - Page(P) */ > > +#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Page(S+A) - Page(P) > */ > > +#define R_AARCH64_ADD_ABS_LO12_NC 277 /* S + A */ > > +#define R_AARCH64_LDST8_ABS_LO12_NC 278 /* S + A */ > > +#define R_AARCH64_LDST16_ABS_LO12_NC 284 /* S + A */ > > +#define R_AARCH64_LDST32_ABS_LO12_NC 285 /* S + A */ > > +#define R_AARCH64_LDST64_ABS_LO12_NC 286 /* S + A */ > > +#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* S + A */ > > + /* Relocations for control-flow instructions - all offsets are a multiple of 4 */ > > +#define R_AARCH64_TSTBR14 279 /* S+A-P */ > > +#define R_AARCH64_CONDBR19 280 /* S+A-P */ > > +#define R_AARCH64_JUMP26 282 /* S+A-P */ > > +#define R_AARCH64_CALL26 283 /* S+A-P */ > > + /* Group relocations to create a 16, 32, 48, or 64 bit PC-relative offset inline > */ > > +#define R_AARCH64_MOVW_PREL_G0 287 /* S+A-P */ > > +#define R_AARCH64_MOVW_PREL_G0_NC 288 /* S+A-P */ > > +#define R_AARCH64_MOVW_PREL_G1 289 /* S+A-P */ > > +#define R_AARCH64_MOVW_PREL_G1_NC 290 /* S+A-P */ > > +#define R_AARCH64_MOVW_PREL_G2 291 /* S+A-P */ > > +#define R_AARCH64_MOVW_PREL_G2_NC 292 /* S+A-P */ > > +#define R_AARCH64_MOVW_PREL_G3 293 /* S+A-P */ > > + /* Group relocations to create a 16, 32, 48, or 64 bit GOT-relative offsets > inline */ > > +#define R_AARCH64_MOVW_GOTOFF_G0 300 /* G(S)-GOT */ > > +#define R_AARCH64_MOVW_GOTOFF_G0_NC 301 /* G(S)-GOT */ > > +#define R_AARCH64_MOVW_GOTOFF_G1 302 /* G(S)-GOT */ > > +#define R_AARCH64_MOVW_GOTOFF_G1_NC 303 /* G(S)-GOT */ > > +#define R_AARCH64_MOVW_GOTOFF_G2 304 /* G(S)-GOT */ > > +#define R_AARCH64_MOVW_GOTOFF_G2_NC 305 /* G(S)-GOT */ > > +#define R_AARCH64_MOVW_GOTOFF_G3 306 /* G(S)-GOT */ > > + /* GOT-relative data relocations */ > > +#define R_AARCH64_GOTREL64 307 /* S+A-GOT */ > > +#define R_AARCH64_GOTREL32 308 /* S+A-GOT */ > > + /* GOT-relative instruction relocations */ > > +#define R_AARCH64_GOT_LD_PREL19 309 /* G(S)-P */ > > +#define R_AARCH64_LD64_GOTOFF_LO15 310 /* G(S)-GOT */ > > +#define R_AARCH64_ADR_GOT_PAGE 311 /* Page(G(S))-Page(P) */ > > +#define R_AARCH64_LD64_GOT_LO12_NC 312 /* G(S) */ > > +#define R_AARCH64_LD64_GOTPAGE_LO15 313 /* G(S)-Page(GOT) */ > > +/* Relocations for thread-local storage */ > > + /* General Dynamic TLS relocations */ > > +#define R_AARCH64_TLSGD_ADR_PREL21 512 /* G(TLSIDX(S+A)) - P */ > > +#define R_AARCH64_TLSGD_ADR_PAGE21 513 /* Page(G(TLSIDX(S+A))) > - Page(P) */ > > +#define R_AARCH64_TLSGD_ADD_LO12_NC 514 /* G(TLSIDX(S+A)) */ > > +#define R_AARCH64_TLSGD_MOVW_G1 515 /* G(TLSIDX(S+A)) - GOT > */ > > +#define R_AARCH64_TLSGD_MOVW_G0_NC 516 /* G(TLSIDX(S+A)) - > GOT */ > > + /* Local Dynamic TLS relocations */ > > +#define R_AARCH64_TLSLD_ADR_PREL21 517 /* G(LDM(S))) - P */ > > +#define R_AARCH64_TLSLD_ADR_PAGE21 518 /* Page(G(LDM(S)))- > Page(P) */ > > +#define R_AARCH64_TLSLD_ADD_LO12_NC 519 /* G(LDM(S)) */ > > +#define R_AARCH64_TLSLD_MOVW_G1 520 /* G(LDM(S)) - GOT */ > > +#define R_AARCH64_TLSLD_MOVW_G0_NC 521 /* G(LDM(S)) - GOT */ > > +#define R_AARCH64_TLSLD_LD_PREL19 522 /* G(LDM(S)) - P */ > > +#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* DTPREL(S+A) > */ > > +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527 /* DTPREL(S+A) > */ > > +#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530 /* DTPREL(S+A) > */ > > +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532 /* DTPREL(S+A) > */ > > +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534 /* DTPREL(S+A) > */ > > +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536 /* DTPREL(S+A) > */ > > +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538 /* DTPREL(S+A) > */ > > + /* Initial Exec TLS relocations */ > > +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539 /* G(TPREL(S+A)) > - GOT */ > > +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540 /* > G(TPREL(S+A)) - GOT */ > > +#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541 /* > Page(G(TPREL(S+A))) - Page(P) */ > > +#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542 /* > G(TPREL(S+A)) */ > > +#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543 /* G(TPREL(S+A)) - > P */ > > + /* Local Exec TLS relocations */ > > +#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555 /* TPREL(S+A) > */ > > +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557 /* TPREL(S+A) > */ > > +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558 /* TPREL(S+A) */ > > +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559 /* TPREL(S+A) > */ > > +/* Dynamic relocations */ > > + /* Dynamic relocations */ > > +#define R_AARCH64_COPY 1024 > > +#define R_AARCH64_GLOB_DAT 1025 /* S + A */ > > +#define R_AARCH64_JUMP_SLOT 1026 /* S + A */ > > +#define R_AARCH64_RELATIVE 1027 /* Delta(S) + A , Delta(P) + A */ > > +#define R_AARCH64_TLS_DTPREL64 1028 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLS_DTPMOD64 1029 /* LDM(S) */ > > +#define R_AARCH64_TLS_TPREL64 1030 /* TPREL(S+A) */ > > +#define R_AARCH64_TLS_DTPREL32 1031 /* DTPREL(S+A) */ > > +#define R_AARCH64_TLS_DTPMOD32 1032 /* LDM(S) */ > > +#define R_AARCH64_TLS_TPREL32 1033 /* DTPREL(S+A) */ > > + > > +#define R_ALPHA_NONE 0 /* No reloc */ > > +#define R_ALPHA_REFLONG 1 /* Direct 32 bit */ > > +#define R_ALPHA_REFQUAD 2 /* Direct 64 bit */ > > +#define R_ALPHA_GPREL32 3 /* GP relative 32 bit */ > > +#define R_ALPHA_LITERAL 4 /* GP relative 16 bit w/optimization */ > > +#define R_ALPHA_LITUSE 5 /* Optimization hint for LITERAL */ > > +#define R_ALPHA_GPDISP 6 /* Add displacement to GP */ > > +#define R_ALPHA_BRADDR 7 /* PC+4 relative 23 bit shifted */ > > +#define R_ALPHA_HINT 8 /* PC+4 relative 16 bit shifted */ > > +#define R_ALPHA_SREL16 9 /* PC relative 16 bit */ > > +#define R_ALPHA_SREL32 10 /* PC relative 32 bit */ > > +#define R_ALPHA_SREL64 11 /* PC relative 64 bit */ > > +#define R_ALPHA_OP_PUSH 12 /* OP stack push */ > > +#define R_ALPHA_OP_STORE 13 /* OP stack pop and store */ > > +#define R_ALPHA_OP_PSUB 14 /* OP stack subtract */ > > +#define R_ALPHA_OP_PRSHIFT 15 /* OP stack right shift */ > > +#define R_ALPHA_GPVALUE 16 > > +#define R_ALPHA_GPRELHIGH 17 > > +#define R_ALPHA_GPRELLOW 18 > > +#define R_ALPHA_IMMED_GP_16 19 > > +#define R_ALPHA_IMMED_GP_HI32 20 > > +#define R_ALPHA_IMMED_SCN_HI32 21 > > +#define R_ALPHA_IMMED_BR_HI32 22 > > +#define R_ALPHA_IMMED_LO32 23 > > +#define R_ALPHA_COPY 24 /* Copy symbol at runtime */ > > +#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */ > > +#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */ > > +#define R_ALPHA_RELATIVE 27 /* Adjust by program base */ > > + > > +#define R_ARM_NONE 0 /* No relocation. */ > > +#define R_ARM_PC24 1 > > +#define R_ARM_ABS32 2 > > +#define R_ARM_REL32 3 > > +#define R_ARM_PC13 4 > > +#define R_ARM_ABS16 5 > > +#define R_ARM_ABS12 6 > > +#define R_ARM_THM_ABS5 7 > > +#define R_ARM_ABS8 8 > > +#define R_ARM_SBREL32 9 > > +#define R_ARM_THM_PC22 10 > > +#define R_ARM_THM_PC8 11 > > +#define R_ARM_AMP_VCALL9 12 > > +#define R_ARM_SWI24 13 > > +#define R_ARM_THM_SWI8 14 > > +#define R_ARM_XPC25 15 > > +#define R_ARM_THM_XPC22 16 > > +#define R_ARM_COPY 20 /* Copy data from shared object. */ > > +#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ > > +#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ > > +#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ > > +#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ > > +#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ > > +#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ > > +#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ > > +#define R_ARM_CALL 28 > > +#define R_ARM_JMP24 29 > > +#define R_ARM_THM_MOVW_ABS_NC 47 > > +#define R_ARM_THM_MOVT_ABS 48 > > + > > +// Block of PC-relative relocations added to work around gcc putting > > +// object relocations in static executables. > > +#define R_ARM_THM_JUMP24 30 > > +#define R_ARM_PREL31 42 > > +#define R_ARM_MOVW_PREL_NC 45 > > +#define R_ARM_MOVT_PREL 46 > > +#define R_ARM_THM_MOVW_PREL_NC 49 > > +#define R_ARM_THM_MOVT_PREL 50 > > +#define R_ARM_THM_JMP6 52 > > +#define R_ARM_THM_ALU_PREL_11_0 53 > > +#define R_ARM_THM_PC12 54 > > +#define R_ARM_REL32_NOI 56 > > +#define R_ARM_ALU_PC_G0_NC 57 > > +#define R_ARM_ALU_PC_G0 58 > > +#define R_ARM_ALU_PC_G1_NC 59 > > +#define R_ARM_ALU_PC_G1 60 > > +#define R_ARM_ALU_PC_G2 61 > > +#define R_ARM_LDR_PC_G1 62 > > +#define R_ARM_LDR_PC_G2 63 > > +#define R_ARM_LDRS_PC_G0 64 > > +#define R_ARM_LDRS_PC_G1 65 > > +#define R_ARM_LDRS_PC_G2 66 > > +#define R_ARM_LDC_PC_G0 67 > > +#define R_ARM_LDC_PC_G1 68 > > +#define R_ARM_LDC_PC_G2 69 > > +#define R_ARM_GOT_PREL 96 > > +#define R_ARM_THM_JUMP11 102 > > +#define R_ARM_THM_JUMP8 103 > > +#define R_ARM_TLS_GD32 104 > > +#define R_ARM_TLS_LDM32 105 > > +#define R_ARM_TLS_IE32 107 > > + > > +#define R_ARM_THM_JUMP19 51 > > +#define R_ARM_GNU_VTENTRY 100 > > +#define R_ARM_GNU_VTINHERIT 101 > > +#define R_ARM_RSBREL32 250 > > +#define R_ARM_THM_RPC22 251 > > +#define R_ARM_RREL32 252 > > +#define R_ARM_RABS32 253 > > +#define R_ARM_RPC24 254 > > +#define R_ARM_RBASE 255 > > + > > +#define R_PPC_NONE 0 /* No relocation. */ > > +#define R_PPC_ADDR32 1 > > +#define R_PPC_ADDR24 2 > > +#define R_PPC_ADDR16 3 > > +#define R_PPC_ADDR16_LO 4 > > +#define R_PPC_ADDR16_HI 5 > > +#define R_PPC_ADDR16_HA 6 > > +#define R_PPC_ADDR14 7 > > +#define R_PPC_ADDR14_BRTAKEN 8 > > +#define R_PPC_ADDR14_BRNTAKEN 9 > > +#define R_PPC_REL24 10 > > +#define R_PPC_REL14 11 > > +#define R_PPC_REL14_BRTAKEN 12 > > +#define R_PPC_REL14_BRNTAKEN 13 > > +#define R_PPC_GOT16 14 > > +#define R_PPC_GOT16_LO 15 > > +#define R_PPC_GOT16_HI 16 > > +#define R_PPC_GOT16_HA 17 > > +#define R_PPC_PLTREL24 18 > > +#define R_PPC_COPY 19 > > +#define R_PPC_GLOB_DAT 20 > > +#define R_PPC_JMP_SLOT 21 > > +#define R_PPC_RELATIVE 22 > > +#define R_PPC_LOCAL24PC 23 > > +#define R_PPC_UADDR32 24 > > +#define R_PPC_UADDR16 25 > > +#define R_PPC_REL32 26 > > +#define R_PPC_PLT32 27 > > +#define R_PPC_PLTREL32 28 > > +#define R_PPC_PLT16_LO 29 > > +#define R_PPC_PLT16_HI 30 > > +#define R_PPC_PLT16_HA 31 > > +#define R_PPC_SDAREL16 32 > > +#define R_PPC_SECTOFF 33 > > +#define R_PPC_SECTOFF_LO 34 > > +#define R_PPC_SECTOFF_HI 35 > > +#define R_PPC_SECTOFF_HA 36 > > + > > +/* > > + * TLS relocations > > + */ > > +#define R_PPC_TLS 67 > > +#define R_PPC_DTPMOD32 68 > > +#define R_PPC_TPREL16 69 > > +#define R_PPC_TPREL16_LO 70 > > +#define R_PPC_TPREL16_HI 71 > > +#define R_PPC_TPREL16_HA 72 > > +#define R_PPC_TPREL32 73 > > +#define R_PPC_DTPREL16 74 > > +#define R_PPC_DTPREL16_LO 75 > > +#define R_PPC_DTPREL16_HI 76 > > +#define R_PPC_DTPREL16_HA 77 > > +#define R_PPC_DTPREL32 78 > > +#define R_PPC_GOT_TLSGD16 79 > > +#define R_PPC_GOT_TLSGD16_LO 80 > > +#define R_PPC_GOT_TLSGD16_HI 81 > > +#define R_PPC_GOT_TLSGD16_HA 82 > > +#define R_PPC_GOT_TLSLD16 83 > > +#define R_PPC_GOT_TLSLD16_LO 84 > > +#define R_PPC_GOT_TLSLD16_HI 85 > > +#define R_PPC_GOT_TLSLD16_HA 86 > > +#define R_PPC_GOT_TPREL16 87 > > +#define R_PPC_GOT_TPREL16_LO 88 > > +#define R_PPC_GOT_TPREL16_HI 89 > > +#define R_PPC_GOT_TPREL16_HA 90 > > + > > +/* > > + * The remaining relocs are from the Embedded ELF ABI, and are not in the > > + * SVR4 ELF ABI. > > + */ > > + > > +#define R_PPC_EMB_NADDR32 101 > > +#define R_PPC_EMB_NADDR16 102 > > +#define R_PPC_EMB_NADDR16_LO 103 > > +#define R_PPC_EMB_NADDR16_HI 104 > > +#define R_PPC_EMB_NADDR16_HA 105 > > +#define R_PPC_EMB_SDAI16 106 > > +#define R_PPC_EMB_SDA2I16 107 > > +#define R_PPC_EMB_SDA2REL 108 > > +#define R_PPC_EMB_SDA21 109 > > +#define R_PPC_EMB_MRKREF 110 > > +#define R_PPC_EMB_RELSEC16 111 > > +#define R_PPC_EMB_RELST_LO 112 > > +#define R_PPC_EMB_RELST_HI 113 > > +#define R_PPC_EMB_RELST_HA 114 > > +#define R_PPC_EMB_BIT_FLD 115 > > +#define R_PPC_EMB_RELSDA 116 > > + > > +#define R_SPARC_NONE 0 > > +#define R_SPARC_8 1 > > +#define R_SPARC_16 2 > > +#define R_SPARC_32 3 > > +#define R_SPARC_DISP8 4 > > +#define R_SPARC_DISP16 5 > > +#define R_SPARC_DISP32 6 > > +#define R_SPARC_WDISP30 7 > > +#define R_SPARC_WDISP22 8 > > +#define R_SPARC_HI22 9 > > +#define R_SPARC_22 10 > > +#define R_SPARC_13 11 > > +#define R_SPARC_LO10 12 > > +#define R_SPARC_GOT10 13 > > +#define R_SPARC_GOT13 14 > > +#define R_SPARC_GOT22 15 > > +#define R_SPARC_PC10 16 > > +#define R_SPARC_PC22 17 > > +#define R_SPARC_WPLT30 18 > > +#define R_SPARC_COPY 19 > > +#define R_SPARC_GLOB_DAT 20 > > +#define R_SPARC_JMP_SLOT 21 > > +#define R_SPARC_RELATIVE 22 > > +#define R_SPARC_UA32 23 > > +#define R_SPARC_PLT32 24 > > +#define R_SPARC_HIPLT22 25 > > +#define R_SPARC_LOPLT10 26 > > +#define R_SPARC_PCPLT32 27 > > +#define R_SPARC_PCPLT22 28 > > +#define R_SPARC_PCPLT10 29 > > +#define R_SPARC_10 30 > > +#define R_SPARC_11 31 > > +#define R_SPARC_64 32 > > +#define R_SPARC_OLO10 33 > > +#define R_SPARC_HH22 34 > > +#define R_SPARC_HM10 35 > > +#define R_SPARC_LM22 36 > > +#define R_SPARC_PC_HH22 37 > > +#define R_SPARC_PC_HM10 38 > > +#define R_SPARC_PC_LM22 39 > > +#define R_SPARC_WDISP16 40 > > +#define R_SPARC_WDISP19 41 > > +#define R_SPARC_GLOB_JMP 42 > > +#define R_SPARC_7 43 > > +#define R_SPARC_5 44 > > +#define R_SPARC_6 45 > > +#define R_SPARC_DISP64 46 > > +#define R_SPARC_PLT64 47 > > +#define R_SPARC_HIX22 48 > > +#define R_SPARC_LOX10 49 > > +#define R_SPARC_H44 50 > > +#define R_SPARC_M44 51 > > +#define R_SPARC_L44 52 > > +#define R_SPARC_REGISTER 53 > > +#define R_SPARC_UA64 54 > > +#define R_SPARC_UA16 55 > > +#define R_SPARC_TLS_GD_HI22 56 > > +#define R_SPARC_TLS_GD_LO10 57 > > +#define R_SPARC_TLS_GD_ADD 58 > > +#define R_SPARC_TLS_GD_CALL 59 > > +#define R_SPARC_TLS_LDM_HI22 60 > > +#define R_SPARC_TLS_LDM_LO10 61 > > +#define R_SPARC_TLS_LDM_ADD 62 > > +#define R_SPARC_TLS_LDM_CALL 63 > > +#define R_SPARC_TLS_LDO_HIX22 64 > > +#define R_SPARC_TLS_LDO_LOX10 65 > > +#define R_SPARC_TLS_LDO_ADD 66 > > +#define R_SPARC_TLS_IE_HI22 67 > > +#define R_SPARC_TLS_IE_LO10 68 > > +#define R_SPARC_TLS_IE_LD 69 > > +#define R_SPARC_TLS_IE_LDX 70 > > +#define R_SPARC_TLS_IE_ADD 71 > > +#define R_SPARC_TLS_LE_HIX22 72 > > +#define R_SPARC_TLS_LE_LOX10 73 > > +#define R_SPARC_TLS_DTPMOD32 74 > > +#define R_SPARC_TLS_DTPMOD64 75 > > +#define R_SPARC_TLS_DTPOFF32 76 > > +#define R_SPARC_TLS_DTPOFF64 77 > > +#define R_SPARC_TLS_TPOFF32 78 > > +#define R_SPARC_TLS_TPOFF64 79 > > + > > +#define R_X86_64_NONE 0 /* No relocation. */ > > +#define R_X86_64_64 1 /* Add 64 bit symbol value. */ > > +#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ > > +#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ > > +#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ > > +#define R_X86_64_COPY 5 /* Copy data from shared object. */ > > +#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ > > +#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ > > +#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ > > +#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. > */ > > +#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ > > +#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ > > +#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ > > +#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative > symbol value */ > > +#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ > > +#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative > symbol value */ > > +#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ > > +#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ > > +#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ > > +#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ > > +#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ > > +#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ > > +#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ > > +#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ > > +#define R_X86_64_PC64 24 /* PC relative 64 bit */ > > +#define R_X86_64_GOTOFF64 25 /* 64 bit offset to GOT */ > > +#define R_X86_64_GOTPC3 26 /* 32 bit signed pc relative offset to GOT */ > > +#define R_X86_64_GOT64 27 /* 64-bit GOT entry offset */ > > +#define R_X86_64_GOTPCREL64 28 /* 64-bit PC relative offset to GOT > entry */ > > +#define R_X86_64_GOTPC64 29 /* 64-bit PC relative offset to GOT */ > > +#define R_X86_64_GOTPLT64 30 /* like GOT64, says PLT entry needed */ > > +#define R_X86_64_PLTOFF64 31 /* 64-bit GOT relative offset to PLT entry > */ > > +#define R_X86_64_SIZE32 32 /* Size of symbol plus 32-bit addend */ > > +#define R_X86_64_SIZE64 33 /* Size of symbol plus 64-bit addend */ > > +#define R_X86_64_GOTPC32_TLSDESC 34 /* GOT offset for TLS descriptor. > */ > > +#define R_X86_64_TLSDESC_CALL 35 /* Marker for call through TLS > descriptor. */ > > +#define R_X86_64_TLSDESC 36 /* TLS descriptor. */ > > +#define R_X86_64_IRELATIVE 37 /* Adjust indirectly by program base */ > > +#define R_X86_64_RELATIVE64 38 /* 64-bit adjust by program base */ > > +#define R_X86_64_GOTPCRELX 41 /* Load from 32 bit signed pc relative > offset to GOT entry without REX prefix, relaxable. */ > > +#define R_X86_64_REX_GOTPCRELX 42 /* Load from 32 bit signed pc > relative offset to GOT entry with REX prefix, relaxable. */ > > + > > + > > +#endif /* !_SYS_ELF_COMMON_H_ */ > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c > new file mode 100644 > index 0000000000..a8f1cf4b3e > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c > @@ -0,0 +1,499 @@ > +/** @file > > + ELF library > > + > > + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> > > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#include "ElfLibInternal.h" > > + > > +/** > > + Check if the ELF image is valid. > > + > > + @param[in] ImageBase Memory address of an image. > > + > > + @retval TRUE if valid. > > + > > +**/ > > +BOOLEAN > > +IsElfFormat ( > > + IN CONST UINT8 *ImageBase > > + ) > > +{ > > + Elf32_Ehdr *Elf32Hdr; > > + Elf64_Ehdr *Elf64Hdr; > > + > > + ASSERT (ImageBase != NULL); > > + > > + Elf32Hdr = (Elf32_Ehdr *)ImageBase; > > + > > + // > > + // Start with correct signature "\7fELF" > > + // > > + if ((Elf32Hdr->e_ident[EI_MAG0] != ELFMAG0) || > > + (Elf32Hdr->e_ident[EI_MAG1] != ELFMAG1) || > > + (Elf32Hdr->e_ident[EI_MAG1] != ELFMAG1) || > > + (Elf32Hdr->e_ident[EI_MAG2] != ELFMAG2) > > + ) { > > + return FALSE; > > + } > > + > > + // > > + // Support little-endian only > > + // > > + if (Elf32Hdr->e_ident[EI_DATA] != ELFDATA2LSB) { > > + return FALSE; > > + } > > + > > + // > > + // Check 32/64-bit architecture > > + // > > + if (Elf32Hdr->e_ident[EI_CLASS] == ELFCLASS64) { > > + Elf64Hdr = (Elf64_Ehdr *)Elf32Hdr; > > + Elf32Hdr = NULL; > > + } else if (Elf32Hdr->e_ident[EI_CLASS] == ELFCLASS32) { > > + Elf64Hdr = NULL; > > + } else { > > + return FALSE; > > + } > > + > > + if (Elf64Hdr != NULL) { > > + // > > + // Support intel architecture only for now > > + // > > + if (Elf64Hdr->e_machine != EM_X86_64) { > > + return FALSE; > > + } > > + > > + // > > + // Support ELF types: EXEC (Executable file), DYN (Shared object file) > > + // > > + if ((Elf64Hdr->e_type != ET_EXEC) && (Elf64Hdr->e_type != ET_DYN)) { > > + return FALSE; > > + } > > + > > + // > > + // Support current ELF version only > > + // > > + if (Elf64Hdr->e_version != EV_CURRENT) { > > + return FALSE; > > + } > > + } else { > > + // > > + // Support intel architecture only for now > > + // > > + if (Elf32Hdr->e_machine != EM_386) { > > + return FALSE; > > + } > > + > > + // > > + // Support ELF types: EXEC (Executable file), DYN (Shared object file) > > + // > > + if ((Elf32Hdr->e_type != ET_EXEC) && (Elf32Hdr->e_type != ET_DYN)) { > > + return FALSE; > > + } > > + > > + // > > + // Support current ELF version only > > + // > > + if (Elf32Hdr->e_version != EV_CURRENT) { > > + return FALSE; > > + } > > + } > > + return TRUE; > > +} > > + > > +/** > > + Calculate a ELF image size. > > + > > + @param[in] ElfCt ELF image context pointer. > > + > > + @retval EFI_INVALID_PARAMETER ElfCt or SecPos is NULL. > > + @retval EFI_NOT_FOUND Could not find the section. > > + @retval EFI_SUCCESS Section posistion was filled successfully. > > +**/ > > +EFI_STATUS > > +CalculateElfFileSize ( > > + IN ELF_IMAGE_CONTEXT *ElfCt, > > + OUT UINTN *FileSize > > + ) > Add the second parameter FileSize in the function comment. > +{ > > + EFI_STATUS Status; > > + UINTN FileSize1; > > + UINTN FileSize2; > > + Elf32_Ehdr *Elf32Hdr; > > + Elf64_Ehdr *Elf64Hdr; > > + UINTN Offset; > > + UINTN Size; > > + > > + if ((ElfCt == NULL) || (FileSize == NULL)) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + // Use last section as end of file > > + Status = GetElfSectionPos (ElfCt, ElfCt->ShNum - 1, &Offset, &Size); > > + if (EFI_ERROR(Status)) { > > + return EFI_UNSUPPORTED; > > + } > > + FileSize1 = Offset + Size; > > + > > + // Use end of section header as end of file > > + FileSize2 = 0; > > + if (ElfCt->EiClass == ELFCLASS32) { > > + Elf32Hdr = (Elf32_Ehdr *)ElfCt->FileBase; > > + FileSize2 = Elf32Hdr->e_shoff + Elf32Hdr->e_shentsize * Elf32Hdr- > >e_shnum; > > + } else if (ElfCt->EiClass == ELFCLASS64) { > > + Elf64Hdr = (Elf64_Ehdr *)ElfCt->FileBase; > > + FileSize2 = (UINTN)(Elf64Hdr->e_shoff + Elf64Hdr->e_shentsize * > Elf64Hdr->e_shnum); > > + } > > + > > + *FileSize = MAX(FileSize1, FileSize2); > > + > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Get a ELF program segment loading info. > > + > > + @param[in] ImageBase Image base. > > + @param[in] EiClass ELF class. > > + @param[in] Index ELF segment index. > > + @param[out] SegInfo The pointer to the segment info. > > + > > + @retval EFI_INVALID_PARAMETER ElfCt or SecPos is NULL. > > + @retval EFI_NOT_FOUND Could not find the section. > > + @retval EFI_SUCCESS Section posistion was filled successfully. > > +**/ > > +EFI_STATUS > > +GetElfSegmentInfo ( > > + IN UINT8 *ImageBase, > > + IN UINT32 EiClass, > > + IN UINT32 Index, > > + OUT SEGMENT_INFO *SegInfo > > + ) > > +{ > > + Elf32_Phdr *Elf32Phdr; > > + Elf64_Phdr *Elf64Phdr; > > + > > + if ((ImageBase == NULL) || (SegInfo == NULL)) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + if (EiClass == ELFCLASS32) { > > + Elf32Phdr = GetElf32SegmentByIndex (ImageBase, Index); > > + if (Elf32Phdr != NULL) { > > + SegInfo->PtType = Elf32Phdr->p_type; > > + SegInfo->Offset = Elf32Phdr->p_offset; > > + SegInfo->Length = Elf32Phdr->p_filesz; > > + SegInfo->MemLen = Elf32Phdr->p_memsz; > > + SegInfo->MemAddr = Elf32Phdr->p_paddr; > > + SegInfo->Alignment = Elf32Phdr->p_align; > > + return EFI_SUCCESS; > > + } > > + } else if (EiClass == ELFCLASS64) { > > + Elf64Phdr = GetElf64SegmentByIndex (ImageBase, Index); > > + if (Elf64Phdr != NULL) { > > + SegInfo->PtType = Elf64Phdr->p_type; > > + SegInfo->Offset = (UINTN)Elf64Phdr->p_offset; > > + SegInfo->Length = (UINTN)Elf64Phdr->p_filesz; > > + SegInfo->MemLen = (UINTN)Elf64Phdr->p_memsz; > > + SegInfo->MemAddr = (UINTN)Elf64Phdr->p_paddr; > > + SegInfo->Alignment = (UINTN)Elf64Phdr->p_align; > > + return EFI_SUCCESS; > > + } > > + } > > + > > + return EFI_NOT_FOUND; > > +} > > + > > +/** > > + Parse the ELF image info. > > + > > + On return, all fields in ElfCt are updated except ImageAddress. > > + > > + @param[in] ImageBase Memory address of an image. > > + @param[out] ElfCt The EFL image context pointer. > > + > > + @retval EFI_INVALID_PARAMETER Input parameters are not valid. > > + @retval EFI_UNSUPPORTED Unsupported binary type. > > + @retval EFI_LOAD_ERROR ELF binary loading error. > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +ParseElfImage ( > > + IN VOID *ImageBase, > > + OUT ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + Elf32_Ehdr *Elf32Hdr; > > + Elf64_Ehdr *Elf64Hdr; > > + Elf32_Shdr *Elf32Shdr; > > + Elf64_Shdr *Elf64Shdr; > > + EFI_STATUS Status; > > + UINT32 Index; > > + SEGMENT_INFO SegInfo; > > + UINTN End; > > + UINTN Base; > > + > > + if (ElfCt == NULL) { > > + return EFI_INVALID_PARAMETER; > > + } > > + ZeroMem (ElfCt, sizeof(ELF_IMAGE_CONTEXT)); > > + > > + if (ImageBase == NULL) { > > + return (ElfCt->ParseStatus = EFI_INVALID_PARAMETER); > > + } > > + > > + ElfCt->FileBase = (UINT8 *)ImageBase; > > + if (!IsElfFormat (ElfCt->FileBase)) { > > + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); > > + } > > + > > + Elf32Hdr = (Elf32_Ehdr *)ElfCt->FileBase; > > + ElfCt->EiClass = Elf32Hdr->e_ident[EI_CLASS]; > > + if (ElfCt->EiClass == ELFCLASS32) { > > + if ((Elf32Hdr->e_type != ET_EXEC) && (Elf32Hdr->e_type != ET_DYN)) { > > + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); > > + } > > + Elf32Shdr = (Elf32_Shdr *)GetElf32SectionByIndex (ElfCt->FileBase, > Elf32Hdr->e_shstrndx); > > + if (Elf32Shdr == NULL) { > > + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); > > + } > > + ElfCt->EntryPoint = (UINTN)Elf32Hdr->e_entry; > > + ElfCt->ShNum = Elf32Hdr->e_shnum; > > + ElfCt->PhNum = Elf32Hdr->e_phnum; > > + ElfCt->ShStrLen = Elf32Shdr->sh_size; > > + ElfCt->ShStrOff = Elf32Shdr->sh_offset; > > + } else { > > + Elf64Hdr = (Elf64_Ehdr *)Elf32Hdr; > > + if ((Elf64Hdr->e_type != ET_EXEC) && (Elf64Hdr->e_type != ET_DYN)) { > > + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); > > + } > > + Elf64Shdr = (Elf64_Shdr *)GetElf64SectionByIndex (ElfCt->FileBase, > Elf64Hdr->e_shstrndx); > > + if (Elf64Shdr == NULL) { > > + return (ElfCt->ParseStatus = EFI_UNSUPPORTED); > > + } > > + ElfCt->EntryPoint = (UINTN)Elf64Hdr->e_entry; > > + ElfCt->ShNum = Elf64Hdr->e_shnum; > > + ElfCt->PhNum = Elf64Hdr->e_phnum; > > + ElfCt->ShStrLen = (UINT32)Elf64Shdr->sh_size; > > + ElfCt->ShStrOff = (UINT32)Elf64Shdr->sh_offset; > > + } > > + > > + // > > + // Get the preferred image base and required memory size when loaded > to new location. > > + // > > + End = 0; > > + Base = MAX_UINT32; > > + ElfCt->ReloadRequired = FALSE; > > + for (Index = 0; Index < ElfCt->PhNum; Index++) { > > + Status = GetElfSegmentInfo (ElfCt->FileBase, ElfCt->EiClass, Index, > &SegInfo); > > + ASSERT_EFI_ERROR (Status); > > + > > + if (SegInfo.PtType != PT_LOAD) { > > + continue; > > + } > > + > > + if (SegInfo.MemLen != SegInfo.Length) { > > + // > > + // Not enough space to execute at current location. > > + // > > + ElfCt->ReloadRequired = TRUE; > > + } > > + > > + if (Base > (SegInfo.MemAddr & ~(EFI_PAGE_SIZE - 1))) { > > + Base = SegInfo.MemAddr & ~(EFI_PAGE_SIZE - 1); > > + } > > + if (End < ALIGN_VALUE (SegInfo.MemAddr + SegInfo.MemLen, > EFI_PAGE_SIZE) - 1) { > > + End = ALIGN_VALUE (SegInfo.MemAddr + SegInfo.MemLen, > EFI_PAGE_SIZE) - 1; > > + } > > + } > > + // > > + // 0 - MAX_UINT32 + 1 equals to 0. > > + // > > + ElfCt->ImageSize = End - Base + 1; > > + ElfCt->PreferredImageAddress = (VOID *) Base; > > + > > + CalculateElfFileSize (ElfCt, &ElfCt->FileSize); > > + return (ElfCt->ParseStatus = EFI_SUCCESS);; > > +} > > + > > +/** > > + Load the ELF image to Context.ImageAddress. > > + > > + Context should be initialized by ParseElfImage(). > > + Caller should set Context.ImageAddress to a proper value, either pointing > to > > + a new allocated memory whose size equal to Context.ImageSize, or > pointing > > + to Context.PreferredImageAddress. > > + > > + @param[in] ElfCt ELF image context pointer. > > + > > + @retval EFI_INVALID_PARAMETER Input parameters are not valid. > > + @retval EFI_UNSUPPORTED Unsupported binary type. > > + @retval EFI_LOAD_ERROR ELF binary loading error. > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +LoadElfImage ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + EFI_STATUS Status; > > + > > + if (ElfCt == NULL) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + if (EFI_ERROR (ElfCt->ParseStatus)) { > > + return ElfCt->ParseStatus; > > + } > > + > > + if (ElfCt->ImageAddress == NULL) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + Status = EFI_UNSUPPORTED; > > + if (ElfCt->EiClass == ELFCLASS32) { > > + Status = LoadElf32Image (ElfCt); > > + } else if (ElfCt->EiClass == ELFCLASS64) { > > + Status = LoadElf64Image (ElfCt); > > + } > > + > > + return Status; > > +} > > + > > + > > +/** > > + Get a ELF section name from its index. > > + > > + @param[in] ElfCt ELF image context pointer. > > + @param[in] SectionIndex ELF section index. > > + @param[out] SectionName The pointer to the section name. > > + > > + @retval EFI_INVALID_PARAMETER ElfCt or SecName is NULL. > > + @retval EFI_NOT_FOUND Could not find the section. > > + @retval EFI_SUCCESS Section name was filled successfully. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +GetElfSectionName ( > > + IN ELF_IMAGE_CONTEXT *ElfCt, > > + IN UINT32 SectionIndex, > > + OUT CHAR8 **SectionName > > + ) > > +{ > > + Elf32_Shdr *Elf32Shdr; > > + Elf64_Shdr *Elf64Shdr; > > + CHAR8 *Name; > > + > > + if ((ElfCt == NULL) || (SectionName == NULL)) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + if (EFI_ERROR (ElfCt->ParseStatus)) { > > + return ElfCt->ParseStatus; > > + } > > + > > + Name = NULL; > > + if (ElfCt->EiClass == ELFCLASS32) { > > + Elf32Shdr = GetElf32SectionByIndex (ElfCt->FileBase, SectionIndex); > > + if ((Elf32Shdr != NULL) && (Elf32Shdr->sh_name < ElfCt->ShStrLen)) { > > + Name = (CHAR8 *)(ElfCt->FileBase + ElfCt->ShStrOff + Elf32Shdr- > >sh_name); > > + } > > + } else if (ElfCt->EiClass == ELFCLASS64) { > > + Elf64Shdr = GetElf64SectionByIndex (ElfCt->FileBase, SectionIndex); > > + if ((Elf64Shdr != NULL) && (Elf64Shdr->sh_name < ElfCt->ShStrLen)) { > > + Name = (CHAR8 *)(ElfCt->FileBase + ElfCt->ShStrOff + Elf64Shdr- > >sh_name); > > + } > > + } > > + > > + if (Name == NULL) { > > + return EFI_NOT_FOUND; > > + } > > + > > + *SectionName = Name; > > + return EFI_SUCCESS; > > +} > > + > > + > > +/** > > + Get the offset and size of x-th ELF section. > > + > > + @param[in] ElfCt ELF image context pointer. > > + @param[in] Index ELF section index. > > + @param[out] Offset Return the offset of the specific section. > > + @param[out] Size Return the size of the specific section. > > + > > + @retval EFI_INVALID_PARAMETER ImageBase, Offset or Size is NULL. > > + @retval EFI_INVALID_PARAMETER EiClass doesn't equal to ELFCLASS32 or > ELFCLASS64. > > + @retval EFI_NOT_FOUND Could not find the section. > > + @retval EFI_SUCCESS Offset and Size are returned. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +GetElfSectionPos ( > > + IN ELF_IMAGE_CONTEXT *ElfCt, > > + IN UINT32 Index, > > + OUT UINTN *Offset, > > + OUT UINTN *Size > > + ) > > +{ > > + Elf32_Shdr *Elf32Shdr; > > + Elf64_Shdr *Elf64Shdr; > > + > > + if ((ElfCt == NULL) || (Offset == NULL) || (Size == NULL)) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + if (EFI_ERROR (ElfCt->ParseStatus)) { > > + return ElfCt->ParseStatus; > > + } > > + > > + if (ElfCt->EiClass == ELFCLASS32) { > > + Elf32Shdr = GetElf32SectionByIndex (ElfCt->FileBase, Index); > > + if (Elf32Shdr != NULL) { > > + *Offset = (UINTN)Elf32Shdr->sh_offset; > > + *Size = (UINTN)Elf32Shdr->sh_size; > > + return EFI_SUCCESS; > > + } > > + } else if (ElfCt->EiClass == ELFCLASS64) { > > + Elf64Shdr = GetElf64SectionByIndex (ElfCt->FileBase, Index); > > + if (Elf64Shdr != NULL) { > > + *Offset = (UINTN)Elf64Shdr->sh_offset; > > + *Size = (UINTN)Elf64Shdr->sh_size; > > + return EFI_SUCCESS; > > + } > > + } > > + > > + return EFI_NOT_FOUND; > > +} > > + > > +/** > > + Relocate all sections in a ELF image to current location. > > + > > + @param[in] ElfCt ELF image context pointer. > > + > > + @retval EFI_INVALID_PARAMETER ElfCt is NULL. > > + @retval EFI_UNSUPPORTED Relocation is not supported. > > + @retval EFI_SUCCESS ELF image was relocated successfully. > > +**/ > > +EFI_STATUS > > +RelocateElfSections ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ) > > +{ > > + EFI_STATUS Status; > > + > > + ASSERT (ElfCt != NULL); > > + > > + Status = EFI_UNSUPPORTED; > > + if (ElfCt->EiClass == ELFCLASS32) { > > + Status = RelocateElf32Sections (ElfCt); > > + } else if (ElfCt->EiClass == ELFCLASS64) { > > + Status = RelocateElf64Sections (ElfCt); > > + } > > + return Status; > > +} > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h > b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h > new file mode 100644 > index 0000000000..b4b591d2e7 > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h > @@ -0,0 +1,88 @@ > +/** @file > > + ELF library > > + > > + Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR> > > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#ifndef _EFI_LIB_INTERNAL_H_ > > +#define _EFI_LIB_INTERNAL_H_ > > + > > +#include <Library/BaseLib.h> > > +#include <Library/DebugLib.h> > > +#include <Library/BaseMemoryLib.h> > > +#include "ElfLib.h" > > +#include "ElfCommon.h" > > +#include "Elf32.h" > > +#include "Elf64.h" > > + > > +#define ELF_NEXT_ENTRY(EntryType, Current, EntrySize) \ > > + ((EntryType *) ((UINT8 *)Current + EntrySize)) > > + > > +Elf32_Shdr * > > +GetElf32SectionByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ); > > + > > +Elf64_Shdr * > > +GetElf64SectionByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ); > > + > > +Elf32_Phdr * > > +GetElf32SegmentByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ); > > + > > +Elf64_Phdr * > > +GetElf64SegmentByIndex ( > > + IN UINT8 *ImageBase, > > + IN UINT32 Index > > + ); > > + > > +/** > > + Load ELF image which has 32-bit architecture > > + > > + @param[in] ElfCt ELF image context pointer. > > + > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > + @retval Others Loading ELF binary fails. > > + > > +**/ > > +EFI_STATUS > > +LoadElf32Image ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ); > > + > > +/** > > + Load ELF image which has 64-bit architecture > > + > > + @param[in] ImageBase Memory address of an image. > > + @param[out] EntryPoint The entry point of loaded ELF image. > > + > > + @retval EFI_SUCCESS ELF binary is loaded successfully. > > + @retval Others Loading ELF binary fails. > > + > > +**/ > > +EFI_STATUS > > +LoadElf64Image ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ); > > + > > + > > +EFI_STATUS > > +RelocateElf32Sections ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ); > > + > > + > > +EFI_STATUS > > +RelocateElf64Sections ( > > + IN ELF_IMAGE_CONTEXT *ElfCt > > + ); > > + > > +#endif > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c > b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c > new file mode 100644 > index 0000000000..ac27fcf267 > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c > @@ -0,0 +1,187 @@ > +/** @file > > + ELF Load Image Support > > + > > +Copyright (c) 2021, Intel Corporation. All rights reserved.<BR> > > +SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#include <PiPei.h> > > +#include <UniversalPayload/UniversalPayload.h> > > +#include <UniversalPayload/ExtraData.h> > > + > > +#include <Ppi/LoadFile.h> > > + > > +#include <Library/DebugLib.h> > > +#include <Library/HobLib.h> > > +#include <Library/PeiServicesLib.h> > > +#include <Library/MemoryAllocationLib.h> > > +#include <Library/BaseMemoryLib.h> > > + > > +#include "ElfLib.h" > > + > > +/** > > + The wrapper function of PeiLoadImageLoadImage(). > > + > > + @param This - Pointer to EFI_PEI_LOAD_FILE_PPI. > > + @param FileHandle - Pointer to the FFS file header of the image. > > + @param ImageAddressArg - Pointer to PE/TE image. > > + @param ImageSizeArg - Size of PE/TE image. > > + @param EntryPoint - Pointer to entry point of specified image file for > output. > > + @param AuthenticationState - Pointer to attestation authentication state > of image. > > + > > + @return Status of PeiLoadImageLoadImage(). > > + > > +**/ > > +EFI_STATUS > > +EFIAPI > > +PeiLoadFileLoadPayload ( > > + IN CONST EFI_PEI_LOAD_FILE_PPI *This, > > + IN EFI_PEI_FILE_HANDLE FileHandle, > > + OUT EFI_PHYSICAL_ADDRESS *ImageAddressArg, OPTIONAL > > + OUT UINT64 *ImageSizeArg, OPTIONAL > > + OUT EFI_PHYSICAL_ADDRESS *EntryPoint, > > + OUT UINT32 *AuthenticationState > > + ) > > +{ > > + EFI_STATUS Status; > > + VOID *Elf; > > + PLD_EXTRA_DATA *ExtraData; > > + ELF_IMAGE_CONTEXT Context; > > + PLD_INFO_HEADER *PldInfo; > > + UINT32 Index; > > + UINT16 ExtraDataIndex; > > + CHAR8 *SectionName; > > + UINTN Offset; > > + UINTN Size; > > + UINT32 ExtraDataCount; > > + UINTN Instance; > > + > > + // > > + // ELF is added to file as RAW section for EDKII bootloader. > > + // But RAW section might be added by build tool before the ELF RAW > section when alignment is specified for ELF RAW section. > > + // Below loop skips the RAW section that doesn't contain valid ELF image. > > + // > > + Instance = 0; > > + do { > > + Status = PeiServicesFfsFindSectionData3 (EFI_SECTION_RAW, Instance++, > FileHandle, &Elf, AuthenticationState); > > + if (EFI_ERROR (Status)) { > > + return Status; > > + } > > + > > + ZeroMem (&Context, sizeof (Context)); > > + Status = ParseElfImage (Elf, &Context); > > + } while (EFI_ERROR (Status)); > > + > > + DEBUG (( > > + DEBUG_INFO, "Payload File Size: 0x%08X, Mem Size: 0x%08x, > Reload: %d\n", > > + Context.FileSize, Context.ImageSize, Context.ReloadRequired > > + )); > > + > > + // > > + // Get PLD_INFO and number of additional PLD sections. > > + // > > + PldInfo = NULL; > > + ExtraDataCount = 0; > > + for (Index = 0; Index < Context.ShNum; Index++) { > > + Status = GetElfSectionName (&Context, Index, &SectionName); > > + if (EFI_ERROR(Status)) { > > + continue; > > + } > > + DEBUG ((DEBUG_ERROR, "Payload Section[%d]: %a\n", Index, > SectionName)); > Better using DEBUG_INFO since this is expected info > + if (AsciiStrCmp(SectionName, PLD_INFO_SEC_NAME) == 0) { > > + Status = GetElfSectionPos (&Context, Index, &Offset, &Size); > > + if (!EFI_ERROR(Status)) { > > + PldInfo = (PLD_INFO_HEADER *)(Context.FileBase + Offset); > > + } > > + } else if (AsciiStrnCmp(SectionName, PLD_EXTRA_SEC_NAME_PREFIX, > PLD_EXTRA_SEC_NAME_PREFIX_LENGTH) == 0) { > > + Status = GetElfSectionPos (&Context, Index, &Offset, &Size); > > + if (!EFI_ERROR (Status)) { > > + ExtraDataCount++; > > + } > > + } > > + } > > + > > + // > > + // Report the additional PLD sections through HOB. > > + // > > + ExtraData = BuildGuidHob ( > > + &gPldExtraDataGuid, > > + sizeof (PLD_EXTRA_DATA) + ExtraDataCount * sizeof > (PLD_EXTRA_DATA_ENTRY) > > + ); > > + ExtraData->Count = ExtraDataCount; > > + if (ExtraDataCount != 0) { > > + for (ExtraDataIndex = 0, Index = 0; Index < Context.ShNum; Index++) { > > + Status = GetElfSectionName (&Context, Index, &SectionName); > > + if (EFI_ERROR(Status)) { > > + continue; > > + } > > + if (AsciiStrnCmp(SectionName, PLD_EXTRA_SEC_NAME_PREFIX, > PLD_EXTRA_SEC_NAME_PREFIX_LENGTH) == 0) { > > + Status = GetElfSectionPos (&Context, Index, &Offset, &Size); > > + if (!EFI_ERROR (Status)) { > > + ASSERT (ExtraDataIndex < ExtraDataCount); > > + AsciiStrCpyS ( > > + ExtraData->Entry[ExtraDataIndex].Identifier, > > + sizeof(ExtraData->Entry[ExtraDataIndex].Identifier), > > + SectionName + PLD_EXTRA_SEC_NAME_PREFIX_LENGTH > > + ); > > + ExtraData->Entry[ExtraDataIndex].Base = (UINTN)(Context.FileBase + > Offset); > > + ExtraData->Entry[ExtraDataIndex].Size = Size; > > + ExtraDataIndex++; > > + } > > + } > > + } > > + } > > + > > + if (Context.ReloadRequired || Context.PreferredImageAddress != > Context.FileBase) { > > + Context.ImageAddress = AllocatePages (EFI_SIZE_TO_PAGES > (Context.ImageSize)); > > + } else { > > + Context.ImageAddress = Context.FileBase; > > + } > > + > > + // > > + // Load ELF into the required base > > + // > > + Status = LoadElfImage (&Context); > > + if (!EFI_ERROR(Status)) { > > + *ImageAddressArg = (UINTN) Context.ImageAddress; > > + *EntryPoint = Context.EntryPoint; > > + *ImageSizeArg = Context.ImageSize; > > + } > > + return Status; > > +} > > + > > + > > +EFI_PEI_LOAD_FILE_PPI mPeiLoadFilePpi = { > > + PeiLoadFileLoadPayload > > +}; > > + > > + > > +EFI_PEI_PPI_DESCRIPTOR gPpiLoadFilePpiList = { > > + (EFI_PEI_PPI_DESCRIPTOR_PPI | > EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), > > + &gEfiPeiLoadFilePpiGuid, > > + &mPeiLoadFilePpi > > +}; > > +/** > > + > > + Install Pei Load File PPI. > > + > > + @param FileHandle Handle of the file being invoked. > > + @param PeiServices Describes the list of possible PEI Services. > > + > > + @retval EFI_SUCESS The entry point executes successfully. > > + @retval Others Some error occurs during the execution of this function. > > + > > +**/ > > +EFI_STATUS > > +EFIAPI > > +InitializePayloadLoaderPeim ( > > + IN EFI_PEI_FILE_HANDLE FileHandle, > > + IN CONST EFI_PEI_SERVICES **PeiServices > > + ) > > +{ > > + EFI_STATUS Status; > > + Status = PeiServicesInstallPpi (&gPpiLoadFilePpiList); > > + > > + return Status; > > +} > > diff --git a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf > b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf > new file mode 100644 > index 0000000000..c45f3ecf2d > --- /dev/null > +++ b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf > @@ -0,0 +1,59 @@ > +## @file > > +# Produce LoadFile PPI for ELF loading. > > +# > > +# Copyright (c) 2021, Intel Corporation. All rights reserved.<BR> > > +# > > +# SPDX-License-Identifier: BSD-2-Clause-Patent > > +# > > +## > > + > > +[Defines] > > + INF_VERSION = 0x00010005 > > + BASE_NAME = ElfLoaderPeim > > + FILE_GUID = D071A3B4-3EC1-40C5-BEF8-D0BD4A2446F0 > > + MODULE_TYPE = PEIM > > + VERSION_STRING = 1.0 > > + > > + ENTRY_POINT = InitializePayloadLoaderPeim > > + > > +# > > +# The following information is for reference only and not required by the > build tools. > > +# > > +# VALID_ARCHITECTURES = IA32 X64 > > +# > > + > > +[Sources] > > + PayloadLoaderPeim.c > > + ElfLib.h > > + ElfLib/ElfLibInternal.h > > + ElfLib/ElfCommon.h > > + ElfLib/Elf32.h > > + ElfLib/Elf64.h > > + ElfLib/ElfLibInternal.h > > + ElfLib/ElfLib.c > > + ElfLib/Elf32Lib.c > > + ElfLib/Elf64Lib.c > > + > > +[Packages] > > + MdePkg/MdePkg.dec > > + MdeModulePkg/MdeModulePkg.dec > > + UefiPayloadPkg/UefiPayloadPkg.dec > > + > > +[LibraryClasses] > > + PcdLib > > + MemoryAllocationLib > > + BaseMemoryLib > > + PeiServicesLib > > + HobLib > > + BaseLib > > + PeimEntryPoint > > + DebugLib > > + > > +[Ppis] > > + gEfiPeiLoadFilePpiGuid ## PRODUCES > > + > > +[Guids] > > + gPldExtraDataGuid ## PRODUCES > > + > > +[Depex] > > + TRUE > \ No newline at end of file > -- > 2.31.1.windows.1 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/4] PeiCore: Remove assertion when failing to load PE image 2021-05-26 8:23 [PATCH 0/4] Support payload in ELF format Ni, Ray ` (2 preceding siblings ...) 2021-05-26 8:23 ` [PATCH 3/4] UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload Ni, Ray @ 2021-05-26 8:23 ` Ni, Ray 2021-05-26 10:53 ` [edk2-devel] [PATCH 0/4] Support payload in ELF format Steven Shi 4 siblings, 0 replies; 14+ messages in thread From: Ni, Ray @ 2021-05-26 8:23 UTC (permalink / raw) To: devel; +Cc: Jian J Wang, Hao A Wu, Dandan Bi, Liming Gao EFI_PEI_LOAD_FILE_PPI is invoked by DxeIpl for loading DxeCore. It's possible that the instance produced by PeiCore fails to load but other instances of EFI_PEI_LOAD_FILE_PPI can load. Signed-off-by: Ray Ni <ray.ni@intel.com> Cc: Jian J Wang <jian.j.wang@intel.com> Cc: Hao A Wu <hao.a.wu@intel.com> Cc: Dandan Bi <dandan.bi@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> --- MdeModulePkg/Core/Pei/Image/Image.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c index 1d15774527..5af3895191 100644 --- a/MdeModulePkg/Core/Pei/Image/Image.c +++ b/MdeModulePkg/Core/Pei/Image/Image.c @@ -1,7 +1,7 @@ /** @file Pei Core Load Image Support -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -661,9 +661,6 @@ PeiLoadImageLoadImage ( &ImageEntryPoint ); - ASSERT_EFI_ERROR (Status); - - if (EFI_ERROR (Status)) { return Status; } -- 2.31.1.windows.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [edk2-devel] [PATCH 0/4] Support payload in ELF format 2021-05-26 8:23 [PATCH 0/4] Support payload in ELF format Ni, Ray ` (3 preceding siblings ...) 2021-05-26 8:23 ` [PATCH 4/4] PeiCore: Remove assertion when failing to load PE image Ni, Ray @ 2021-05-26 10:53 ` Steven Shi 2021-05-27 12:51 ` Ni, Ray 4 siblings, 1 reply; 14+ messages in thread From: Steven Shi @ 2021-05-26 10:53 UTC (permalink / raw) To: devel@edk2.groups.io, Ni, Ray Is the CLANGDWARF a general toolchain? I suggest separating the CLANGDWARF toolchain code as a stand-alone patch. Thanks Steven Shi > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ni, Ray > Sent: Wednesday, May 26, 2021 4:23 PM > To: devel@edk2.groups.io > Subject: [edk2-devel] [PATCH 0/4] Support payload in ELF format > > Per universal payload spec, the payload is in ELF format. > > The patch set adds toolchain CLANGDWARF for building ELF image and > > adds a payload loader that can load ELF image. > > Ray Ni (4): > BaseTools: Create CLANGDWARF toolchain > MdePkg/UniversalPayload: Add definition for extra info in payload > UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload > PeiCore: Remove assertion when failing to load PE image > > BaseTools/Conf/build_rule.template | 10 +- > BaseTools/Conf/tools_def.template | 98 ++ > MdeModulePkg/Core/Pei/Image/Image.c | 5 +- > MdePkg/Include/UniversalPayload/ExtraData.h | 28 + > .../UniversalPayload/UniversalPayload.h | 38 + > MdePkg/MdePkg.dec | 3 + > UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h | 122 +++ > .../PayloadLoaderPeim/ElfLib/Elf32.h | 252 +++++ > .../PayloadLoaderPeim/ElfLib/Elf32Lib.c | 398 +++++++ > .../PayloadLoaderPeim/ElfLib/Elf64.h | 254 +++++ > .../PayloadLoaderPeim/ElfLib/Elf64Lib.c | 407 ++++++++ > .../PayloadLoaderPeim/ElfLib/ElfCommon.h | 983 ++++++++++++++++++ > .../PayloadLoaderPeim/ElfLib/ElfLib.c | 499 +++++++++ > .../PayloadLoaderPeim/ElfLib/ElfLibInternal.h | 88 ++ > .../PayloadLoaderPeim/PayloadLoaderPeim.c | 187 ++++ > .../PayloadLoaderPeim/PayloadLoaderPeim.inf | 59 ++ > 16 files changed, 3426 insertions(+), 5 deletions(-) > create mode 100644 MdePkg/Include/UniversalPayload/ExtraData.h > create mode 100644 MdePkg/Include/UniversalPayload/UniversalPayload.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c > create mode 100644 > UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf > > -- > 2.31.1.windows.1 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#75598): https://edk2.groups.io/g/devel/message/75598 > Mute This Topic: https://groups.io/mt/83095852/1781003 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > -=-=-=-=-=-= > ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [edk2-devel] [PATCH 0/4] Support payload in ELF format 2021-05-26 10:53 ` [edk2-devel] [PATCH 0/4] Support payload in ELF format Steven Shi @ 2021-05-27 12:51 ` Ni, Ray 0 siblings, 0 replies; 14+ messages in thread From: Ni, Ray @ 2021-05-27 12:51 UTC (permalink / raw) To: Shi, Steven, devel@edk2.groups.io Steven, Thanks for the comments. Yes, it's a general toolchain that can generate ELF executable. I also received your comments to 1/4. I will post V2 of 1/4 as a separate patch with your comments addressed. Thanks, Ray > -----Original Message----- > From: Shi, Steven <steven.shi@intel.com> > Sent: Wednesday, May 26, 2021 6:53 PM > To: devel@edk2.groups.io; Ni, Ray <ray.ni@intel.com> > Subject: RE: [edk2-devel] [PATCH 0/4] Support payload in ELF format > > Is the CLANGDWARF a general toolchain? I suggest separating the CLANGDWARF toolchain code as a stand-alone patch. > > > Thanks > > Steven Shi > > > > -----Original Message----- > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ni, Ray > > Sent: Wednesday, May 26, 2021 4:23 PM > > To: devel@edk2.groups.io > > Subject: [edk2-devel] [PATCH 0/4] Support payload in ELF format > > > > Per universal payload spec, the payload is in ELF format. > > > > The patch set adds toolchain CLANGDWARF for building ELF image and > > > > adds a payload loader that can load ELF image. > > > > Ray Ni (4): > > BaseTools: Create CLANGDWARF toolchain > > MdePkg/UniversalPayload: Add definition for extra info in payload > > UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload > > PeiCore: Remove assertion when failing to load PE image > > > > BaseTools/Conf/build_rule.template | 10 +- > > BaseTools/Conf/tools_def.template | 98 ++ > > MdeModulePkg/Core/Pei/Image/Image.c | 5 +- > > MdePkg/Include/UniversalPayload/ExtraData.h | 28 + > > .../UniversalPayload/UniversalPayload.h | 38 + > > MdePkg/MdePkg.dec | 3 + > > UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h | 122 +++ > > .../PayloadLoaderPeim/ElfLib/Elf32.h | 252 +++++ > > .../PayloadLoaderPeim/ElfLib/Elf32Lib.c | 398 +++++++ > > .../PayloadLoaderPeim/ElfLib/Elf64.h | 254 +++++ > > .../PayloadLoaderPeim/ElfLib/Elf64Lib.c | 407 ++++++++ > > .../PayloadLoaderPeim/ElfLib/ElfCommon.h | 983 ++++++++++++++++++ > > .../PayloadLoaderPeim/ElfLib/ElfLib.c | 499 +++++++++ > > .../PayloadLoaderPeim/ElfLib/ElfLibInternal.h | 88 ++ > > .../PayloadLoaderPeim/PayloadLoaderPeim.c | 187 ++++ > > .../PayloadLoaderPeim/PayloadLoaderPeim.inf | 59 ++ > > 16 files changed, 3426 insertions(+), 5 deletions(-) > > create mode 100644 MdePkg/Include/UniversalPayload/ExtraData.h > > create mode 100644 MdePkg/Include/UniversalPayload/UniversalPayload.h > > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib.h > > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32.h > > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf32Lib.c > > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64.h > > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/Elf64Lib.c > > create mode 100644 > > UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfCommon.h > > create mode 100644 UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLib.c > > create mode 100644 > > UefiPayloadPkg/PayloadLoaderPeim/ElfLib/ElfLibInternal.h > > create mode 100644 > > UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c > > create mode 100644 > > UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf > > > > -- > > 2.31.1.windows.1 > > > > > > > > -=-=-=-=-=-= > > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#75598): https://edk2.groups.io/g/devel/message/75598 > > Mute This Topic: https://groups.io/mt/83095852/1781003 > > Group Owner: devel+owner@edk2.groups.io > > Unsubscribe: https://edk2.groups.io/g/devel/unsub [steven.shi@intel.com] > > -=-=-=-=-=-= > > ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-06-02 4:35 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-05-26 8:23 [PATCH 0/4] Support payload in ELF format Ni, Ray 2021-05-26 8:23 ` [PATCH 1/4] BaseTools: Create CLANGDWARF toolchain Ni, Ray 2021-05-26 11:35 ` [edk2-devel] " Steven Shi 2021-05-28 2:52 ` 回复: " gaoliming 2021-05-28 14:31 ` Ni, Ray 2021-05-31 3:23 ` 回复: " gaoliming 2021-06-01 15:11 ` Ni, Ray 2021-06-02 2:18 ` 回复: " gaoliming 2021-05-26 8:23 ` [PATCH 2/4] MdePkg/UniversalPayload: Add definition for extra info in payload Ni, Ray 2021-05-26 8:23 ` [PATCH 3/4] UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload Ni, Ray 2021-06-02 4:35 ` Guo Dong 2021-05-26 8:23 ` [PATCH 4/4] PeiCore: Remove assertion when failing to load PE image Ni, Ray 2021-05-26 10:53 ` [edk2-devel] [PATCH 0/4] Support payload in ELF format Steven Shi 2021-05-27 12:51 ` Ni, Ray
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
![[-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --]](../../MWHPR11MB1950EB171867B8330973E7DF8C249@MWHPR11MB1950.namprd11.prod.outlook.com/2-image001.png){kind=link}
![[-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --]](../../000201d7536c$72484030$56d8c090$@byosoft.com.cn/2-image001.png){kind=link}
![[-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --]](../../CO1PR11MB49302D9DDE71A4542E35E9518C229@CO1PR11MB4930.namprd11.prod.outlook.com/2-image001.png){kind=link}
![[-- Attachment #2: image001.png --] [-- Type: image/png, Size: 8405 bytes --]](../../009101d755cc$530c3fc0$f924bf40$@byosoft.com.cn/2-image001.png){kind=link}