MdeModulePkg: Consume new alignment-related macros

This patch substitutes the macros that were renamed in the first
patch with the new, shared alignment macros.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Vitaly Cheptsov <vit9696@protonmail.com>
Signed-off-by: Marvin Häuser <mhaeuser@posteo.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
index d93fa78c81f307a2329a15641f8c22740631b50f..0f0198d3085beb486142dba073a14425ffae619b 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
@@ -2126,7 +2126,7 @@ TrustTransferAtaDevice (
     // ATA PassThru PPI.\r
     //\r
     if ((AtaPassThru->Mode->IoAlign > 1) &&\r
-        !ADDRESS_IS_ALIGNED_ (Buffer, AtaPassThru->Mode->IoAlign))\r
+        !ADDRESS_IS_ALIGNED (Buffer, AtaPassThru->Mode->IoAlign))\r
     {\r
       NewBuffer = AllocateAlignedPages (\r
                     EFI_SIZE_TO_PAGES (TransferLength),\r

diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h
index 71d34c962ad10e88e4cd7ad7a271c192597403e6..e2e4ba43e7c4c8d40aeecdd7891f6c39d50664be 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h
+++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h
@@ -146,8 +146,7 @@ typedef union {
 #define AHCI_PORT_SERR  0x0030\r
 #define AHCI_PORT_CI    0x0038\r
 \r
-#define ADDRESS_IS_ALIGNED_(addr, size)  (((UINTN) (addr) & (size - 1)) == 0)\r
-#define TIMER_PERIOD_SECONDS(Seconds)    MultU64x32((UINT64)(Seconds), 10000000)\r
+#define TIMER_PERIOD_SECONDS(Seconds)  MultU64x32((UINT64)(Seconds), 10000000)\r
 \r
 #pragma pack(1)\r
 \r

diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c
index 0c49059a00d597bfe04a15fd60a3eca9a2edcca9..cd55272c96cdc54f6906a70e47a0073ee941bcdb 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c
@@ -194,15 +194,15 @@ AhciAtaPassThruPassThru (
   }\r
 \r
   IoAlign = This->Mode->IoAlign;\r
-  if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuffer, IoAlign)) {\r
+  if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuffer, IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBuffer, IoAlign)) {\r
+  if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuffer, IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb, IoAlign)) {\r
+  if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->Asb, IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index 324abadd02ddcfbb7f0a390c87ecdf129fdbb882..50406fe0270dfbd0e1dfa26d4014f1b5e86e6332 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -1299,15 +1299,15 @@ AtaPassThruPassThru (
 \r
   Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->Asb, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2039,15 +2039,15 @@ ExtScsiPassThruPassThru (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->SenseData, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
index 7937886614e118348b95b1ff835ef6c9f6ad95f1..016fc6890ae9488e650d3045832d1aae78106b8d 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
@@ -148,8 +148,6 @@ struct _ATA_NONBLOCK_TASK {
 #define ATA_ATAPI_TIMEOUT   EFI_TIMER_PERIOD_SECONDS(3)\r
 #define ATA_SPINUP_TIMEOUT  EFI_TIMER_PERIOD_SECONDS(10)\r
 \r
-#define ADDRESS_IS_ALIGNED_(addr, size)  (((UINTN) (addr) & (size - 1)) == 0)\r
-\r
 #define ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \\r
   CR (a, \\r
       ATA_ATAPI_PASS_THRU_INSTANCE, \\r

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
index 47346e911d47ea99cf5ba4954f07e36eae500397..6bc345f7e777f9652b718b2a76974b896854bb63 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
@@ -76,7 +76,6 @@
 #define ATA_TASK_SIGNATURE      SIGNATURE_32 ('A', 'T', 'S', 'K')\r
 #define ATA_DEVICE_SIGNATURE    SIGNATURE_32 ('A', 'B', 'I', 'D')\r
 #define ATA_SUB_TASK_SIGNATURE  SIGNATURE_32 ('A', 'S', 'T', 'S')\r
-#define ADDRESS_IS_ALIGNED_(addr, size)  (((UINTN) (addr) & (size - 1)) == 0)\r
 \r
 //\r
 // ATA bus data structure for ATA controller\r

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index 18aa4f9bb666d6fe8828ad17638dc314450940af..a77852bae0544eab8497f62f1931305a6ba8b935 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
@@ -1040,7 +1040,7 @@ TrustTransferAtaDevice (
     // Check the alignment of the incoming buffer prior to invoking underlying ATA PassThru\r
     //\r
     AtaPassThru = AtaDevice->AtaBusDriverData->AtaPassThru;\r
-    if ((AtaPassThru->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Buffer, AtaPassThru->Mode->IoAlign)) {\r
+    if ((AtaPassThru->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Buffer, AtaPassThru->Mode->IoAlign)) {\r
       NewBuffer = AllocateAlignedBuffer (AtaDevice, TransferLength);\r
       if (NewBuffer == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index faf4ae332e46846d5ea2fac09db8b35baf244e31..873581d817ce1702794ee777e43bdd664bdd0b52 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -2029,7 +2029,7 @@ ScsiDiskReceiveData (
       goto Done;\r
     }\r
 \r
-    if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (PayloadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) {\r
+    if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED (PayloadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) {\r
       AlignedBuffer = AllocateAlignedBuffer (ScsiDiskDevice, PayloadBufferSize);\r
       if (AlignedBuffer == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
@@ -2249,7 +2249,7 @@ ScsiDiskSendData (
       goto Done;\r
     }\r
 \r
-    if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (PayloadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) {\r
+    if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED (PayloadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) {\r
       AlignedBuffer = AllocateAlignedBuffer (ScsiDiskDevice, PayloadBufferSize);\r
       if (AlignedBuffer == NULL) {\r
         Status = EFI_OUT_OF_RESOURCES;\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
index ed384ad52182348cece97814497e6a7861772353..5a25b55c4952d9fd23b4269b45ca6aba3b42d026 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
@@ -38,8 +38,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #define IS_DEVICE_FIXED(a)  (a)->FixedDevice ? 1 : 0\r
 \r
-#define ADDRESS_IS_ALIGNED_(addr, size)  (((UINTN) (addr) & (size - 1)) == 0)\r
-\r
 #define UFS_WLUN_RPMB  0xC4\r
 \r
 typedef struct {\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
index 1adb382aa8c32062d959de127d75aa3eeea31726..ed4776f548e0446cf994de7a5bc8bcf230fcc829 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
@@ -133,8 +133,6 @@ typedef struct _UFS_PEIM_HC_PRIVATE_DATA {
 \r
 #define ROUNDUP8(x)  (((x) % 8 == 0) ? (x) : ((x) / 8 + 1) * 8)\r
 \r
-#define ADDRESS_IS_ALIGNED_(addr, size)  (((UINTN) (addr) & (size - 1)) == 0)\r
-\r
 #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS(a)         CR (a, UFS_PEIM_HC_PRIVATE_DATA, BlkIoPpi, UFS_PEIM_HC_SIG)\r
 #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2(a)        CR (a, UFS_PEIM_HC_PRIVATE_DATA, BlkIo2Ppi, UFS_PEIM_HC_SIG)\r
 #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS_NOTIFY(a)  CR (a, UFS_PEIM_HC_PRIVATE_DATA, EndOfPeiNotifyList, UFS_PEIM_HC_SIG)\r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
index 392a295caf046ca24d520cd4b036fb57dd8baaae..880e7d85114e68234cd297086f9fd378680fda58 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
@@ -171,15 +171,15 @@ UfsPassThruPassThru (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED (Packet->SenseData, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
index 0ec37e56652b46849b91e0d35087151ec635f01b..bc1139da6e3b417c5c85affdc5b4e553ce3b01cb 100644 (file)
--- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
+++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
@@ -105,8 +105,6 @@ typedef struct {
 \r
 #define ROUNDUP8(x)  (((x) % 8 == 0) ? (x) : ((x) / 8 + 1) * 8)\r
 \r
-#define ADDRESS_IS_ALIGNED_(addr, size)  (((UINTN) (addr) & (size - 1)) == 0)\r
-\r
 #define UFS_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \\r
   CR (a, \\r
       UFS_PASS_THRU_PRIVATE_DATA, \\r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index 28f108c44873e69e7f36c78a1fe9459d5d30c413..3221f95a739f0fd1c9c16bc41a231afd3826789f 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -2015,7 +2015,7 @@ ExecuteJMP (
     // check for alignment, and jump absolute.\r
     //\r
     Data64 = (UINT64)VmReadImmed64 (VmPtr, 2);\r
-    if (!ADDRESS_IS_ALIGNED_ ((UINTN)Data64, sizeof (UINT16))) {\r
+    if (!ADDRESS_IS_ALIGNED ((UINTN)Data64, sizeof (UINT16))) {\r
       EbcDebugSignalException (\r
         EXCEPT_EBC_ALIGNMENT_CHECK,\r
         EXCEPTION_FLAG_FATAL,\r
@@ -2074,7 +2074,7 @@ ExecuteJMP (
     // Form: JMP32 @Rx {Index32}\r
     //\r
     Addr = VmReadMemN (VmPtr, (UINTN)Data64 + Index32);\r
-    if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) {\r
+    if (!ADDRESS_IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) {\r
       EbcDebugSignalException (\r
         EXCEPT_EBC_ALIGNMENT_CHECK,\r
         EXCEPTION_FLAG_FATAL,\r
@@ -2097,7 +2097,7 @@ ExecuteJMP (
     // Form: JMP32 Rx {Immed32}\r
     //\r
     Addr = (UINTN)(Data64 + Index32);\r
-    if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) {\r
+    if (!ADDRESS_IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) {\r
       EbcDebugSignalException (\r
         EXCEPT_EBC_ALIGNMENT_CHECK,\r
         EXCEPTION_FLAG_FATAL,\r
@@ -3158,7 +3158,7 @@ ExecuteRET (
     // Pull the return address off the VM app's stack and set the IP\r
     // to it\r
     //\r
-    if (!ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) {\r
+    if (!ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) {\r
       EbcDebugSignalException (\r
         EXCEPT_EBC_ALIGNMENT_CHECK,\r
         EXCEPTION_FLAG_FATAL,\r
@@ -4733,7 +4733,7 @@ VmWriteMem16 (
   //\r
   // Do a simple write if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT16))) {\r
     *(UINT16 *)Addr = Data;\r
   } else {\r
     //\r
@@ -4795,7 +4795,7 @@ VmWriteMem32 (
   //\r
   // Do a simple write if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT32))) {\r
     *(UINT32 *)Addr = Data;\r
   } else {\r
     //\r
@@ -4857,7 +4857,7 @@ VmWriteMem64 (
   //\r
   // Do a simple write if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT64))) {\r
     *(UINT64 *)Addr = Data;\r
   } else {\r
     //\r
@@ -4922,7 +4922,7 @@ VmWriteMemN (
   //\r
   // Do a simple write if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINTN))) {\r
     *(UINTN *)Addr = Data;\r
   } else {\r
     for (Index = 0; Index < sizeof (UINTN) / sizeof (UINT32); Index++) {\r
@@ -4985,7 +4985,7 @@ VmReadImmed16 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) {\r
+  if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) {\r
     return *(INT16 *)(VmPtr->Ip + Offset);\r
   } else {\r
     //\r
@@ -5029,7 +5029,7 @@ VmReadImmed32 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {\r
+  if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {\r
     return *(INT32 *)(VmPtr->Ip + Offset);\r
   }\r
 \r
@@ -5068,7 +5068,7 @@ VmReadImmed64 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {\r
+  if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {\r
     return *(UINT64 *)(VmPtr->Ip + Offset);\r
   }\r
 \r
@@ -5105,7 +5105,7 @@ VmReadCode16 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) {\r
+  if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) {\r
     return *(UINT16 *)(VmPtr->Ip + Offset);\r
   } else {\r
     //\r
@@ -5147,7 +5147,7 @@ VmReadCode32 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {\r
+  if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {\r
     return *(UINT32 *)(VmPtr->Ip + Offset);\r
   }\r
 \r
@@ -5184,7 +5184,7 @@ VmReadCode64 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {\r
+  if (ADDRESS_IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {\r
     return *(UINT64 *)(VmPtr->Ip + Offset);\r
   }\r
 \r
@@ -5247,7 +5247,7 @@ VmReadMem16 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT16))) {\r
     return *(UINT16 *)Addr;\r
   }\r
 \r
@@ -5281,7 +5281,7 @@ VmReadMem32 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT32))) {\r
     return *(UINT32 *)Addr;\r
   }\r
 \r
@@ -5319,7 +5319,7 @@ VmReadMem64 (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINT64))) {\r
     return *(UINT64 *)Addr;\r
   }\r
 \r
@@ -5388,7 +5388,7 @@ VmReadMemN (
   //\r
   // Read direct if aligned\r
   //\r
-  if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) {\r
+  if (ADDRESS_IS_ALIGNED (Addr, sizeof (UINTN))) {\r
     return *(UINTN *)Addr;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
index 6dc6730ab0958ac4261ae79bf7da2f6288b07318..f3768e79528e705433927aedb59c0059566d711f 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
@@ -14,8 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Macros to check and set alignment\r
 //\r
-#define ASSERT_ALIGNED(addr, size)       ASSERT (!((UINT32) (addr) & (size - 1)))\r
-#define ADDRESS_IS_ALIGNED_(addr, size)  !((UINT32) (addr) & (size - 1))\r
+#define ASSERT_ALIGNED(addr, size)  ASSERT (ADDRESS_IS_ALIGNED (addr, size))\r
 \r
 //\r
 // Debug macro\r