MdeModulePkg: Source fixes and cleanup for ARMGCC compiles

- Fix EFI_IPv4_ADDRESS usages to use a macro to copy the structure
  instead of direct assignment, to avoid runtime alignment errors.
- Fix a EFI_INPUT_KEY usage in TerminalDxe to use CopyMem()  to copy the
   structure instead of direct assignment, to avoid runtime alignment error.
- Delete excess local variables that are initialized but otherwise unused.
- CompilerIntrinsicsLib library now imported for AARCH64, as well as ARM.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Randy Pawell <randy_pawell@hp.com>
Reviewed-by: Olivier Martin <Olivier.Martin@arm.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16471 6f19259b-4bc3-4df7-8a09-765794883524

10 files changed, 33 insertions, 30 deletions

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
index 4320549ed4..468785807f 100644
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c
@@ -2,6 +2,7 @@
   NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows

   NVM Express specification.

 

+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -852,7 +853,6 @@ NvmExpressBuildDevicePath (
   IN OUT EFI_DEVICE_PATH_PROTOCOL                    **DevicePath

   )

 {

-  NVME_CONTROLLER_PRIVATE_DATA   *Private;

   NVME_NAMESPACE_DEVICE_PATH     *Node;

 

   //

@@ -862,8 +862,6 @@ NvmExpressBuildDevicePath (
     return EFI_INVALID_PARAMETER;

   }

 

-  Private = NVME_CONTROLLER_PRIVATE_DATA_FROM_PASS_THRU (This);

-

   if (NamespaceId == 0) {

     return EFI_NOT_FOUND;

   }

diff --git a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
index 0ade9b2311..abf4f8f26a 100644
--- a/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
+++ b/MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.c
@@ -1,6 +1,7 @@
 /** @file

   16550 UART Serial Port library functions

 

+  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -184,7 +185,6 @@ GetSerialRegisterBase (
   )

 {

   UINTN                 PciLibAddress;

-  UINTN                 PrimaryBusNumber;

   UINTN                 BusNumber;

   UINTN                 SubordinateBusNumber;

   UINT32                ParentIoBase;

@@ -233,7 +233,6 @@ GetSerialRegisterBase (
     //

     // Retrieve and verify the bus numbers in the PCI to PCI Bridge

     //

-    PrimaryBusNumber     = PciRead8 (PciLibAddress + PCI_BRIDGE_PRIMARY_BUS_REGISTER_OFFSET);

     BusNumber            = PciRead8 (PciLibAddress + PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET);

     SubordinateBusNumber = PciRead8 (PciLibAddress + PCI_BRIDGE_SUBORDINATE_BUS_REGISTER_OFFSET);

     if (BusNumber == 0 || BusNumber > SubordinateBusNumber) {

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index 837a1dba4d..cc93c2b89c 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -1,6 +1,7 @@
 /** @file

   IpIo Library.

 

+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -703,7 +704,7 @@ IpIoCreateSndEntry (
 

     Ip4TxData = &TxData->Ip4TxData;

 

-    CopyMem (&Ip4TxData->DestinationAddress, Dest, sizeof (EFI_IPv4_ADDRESS));

+    IP4_COPY_ADDRESS (&Ip4TxData->DestinationAddress, Dest);

 

     Ip4TxData->OverrideData    = &OverrideData->Ip4OverrideData;

     Ip4TxData->OptionsLength   = 0;

@@ -1765,8 +1766,8 @@ IpIoConfigIp (
                   NULL

                   );

 

-        ((EFI_IP4_CONFIG_DATA*) IpConfigData)->StationAddress = Ip4ModeData.ConfigData.StationAddress;

-        ((EFI_IP4_CONFIG_DATA*) IpConfigData)->SubnetMask     = Ip4ModeData.ConfigData.SubnetMask;

+        IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA*) IpConfigData)->StationAddress, &Ip4ModeData.ConfigData.StationAddress);

+        IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA*) IpConfigData)->SubnetMask, &Ip4ModeData.ConfigData.SubnetMask);

     }

 

       CopyMem (

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index f15dfdf23e..2b1c4d84c5 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -1,6 +1,7 @@
 ## @file

 # EFI/PI Reference Module Package for All Architectures

 #

+# (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

 #

 #    This program and the accompanying materials

@@ -145,10 +146,10 @@
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf

 

-[LibraryClasses.ARM]

+[LibraryClasses.ARM, LibraryClasses.AARCH64]

   #

-  # It is not possible to prevent the ARM compiler for generic intrinsic functions.

-  # This library provides the instrinsic functions generate by a given compiler.

+  # It is not possible to prevent ARM compiler calls to generic intrinsic functions.

+  # This library provides the instrinsic functions generated by a given compiler.

   # [LibraryClasses.ARM] and NULL mean link this library into all ARM images.

   #

   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf

diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
index 507f862de7..d789fbbc75 100644
--- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
+++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
@@ -9,6 +9,7 @@
   CapsuleDataCoalesce() will do basic validation before coalesce capsule data

   into memory.

 

+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -960,7 +961,6 @@ CapsuleDataCoalesce (
   UINT8                          *DestPtr;

   UINTN                          DestLength;

   UINT8                          *RelocPtr;

-  UINT64                         *AddDataPtr;

   UINTN                          CapsuleTimes; 

   UINT64                         SizeLeft; 

   UINT64                         CapsuleImageSize; 

@@ -986,7 +986,6 @@ CapsuleDataCoalesce (
   CapsuleTimes     = 0;

   CapsuleImageSize = 0;

   PrivateDataPtr   = NULL;

-  AddDataPtr       = NULL;

   CapsuleHeader    = NULL;

   CapsuleBeginFlag = TRUE;

   CapsuleSize      = 0;

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 1f29b61646..4a008c9ada 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -1,6 +1,7 @@
 /** @file

   Implementation for EFI_SIMPLE_TEXT_INPUT_PROTOCOL protocol.

 

+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -847,7 +848,7 @@ EfiKeyFiFoRemoveOneKey (
     return FALSE;

   }

 

-  *Output                         = TerminalDevice->EfiKeyFiFo->Data[Head];

+  CopyMem (Output, &TerminalDevice->EfiKeyFiFo->Data[Head], sizeof (EFI_INPUT_KEY));

 

   TerminalDevice->EfiKeyFiFo->Head = (UINT8) ((Head + 1) % (FIFO_MAX_NUMBER + 1));

 

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 03b7f28171..7ed2e5250f 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -1,6 +1,7 @@
 /** @file

   Interface routine for Mtftp4.

   

+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -305,13 +306,13 @@ Mtftp4ConfigUnicastPort (
   UdpConfig.ReceiveTimeout     = 0;

   UdpConfig.TransmitTimeout    = 0;

   UdpConfig.UseDefaultAddress  = Config->UseDefaultSetting;

-  UdpConfig.StationAddress     = Config->StationIp;

-  UdpConfig.SubnetMask         = Config->SubnetMask;

+  IP4_COPY_ADDRESS (&UdpConfig.StationAddress, &Config->StationIp);

+  IP4_COPY_ADDRESS (&UdpConfig.SubnetMask, &Config->SubnetMask);

   UdpConfig.StationPort        = 0;

   UdpConfig.RemotePort         = 0;

 

   Ip = HTONL (Instance->ServerIp);

-  CopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));

+  IP4_COPY_ADDRESS (&UdpConfig.RemoteAddress, &Ip);

 

   Status = UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, &UdpConfig);

 

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index 21547ee3af..e983d79791 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
@@ -1,6 +1,7 @@
 /** @file

   Routines to process Rrq (download).

   

+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -413,13 +414,13 @@ Mtftp4RrqConfigMcastPort (
   UdpConfig.ReceiveTimeout     = 0;

   UdpConfig.TransmitTimeout    = 0;

   UdpConfig.UseDefaultAddress  = Config->UseDefaultSetting;

-  UdpConfig.StationAddress     = Config->StationIp;

-  UdpConfig.SubnetMask         = Config->SubnetMask;

+  IP4_COPY_ADDRESS (&UdpConfig.StationAddress, &Config->StationIp);

+  IP4_COPY_ADDRESS (&UdpConfig.SubnetMask, &Config->SubnetMask);

   UdpConfig.StationPort        = Instance->McastPort;

   UdpConfig.RemotePort         = 0;

 

   Ip = HTONL (Instance->ServerIp);

-  CopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));

+  IP4_COPY_ADDRESS (&UdpConfig.RemoteAddress, &Ip);

 

   Status = McastIo->Protocol.Udp4->Configure (McastIo->Protocol.Udp4, &UdpConfig);

 

@@ -451,7 +452,7 @@ Mtftp4RrqConfigMcastPort (
   // join the multicast group

   //

   Ip = HTONL (Instance->McastIp);

-  CopyMem (&Group, &Ip, sizeof (EFI_IPv4_ADDRESS));

+  IP4_COPY_ADDRESS (&Group, &Ip);

 

   return McastIo->Protocol.Udp4->Groups (McastIo->Protocol.Udp4, TRUE, &Group);

 }

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index b6d89be2b1..5b327af721 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -1,6 +1,7 @@
 /** @file

   Tcp request dispatcher implementation.

 

+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -101,11 +102,11 @@ Tcp4GetMode (
 

     AccessPoint->UseDefaultAddress  = Tcb->UseDefaultAddr;

 

-    CopyMem (&AccessPoint->StationAddress, &Tcb->LocalEnd.Ip, sizeof (EFI_IPv4_ADDRESS));

-    AccessPoint->SubnetMask         = Tcb->SubnetMask;

+    IP4_COPY_ADDRESS (&AccessPoint->StationAddress, &Tcb->LocalEnd.Ip);

+    IP4_COPY_ADDRESS (&AccessPoint->SubnetMask, &Tcb->SubnetMask);

     AccessPoint->StationPort        = NTOHS (Tcb->LocalEnd.Port);

 

-    CopyMem (&AccessPoint->RemoteAddress, &Tcb->RemoteEnd.Ip, sizeof (EFI_IPv4_ADDRESS));

+    IP4_COPY_ADDRESS (&AccessPoint->RemoteAddress, &Tcb->RemoteEnd.Ip);

     AccessPoint->RemotePort         = NTOHS (Tcb->RemoteEnd.Port);

     AccessPoint->ActiveFlag         = (BOOLEAN) (Tcb->State != TCP_LISTEN);

 

@@ -458,7 +459,7 @@ Tcp4ConfigurePcb (
 

   CopyMem (&Tcb->LocalEnd.Ip, &CfgData->AccessPoint.StationAddress, sizeof (IP4_ADDR));

   Tcb->LocalEnd.Port  = HTONS (CfgData->AccessPoint.StationPort);

-  Tcb->SubnetMask     = CfgData->AccessPoint.SubnetMask;

+  IP4_COPY_ADDRESS (&Tcb->SubnetMask, &CfgData->AccessPoint.SubnetMask);

 

   if (CfgData->AccessPoint.ActiveFlag) {

     CopyMem (&Tcb->RemoteEnd.Ip, &CfgData->AccessPoint.RemoteAddress, sizeof (IP4_ADDR));

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
index d33402078f..5ea22acb14 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
@@ -1,5 +1,6 @@
 /** @file

 

+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>

 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -227,8 +228,8 @@ Udp4Configure (
       // Save the configuration data.

       //

       CopyMem (&Instance->ConfigData, UdpConfigData, sizeof (Instance->ConfigData));

-      Instance->ConfigData.StationAddress = Ip4ConfigData.StationAddress;

-      Instance->ConfigData.SubnetMask     = Ip4ConfigData.SubnetMask;

+      IP4_COPY_ADDRESS (&Instance->ConfigData.StationAddress, &Ip4ConfigData.StationAddress);

+      IP4_COPY_ADDRESS (&Instance->ConfigData.SubnetMask, &Ip4ConfigData.SubnetMask);

 

       //

       // Try to allocate the required port resource.

@@ -588,7 +589,7 @@ Udp4Transmit (
   Udp4Header->Checksum     = 0;

 

   UdpSessionData = TxData->UdpSessionData;

-  Override.Ip4OverrideData.SourceAddress = ConfigData->StationAddress;

+  IP4_COPY_ADDRESS (&Override.Ip4OverrideData.SourceAddress, &ConfigData->StationAddress);

 

   if (UdpSessionData != NULL) {

     //

@@ -596,7 +597,7 @@ Udp4Transmit (
     // UdpSessionData.

     //

     if (!EFI_IP4_EQUAL (&UdpSessionData->SourceAddress, &mZeroIp4Addr)) {

-      CopyMem (&Override.Ip4OverrideData.SourceAddress, &UdpSessionData->SourceAddress, sizeof (EFI_IPv4_ADDRESS));

+      IP4_COPY_ADDRESS (&Override.Ip4OverrideData.SourceAddress, &UdpSessionData->SourceAddress);

     }

 

     if (UdpSessionData->SourcePort != 0) {

@@ -643,7 +644,7 @@ Udp4Transmit (
   // Fill the IpIo Override data.

   //

   if (TxData->GatewayAddress != NULL) {

-    CopyMem (&Override.Ip4OverrideData.GatewayAddress, TxData->GatewayAddress, sizeof (EFI_IPv4_ADDRESS));

+    IP4_COPY_ADDRESS (&Override.Ip4OverrideData.GatewayAddress, TxData->GatewayAddress);

   } else {

     ZeroMem (&Override.Ip4OverrideData.GatewayAddress, sizeof (EFI_IPv4_ADDRESS));

   }