DynamicTablesPkg: Fix unaligned pointers usage

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>

2 files changed, 24 insertions, 13 deletions

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c
index 40699ce113..82070403ac 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c
@@ -1066,6 +1066,9 @@ BuildPpttTable (
   EFI_STATUS                      Status;

   UINT32                          TableSize;

   UINT32                          ProcTopologyStructCount;

+  UINT32                          ProcHierarchyNodeCount;

+  UINT32                          CacheStructCount;

+  UINT32                          IdStructCount;

 

   UINT32                          ProcHierarchyNodeOffset;

   UINT32                          CacheStructOffset;

@@ -1113,7 +1116,7 @@ BuildPpttTable (
              CfgMgrProtocol,

              CM_NULL_TOKEN,

              &ProcHierarchyNodeList,

-             &Generator->ProcHierarchyNodeCount

+             &ProcHierarchyNodeCount

              );

   if (EFI_ERROR (Status)) {

     DEBUG ((

@@ -1124,7 +1127,8 @@ BuildPpttTable (
     goto error_handler;

   }

 

-  ProcTopologyStructCount = Generator->ProcHierarchyNodeCount;

+  ProcTopologyStructCount = ProcHierarchyNodeCount;

+  Generator->ProcHierarchyNodeCount = ProcHierarchyNodeCount;

 

   // Get the cache info and update the processor topology structure count with

   // Cache Type Structures (Type 1)

@@ -1132,7 +1136,7 @@ BuildPpttTable (
              CfgMgrProtocol,

              CM_NULL_TOKEN,

              &CacheStructList,

-             &Generator->CacheStructCount

+             &CacheStructCount

              );

   if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {

     DEBUG ((

@@ -1143,7 +1147,8 @@ BuildPpttTable (
     goto error_handler;

   }

 

-  ProcTopologyStructCount += Generator->CacheStructCount;

+  ProcTopologyStructCount += CacheStructCount;

+  Generator->CacheStructCount = CacheStructCount;

 

   // Get the processor hierarchy node ID info and update the processor topology

   // structure count with ID Structures (Type 2)

@@ -1151,7 +1156,7 @@ BuildPpttTable (
              CfgMgrProtocol,

              CM_NULL_TOKEN,

              &IdStructList,

-             &Generator->IdStructCount

+             &IdStructCount

              );

   if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) {

     DEBUG ((

@@ -1163,7 +1168,8 @@ BuildPpttTable (
     goto error_handler;

   }

 

-  ProcTopologyStructCount += Generator->IdStructCount;

+  ProcTopologyStructCount += IdStructCount;

+  Generator->IdStructCount = IdStructCount;

 

   // Allocate Node Indexer array

   NodeIndexer = (PPTT_NODE_INDEXER*)AllocateZeroPool (

@@ -1475,6 +1481,12 @@ ACPI_PPTT_GENERATOR PpttGenerator = {
 

   // Processor topology node count

   0,

+  // Count of Processor Hierarchy Nodes

+  0,

+  // Count of Cache Structures

+  0,

+  // Count of Id Structures

+  0,

   // Pointer to PPTT Node Indexer

   NULL

 };

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h
index 6a0fdd08e1..0a14da502d 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h
@@ -167,6 +167,12 @@ typedef struct AcpiPpttGenerator {
   ACPI_TABLE_GENERATOR  Header;

   /// PPTT structure count

   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

   PPTT_NODE_INDEXER   * NodeIndexer;

   /// Pointer to the start of Processor Hierarchy nodes in

@@ -176,13 +182,6 @@ typedef struct AcpiPpttGenerator {
   PPTT_NODE_INDEXER   * CacheStructIndexedList;

   /// Pointer to the start of Id Structures in the Node Indexer array

   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;

 

 #pragma pack()