diff options
14 files changed, 36 insertions, 28 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c index c302cf56f0..0078082b7d 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c @@ -20,13 +20,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
// This structure is only intended to be used in this file.
//
-#pragma pack(push, 1)
+#pragma pack(1)
typedef struct {
EFI_HII_PACK_HEADER PackageHeader;
FRAMEWORK_EFI_IFR_FORM_SET FormSet;
FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet;
} FW_HII_FORMSET_TEMPLATE;
-#pragma pack(pop)
+#pragma pack()
FW_HII_FORMSET_TEMPLATE FormSetTemplate = {
{
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h index d9b6577adf..6b7810eb92 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h @@ -64,12 +64,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define FRAMEWORK_RESERVED_VARSTORE_ID 0x0001
-#pragma pack (push, 1)
+#pragma pack (1)
typedef struct {
EFI_HII_PACK_HEADER FrameworkPackageHeader;
EFI_HII_PACKAGE_HEADER PackageHeader;
} TIANO_AUTOGEN_PACKAGES_HEADER;
-#pragma pack (pop)
+#pragma pack ()
#define HII_THUNK_PRIVATE_DATA_FROM_THIS(Record) CR(Record, HII_THUNK_PRIVATE_DATA, Hii, HII_THUNK_PRIVATE_DATA_SIGNATURE)
#define HII_THUNK_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('H', 'i', 'I', 'T')
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c index 494a31dc53..3187a94160 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c @@ -22,6 +22,9 @@ BOOLEAN mInFrameworkHiiRemovePack = FALSE; BOOLEAN mInFrameworkUpdatePakcage = FALSE;
UINT64 mGuidCount = 0;
+EFI_GUID mGuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};
+
+
/**
Get the number of package IFR and STRING packages in the package list passed in.
@@ -357,9 +360,7 @@ GenerateRandomGuid ( OUT EFI_GUID * Guid
)
{
- EFI_GUID GuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};
-
- CopyGuid (Guid, &GuidBase);
+ CopyGuid (Guid, &mGuidBase);
mGuidCount++;
*((UINT64 *) Guid) = *((UINT64 *) Guid) + mGuidCount;
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h index 4e2f661c51..da96b1df72 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h @@ -35,7 +35,7 @@ Abstract: 0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \
}
-#pragma pack(push, 1)
+#pragma pack(1)
typedef struct {
UINT8 Type;
@@ -43,7 +43,7 @@ typedef struct { UINT8 Length[2];
} EFI_DEVICE_PATH_PROTOCOL;
-#pragma pack(pop)
+#pragma pack()
#define EFI_END_ENTIRE_DEVICE_PATH 0xff
#define EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE 0xff
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h index 32014095e7..c475cef82e 100644 --- a/EdkCompatibilityPkg/Foundation/Include/EfiPci.h +++ b/EdkCompatibilityPkg/Foundation/Include/EfiPci.h @@ -27,7 +27,7 @@ Revision History //#include "pci23.h"
//#include "pci30.h"
-#pragma pack(push, 1)
+#pragma pack(1)
typedef struct {
UINT8 Register;
@@ -59,6 +59,6 @@ typedef union { EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt;
} EFI_PCI_ROM_HEADER;
-#pragma pack(pop)
+#pragma pack()
#endif
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h index ea89f5658b..212d1e002d 100644 --- a/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h +++ b/EdkCompatibilityPkg/Foundation/Include/EfiTpm.h @@ -57,7 +57,7 @@ Abstract: //
// Set structure alignment to 1-byte
//
-#pragma pack (push, 1)
+#pragma pack (1)
typedef UINT32 TCG_EVENTTYPE;
@@ -139,6 +139,6 @@ typedef struct tdEFI_VARIABLE_DATA { //
// Restore original structure alignment
//
-#pragma pack (pop)
+#pragma pack ()
#endif // _EFI_TPM_H_
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h index bf484a7541..ecaece1d1c 100644 --- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h +++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/LegacyBiosMpTable.h @@ -28,7 +28,7 @@ Abstract: //
// Define MP table structures. All are packed.
//
-#pragma pack(push, 1)
+#pragma pack(1)
#define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE EFI_SIGNATURE_32 ('_', 'M', 'P', '_')
typedef struct {
@@ -278,6 +278,6 @@ typedef struct { UINT32 PredefinedRangeList;
} EFI_LEGACY_MP_TABLE_ENTRY_EXT_COMPAT_BUS_ADDR_SPACE_MODIFIER;
-#pragma pack(pop)
+#pragma pack()
#endif
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h index 77aebb69e6..f047e629bc 100644 --- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h +++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci22.h @@ -35,7 +35,7 @@ Revision History //
#define PCI_VGA_PALETTE_SNOOP_DISABLED 0x20
-#pragma pack(push, 1)
+#pragma pack(1)
typedef struct {
UINT16 VendorId;
UINT16 DeviceId;
@@ -544,7 +544,7 @@ typedef struct { #define PCI_BAR_IDX5 0x05
#define PCI_BAR_ALL 0xFF
-#pragma pack(pop)
+#pragma pack()
//
// NOTE: The following header files are included here for
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h index 1a9219b377..446cea4f69 100644 --- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h +++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/pci30.h @@ -28,7 +28,7 @@ Revision History #define PCI_CLASS_MASS_STORAGE_SATADPA 0x06
#define PCI_CLASS_MASS_STORAGE_AHCI PCI_CLASS_MASS_STORAGE_SATADPA
-#pragma pack(push, 1)
+#pragma pack(1)
typedef struct {
UINT32 Signature; // "PCIR"
@@ -47,6 +47,6 @@ typedef struct { UINT16 DMTFCLPEntryPointOffset;
} PCI_3_0_DATA_STRUCTURE;
-#pragma pack(pop)
+#pragma pack()
#endif
diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h index 75ccf10511..c0180e72b2 100644 --- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h @@ -189,7 +189,11 @@ typedef int64_t intn_t; // Inject a break point in the code to assist debugging.
//
#define EFI_DEADLOOP() { volatile int __iii; __iii = 1; while (__iii); }
-#define EFI_BREAKPOINT() __debugbreak()
+#if _MSC_EXTENSIONS
+ #define EFI_BREAKPOINT() __debugbreak()
+#elif __GNUC__
+ #define EFI_BREAKPOINT() asm(" int $3");
+#endif
//
// Memory Fence forces serialization, and is needed to support out of order
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf index 80247ec6d5..2e0ea5ee5a 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/BaseLib.inf @@ -561,8 +561,6 @@ COMPONENT_TYPE = LIBRARY ChkStkGcc.c | GCC
[Sources.IPF]
- SynchronizationMsc.c
- Math64.c
Ipf/asm.h
Ipf/ia_64gen.h
Ipf/PalCallStatic.s
@@ -570,7 +568,6 @@ COMPONENT_TYPE = LIBRARY Ipf/longjmp.s
Ipf/SwitchStack.s
Ipf/Unaligned.c
- Ipf/CpuBreakpoint.c
Ipf/InterlockedCompareExchange32.s
Ipf/InterlockedCompareExchange64.s
Ipf/Synchronization.c
@@ -589,7 +586,13 @@ COMPONENT_TYPE = LIBRARY Ipf/ExecFc.s
Ipf/ReadCpuid.s
Ipf/AccessGp.s
-
+ Math64.c
+ Ipf/CpuBreakpoint.c | INTEL
+ Ipf/CpuBreakpoint.c | MSFT
+ Synchronization.c | INTEL
+ SynchronizationMsc.c | MSFT
+ SynchronizationGcc.c | GCC
+
[sources.ebc]
Math64.c
Unaligned.c
diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s index 4606437117..6aa0640f21 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s +++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Ipf/SetJmp.s @@ -229,7 +229,7 @@ PROCEDURE_ENTRY(LongJump) //
// check if RNAT is saved between saved BSP and curr BSPSTORE
//
- dep r18 = 1,r16,3,6 // get RNAT address
+ dep r18 = -1,r16,3,6 // get RNAT address
;;
cmp.ltu p8,p9 = r18, r17 // RNAT saved on RSE
;;
diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c index 9bd77e24ca..df247522f6 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c +++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c @@ -23,7 +23,7 @@ Abstract: #include "Thunk16Lib.h"
#include "EfiCommonLib.h"
-#define IA32API __cdecl
+#define IA32API EFIAPI
extern CONST UINTN mCode16Size;
diff --git a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h index de064649f8..aa104a79bf 100644 --- a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h +++ b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h @@ -50,7 +50,7 @@ EFI_FORWARD_DECLARATION (EFI_TCG_PROTOCOL); //
// Set structure alignment to 1-byte
//
-#pragma pack (push, 1)
+#pragma pack (1)
typedef struct {
UINT8 Major;
@@ -74,7 +74,7 @@ typedef UINT32 TCG_ALGORITHM_ID; //
// Restore original structure alignment
//
-#pragma pack (pop)
+#pragma pack ()
typedef
EFI_STATUS
|