public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: "Leif Lindholm" <quic_llindhol@quicinc.com>,
	"Pawel Polawski" <ppolawsk@redhat.com>,
	"Bob Feng" <bob.c.feng@intel.com>,
	"Sunil V L" <sunilvl@ventanamicro.com>,
	"Marvin Häuser" <mhaeuser@posteo.de>,
	"Chao Li" <lichao@loongson.cn>,
	"Dongyan Qian" <qiandongyan@loongson.cn>,
	"Michael D Kinney" <michael.d.kinney@intel.com>,
	"Zhiguang Liu" <zhiguang.liu@intel.com>,
	"Yuwei Chen" <yuwei.chen@intel.com>,
	"Liming Gao" <gaoliming@byosoft.com.cn>,
	"Ard Biesheuvel" <ardb+tianocore@kernel.org>,
	"Baoqi Zhang" <zhangbaoqi@loongson.cn>,
	"Oliver Steffen" <osteffen@redhat.com>,
	"Daniel Schaefer" <git@danielschaefer.me>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PATCH 4/8] MdePkg/PeImage.h: add bits from BaseTools version
Date: Thu, 23 Mar 2023 12:17:29 +0100	[thread overview]
Message-ID: <20230323111733.690211-5-kraxel@redhat.com> (raw)
In-Reply-To: <20230323111733.690211-1-kraxel@redhat.com>

The BaseTools and MdePkg versions of PeImage.h diverged over time,
add some missing bits to the MdePkg header file in preparation for
removing the BaseTools version.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 MdePkg/Include/IndustryStandard/PeImage.h | 31 +++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/MdePkg/Include/IndustryStandard/PeImage.h b/MdePkg/Include/IndustryStandard/PeImage.h
index dd4cc25483bc..c232248cdc31 100644
--- a/MdePkg/Include/IndustryStandard/PeImage.h
+++ b/MdePkg/Include/IndustryStandard/PeImage.h
@@ -101,6 +101,7 @@ typedef struct {
 #define EFI_IMAGE_FILE_EXECUTABLE_IMAGE     BIT1     ///< 0x0002  File is executable  (i.e. no unresolved externel references).
 #define EFI_IMAGE_FILE_LINE_NUMS_STRIPPED   BIT2     ///< 0x0004  Line numbers stripped from file.
 #define EFI_IMAGE_FILE_LOCAL_SYMS_STRIPPED  BIT3     ///< 0x0008  Local symbols stripped from file.
+#define EFI_IMAGE_FILE_LARGE_ADDRESS_AWARE  BIT5     ///< 0x0020  Supports addresses > 2-GB
 #define EFI_IMAGE_FILE_BYTES_REVERSED_LO    BIT7     ///< 0x0080  Bytes of machine word are reversed.
 #define EFI_IMAGE_FILE_32BIT_MACHINE        BIT8     ///< 0x0100  32 bit word machine.
 #define EFI_IMAGE_FILE_DEBUG_STRIPPED       BIT9     ///< 0x0200  Debugging info stripped from file in .DBG file.
@@ -577,6 +578,13 @@ typedef struct {
   UINT32    AddressOfNameOrdinals;
 } EFI_IMAGE_EXPORT_DIRECTORY;
 
+//
+// Based export types.
+//
+#define EFI_IMAGE_EXPORT_ORDINAL_BASE  1
+#define EFI_IMAGE_EXPORT_ADDR_SIZE     4
+#define EFI_IMAGE_EXPORT_ORDINAL_SIZE  2
+
 ///
 /// Hint/Name Table.
 ///
@@ -669,6 +677,29 @@ typedef struct {
   //
 } EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY;
 
+// avoid conflict with windows header files
+#ifndef RUNTIME_FUNCTION_INDIRECT
+
+//
+// .pdata entries for X64
+//
+typedef struct {
+  UINT32    FunctionStartAddress;
+  UINT32    FunctionEndAddress;
+  UINT32    UnwindInfoAddress;
+} RUNTIME_FUNCTION;
+
+#endif
+
+typedef struct {
+  UINT8    Version             : 3;
+  UINT8    Flags               : 5;
+  UINT8    SizeOfProlog;
+  UINT8    CountOfUnwindCodes;
+  UINT8    FrameRegister       : 4;
+  UINT8    FrameRegisterOffset : 4;
+} UNWIND_INFO;
+
 ///
 /// Resource format.
 ///
-- 
2.39.2


  parent reply	other threads:[~2023-03-23 11:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-23 11:17 [PATCH 0/8] BaseTools: remove duplicate includes Gerd Hoffmann
2023-03-23 11:17 ` [PATCH 1/8] BaseTools: remove WinNtInclude.h Gerd Hoffmann
2023-03-23 11:17 ` [PATCH 2/8] BaseTools: remove duplicate includes: <arch>/ProcessorBind.h Gerd Hoffmann
2023-03-23 13:17   ` [edk2-devel] " Chao Li
2023-03-23 11:17 ` [PATCH 3/8] BaseTools: remove duplicate includes: IndustryStandard/Acpi*.h Gerd Hoffmann
2023-03-24 15:31   ` Sunil V L
2023-03-23 11:17 ` Gerd Hoffmann [this message]
2023-03-23 11:17 ` [PATCH 5/8] BaseTools: drop IMAGE_FILE_MACHINE_ARM hacks Gerd Hoffmann
2023-03-23 11:17 ` [PATCH 6/8] BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_* Gerd Hoffmann
2023-03-23 13:19   ` [edk2-devel] " Chao Li
2023-03-23 11:17 ` [PATCH 7/8] BaseTools: remove duplicate includes: IndustryStandard/PeImage.h Gerd Hoffmann
2023-03-23 13:29   ` [edk2-devel] " Chao Li
2023-03-23 11:17 ` [PATCH 8/8] BaseTools: remove duplicate includes: IndustryStandard/*.h Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230323111733.690211-5-kraxel@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox