tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 23:24:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

DynamicTablesPkg: Fix unaligned pointers usage

Browse Source 
The VS2017 compiler reports 'warning C4366: The result of
the unary '&' operator may be unaligned' if an address of
an unaligned structure member is passed as an argument to
a function.

Fix this warning by using local variables in place of
unaligned structure members.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
This commit is contained in:
Sami Mujawar 2019-07-09 15:58:37 +01:00 committed by mergify[bot]
parent 90e52483bf
commit d39271f114
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c
View File

@ -1066,6 +1066,9 @@ BuildPpttTable (
EFI_STATUS Status; EFI_STATUS Status;
UINT32 TableSize; UINT32 TableSize;
UINT32 ProcTopologyStructCount; UINT32 ProcTopologyStructCount;
UINT32 ProcHierarchyNodeCount;
UINT32 CacheStructCount;
UINT32 IdStructCount;
UINT32 ProcHierarchyNodeOffset; UINT32 ProcHierarchyNodeOffset;
UINT32 CacheStructOffset; UINT32 CacheStructOffset;
@ -1113,7 +1116,7 @@ BuildPpttTable (
CfgMgrProtocol, CfgMgrProtocol,
CM_NULL_TOKEN, CM_NULL_TOKEN,
&ProcHierarchyNodeList, &ProcHierarchyNodeList,
&Generator->ProcHierarchyNodeCount &ProcHierarchyNodeCount
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG (( DEBUG ((
@ -1124,7 +1127,8 @@ BuildPpttTable (
goto error_handler; goto error_handler;
} }
ProcTopologyStructCount = Generator->ProcHierarchyNodeCount; ProcTopologyStructCount = ProcHierarchyNodeCount;
Generator->ProcHierarchyNodeCount = ProcHierarchyNodeCount;
// Get the cache info and update the processor topology structure count with // Get the cache info and update the processor topology structure count with
// Cache Type Structures (Type 1) // Cache Type Structures (Type 1)
@ -1132,7 +1136,7 @@ BuildPpttTable (
CfgMgrProtocol, CfgMgrProtocol,
CM_NULL_TOKEN, CM_NULL_TOKEN,
&CacheStructList, &CacheStructList,
&Generator->CacheStructCount &CacheStructCount
); );
if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) { if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {
DEBUG (( DEBUG ((
@ -1143,7 +1147,8 @@ BuildPpttTable (
goto error_handler; goto error_handler;
} }
ProcTopologyStructCount += Generator->CacheStructCount; ProcTopologyStructCount += CacheStructCount;
Generator->CacheStructCount = CacheStructCount;
// Get the processor hierarchy node ID info and update the processor topology // Get the processor hierarchy node ID info and update the processor topology
// structure count with ID Structures (Type 2) // structure count with ID Structures (Type 2)
@ -1151,7 +1156,7 @@ BuildPpttTable (
CfgMgrProtocol, CfgMgrProtocol,
CM_NULL_TOKEN, CM_NULL_TOKEN,
&IdStructList, &IdStructList,
&Generator->IdStructCount &IdStructCount
); );
if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) { if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {
DEBUG (( DEBUG ((
@ -1163,7 +1168,8 @@ BuildPpttTable (
goto error_handler; goto error_handler;
} }
ProcTopologyStructCount += Generator->IdStructCount; ProcTopologyStructCount += IdStructCount;
Generator->IdStructCount = IdStructCount;
// Allocate Node Indexer array // Allocate Node Indexer array
NodeIndexer = (PPTT_NODE_INDEXER*)AllocateZeroPool ( NodeIndexer = (PPTT_NODE_INDEXER*)AllocateZeroPool (
@ -1475,6 +1481,12 @@ ACPI_PPTT_GENERATOR PpttGenerator = {
// Processor topology node count // Processor topology node count
0, 0,
// Count of Processor Hierarchy Nodes
0,
// Count of Cache Structures
0,
// Count of Id Structures
0,
// Pointer to PPTT Node Indexer // Pointer to PPTT Node Indexer
NULL NULL
}; };

13
DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h
View File

@ -167,6 +167,12 @@ typedef struct AcpiPpttGenerator {
ACPI_TABLE_GENERATOR Header; ACPI_TABLE_GENERATOR Header;
/// PPTT structure count /// PPTT structure count
UINT32 ProcTopologyStructCount; UINT32 ProcTopologyStructCount;
/// Count of Processor Hierarchy Nodes
UINT32 ProcHierarchyNodeCount;
/// Count of Cache Structures
UINT32 CacheStructCount;
/// Count of Id Structures
UINT32 IdStructCount;
/// List of indexed CM objects for PPTT generation /// List of indexed CM objects for PPTT generation
PPTT_NODE_INDEXER * NodeIndexer; PPTT_NODE_INDEXER * NodeIndexer;
/// Pointer to the start of Processor Hierarchy nodes in /// Pointer to the start of Processor Hierarchy nodes in
@ -176,13 +182,6 @@ typedef struct AcpiPpttGenerator {
PPTT_NODE_INDEXER * CacheStructIndexedList; PPTT_NODE_INDEXER * CacheStructIndexedList;
/// Pointer to the start of Id Structures in the Node Indexer array /// Pointer to the start of Id Structures in the Node Indexer array
PPTT_NODE_INDEXER * IdStructIndexedList; PPTT_NODE_INDEXER * IdStructIndexedList;
/// Count of Processor Hierarchy Nodes
UINT32 ProcHierarchyNodeCount;
/// Count of Cache Structures
UINT32 CacheStructCount;
/// Count of Id Structures
UINT32 IdStructCount;
} ACPI_PPTT_GENERATOR; } ACPI_PPTT_GENERATOR;
#pragma pack() #pragma pack()