Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd Hoffmann
> Sent: Thursday, March 2, 2023 10:51 PM
> To: devel@edk2.groups.io
> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Gerd Hoffmann
> <kra...@redhat.com>; Wang, Jian J <jian.j.w...@intel.com>; Yao,
> Jiewen <jiewen....@intel.com>; Marvin Häuser <mhaeu...@posteo.de>; James
> Bottomley <j...@linux.ibm.com>; Michael Roth
> <michael.r...@amd.com>; Wu, Hao A <hao.a...@intel.com>; Kinney, Michael D
> <michael.d.kin...@intel.com>; Oliver Steffen
> <ostef...@redhat.com>; Xu, Min M <min.m...@intel.com>; Gao, Liming
> <gaolim...@byosoft.com.cn>; Ni, Ray <ray...@intel.com>; Tom
> Lendacky <thomas.lenda...@amd.com>; Aktas, Erdem <erdemak...@google.com>;
> Liu, Zhiguang <zhiguang....@intel.com>; Pawel Polawski
> <ppola...@redhat.com>; Justen, Jordan L <jordan.l.jus...@intel.com>
> Subject: [edk2-devel] [PATCH 1/5] MdeModulePkg: Rename IS_ALIGNED macros to
> avoid name collisions
>
> From: Marvin Häuser <mhaeu...@posteo.de>
>
> This patch is a preparation for the patches that follow. The
> subsequent patches will introduce and integrate new alignment-related
> macros, which collide with existing definitions in MdeModulePkg.
> Temporarily rename them to avoid build failure, till they can be
> substituted with the new, shared definitions.
>
> Cc: Jian J Wang <jian.j.w...@intel.com>
> Cc: Hao A Wu <hao.a...@intel.com>
> Cc: Ray Ni <ray...@intel.com>
> Signed-off-by: Marvin Häuser <mhaeu...@posteo.de>
> ---
> MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h | 4 +--
> .../Ata/AtaAtapiPassThru/AtaAtapiPassThru.h | 2 +-
> MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h | 2 +-
> MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h | 2 +-
> .../Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h | 2 +-
> .../Bus/Ufs/UfsPassThruDxe/UfsPassThru.h | 2 +-
> MdeModulePkg/Universal/EbcDxe/EbcExecute.h | 4 +--
> MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c | 2 +-
> .../Bus/Ata/AhciPei/AhciPeiPassThru.c | 6 ++--
> .../Ata/AtaAtapiPassThru/AtaAtapiPassThru.c | 12 +++----
> .../Bus/Ata/AtaBusDxe/AtaPassThruExecute.c | 2 +-
> MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 4 +--
> .../Bus/Ufs/UfsPassThruDxe/UfsPassThru.c | 6 ++--
> MdeModulePkg/Universal/EbcDxe/EbcExecute.c | 36 +++++++++----------
> 14 files changed, 43 insertions(+), 43 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h
> b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h
> index 4aed1cb7ad8a..71d34c962ad1 100644
> --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h
> +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPei.h
> @@ -146,8 +146,8 @@ typedef union {
> #define AHCI_PORT_SERR 0x0030
> #define AHCI_PORT_CI 0x0038
>
> -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
> -#define TIMER_PERIOD_SECONDS(Seconds) MultU64x32((UINT64)(Seconds),
> 10000000)
> +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
> +#define TIMER_PERIOD_SECONDS(Seconds) MultU64x32((UINT64)(Seconds),
> 10000000)
>
> #pragma pack(1)
>
> diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
> b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
> index 62ba6d6680dd..7937886614e1 100644
> --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
> +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
> @@ -148,7 +148,7 @@ struct _ATA_NONBLOCK_TASK {
> #define ATA_ATAPI_TIMEOUT EFI_TIMER_PERIOD_SECONDS(3)
> #define ATA_SPINUP_TIMEOUT EFI_TIMER_PERIOD_SECONDS(10)
>
> -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
> +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
>
> #define ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \
> CR (a, \
> diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
> b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
> index 4428c484fd6c..47346e911d47 100644
> --- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
> +++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
> @@ -76,7 +76,7 @@
> #define ATA_TASK_SIGNATURE SIGNATURE_32 ('A', 'T', 'S', 'K')
> #define ATA_DEVICE_SIGNATURE SIGNATURE_32 ('A', 'B', 'I', 'D')
> #define ATA_SUB_TASK_SIGNATURE SIGNATURE_32 ('A', 'S', 'T', 'S')
> -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
> +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
>
> //
> // ATA bus data structure for ATA controller
> diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
> b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
> index 5b4047e1dbdd..ed384ad52182 100644
> --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
> +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.h
> @@ -38,7 +38,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>
> #define IS_DEVICE_FIXED(a) (a)->FixedDevice ? 1 : 0
>
> -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
> +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
>
> #define UFS_WLUN_RPMB 0xC4
>
> diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
> b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
> index a0b615b7eab3..1adb382aa8c3 100644
> --- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
> +++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.h
> @@ -133,7 +133,7 @@ typedef struct _UFS_PEIM_HC_PRIVATE_DATA {
>
> #define ROUNDUP8(x) (((x) % 8 == 0) ? (x) : ((x) / 8 + 1) * 8)
>
> -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
> +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
>
> #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS(a) CR (a,
> UFS_PEIM_HC_PRIVATE_DATA, BlkIoPpi, UFS_PEIM_HC_SIG)
> #define GET_UFS_PEIM_HC_PRIVATE_DATA_FROM_THIS2(a) CR (a,
> UFS_PEIM_HC_PRIVATE_DATA, BlkIo2Ppi, UFS_PEIM_HC_SIG)
> diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
> b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
> index 2b4f5d32d901..0ec37e56652b 100644
> --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
> +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.h
> @@ -105,7 +105,7 @@ typedef struct {
>
> #define ROUNDUP8(x) (((x) % 8 == 0) ? (x) : ((x) / 8 + 1) * 8)
>
> -#define IS_ALIGNED(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
> +#define ADDRESS_IS_ALIGNED_(addr, size) (((UINTN) (addr) & (size - 1)) == 0)
>
> #define UFS_PASS_THRU_PRIVATE_DATA_FROM_THIS(a) \
> CR (a, \
> diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
> b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
> index 32b8670c5b2a..6dc6730ab095 100644
> --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
> +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.h
> @@ -14,8 +14,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> //
> // Macros to check and set alignment
> //
> -#define ASSERT_ALIGNED(addr, size) ASSERT (!((UINT32) (addr) & (size - 1)))
> -#define IS_ALIGNED(addr, size) !((UINT32) (addr) & (size - 1))
> +#define ASSERT_ALIGNED(addr, size) ASSERT (!((UINT32) (addr) & (size -
> 1)))
> +#define ADDRESS_IS_ALIGNED_(addr, size) !((UINT32) (addr) & (size - 1))
>
> //
> // Debug macro
> diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
> b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
> index 7b97887c5dbd..d93fa78c81f3 100644
> --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
> +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciMode.c
> @@ -2126,7 +2126,7 @@ TrustTransferAtaDevice (
> // ATA PassThru PPI.
> //
> if ((AtaPassThru->Mode->IoAlign > 1) &&
> - !IS_ALIGNED (Buffer, AtaPassThru->Mode->IoAlign))
> + !ADDRESS_IS_ALIGNED_ (Buffer, AtaPassThru->Mode->IoAlign))
> {
> NewBuffer = AllocateAlignedPages (
> EFI_SIZE_TO_PAGES (TransferLength),
> diff --git a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c
> b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c
> index d5ed93dc4f67..0c49059a00d5 100644
> --- a/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c
> +++ b/MdeModulePkg/Bus/Ata/AhciPei/AhciPeiPassThru.c
> @@ -194,15 +194,15 @@ AhciAtaPassThruPassThru (
> }
>
> IoAlign = This->Mode->IoAlign;
> - if ((IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer, IoAlign)) {
> + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->InDataBuffer, IoAlign))
> {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer, IoAlign)) {
> + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->OutDataBuffer,
> IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((IoAlign > 1) && !IS_ALIGNED (Packet->Asb, IoAlign)) {
> + if ((IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb, IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
> b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
> index 1070516b358a..324abadd02dd 100644
> --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
> +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
> @@ -1299,15 +1299,15 @@ AtaPassThruPassThru (
>
> Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (Packet->InDataBuffer, This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (Packet->OutDataBuffer, This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->Asb,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->Asb,
> This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> @@ -2039,15 +2039,15 @@ ExtScsiPassThruPassThru (
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (Packet->InDataBuffer, This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (Packet->OutDataBuffer, This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->SenseData,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData,
> This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
> b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
> index 4334169d256a..18aa4f9bb666 100644
> --- 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
> //
> AtaPassThru = AtaDevice->AtaBusDriverData->AtaPassThru;
> - if ((AtaPassThru->Mode->IoAlign > 1) && !IS_ALIGNED (Buffer,
> AtaPassThru->Mode->IoAlign)) {
> + if ((AtaPassThru->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Buffer,
> AtaPassThru->Mode->IoAlign)) {
> NewBuffer = AllocateAlignedBuffer (AtaDevice, TransferLength);
> if (NewBuffer == NULL) {
> return EFI_OUT_OF_RESOURCES;
> diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
> b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
> index fbc236cb465e..faf4ae332e46 100644
> --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
> +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
> @@ -2029,7 +2029,7 @@ ScsiDiskReceiveData (
> goto Done;
> }
>
> - if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !IS_ALIGNED (PayloadBuffer,
> ScsiDiskDevice->ScsiIo->IoAlign)) {
> + if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (PayloadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) {
> AlignedBuffer = AllocateAlignedBuffer (ScsiDiskDevice,
> PayloadBufferSize);
> if (AlignedBuffer == NULL) {
> Status = EFI_OUT_OF_RESOURCES;
> @@ -2249,7 +2249,7 @@ ScsiDiskSendData (
> goto Done;
> }
>
> - if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !IS_ALIGNED (PayloadBuffer,
> ScsiDiskDevice->ScsiIo->IoAlign)) {
> + if ((ScsiDiskDevice->ScsiIo->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (PayloadBuffer, ScsiDiskDevice->ScsiIo->IoAlign)) {
> AlignedBuffer = AllocateAlignedBuffer (ScsiDiskDevice,
> PayloadBufferSize);
> if (AlignedBuffer == NULL) {
> Status = EFI_OUT_OF_RESOURCES;
> diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
> b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
> index ae593ff03a0d..392a295caf04 100644
> --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
> +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
> @@ -171,15 +171,15 @@ UfsPassThruPassThru (
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (Packet->InDataBuffer, This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_
> (Packet->OutDataBuffer, This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> - if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->SenseData,
> This->Mode->IoAlign)) {
> + if ((This->Mode->IoAlign > 1) && !ADDRESS_IS_ALIGNED_ (Packet->SenseData,
> This->Mode->IoAlign)) {
> return EFI_INVALID_PARAMETER;
> }
>
> diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
> b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
> index 82a7782fb99a..28f108c44873 100644
> --- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
> +++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
> @@ -2015,7 +2015,7 @@ ExecuteJMP (
> // check for alignment, and jump absolute.
> //
> Data64 = (UINT64)VmReadImmed64 (VmPtr, 2);
> - if (!IS_ALIGNED ((UINTN)Data64, sizeof (UINT16))) {
> + if (!ADDRESS_IS_ALIGNED_ ((UINTN)Data64, sizeof (UINT16))) {
> EbcDebugSignalException (
> EXCEPT_EBC_ALIGNMENT_CHECK,
> EXCEPTION_FLAG_FATAL,
> @@ -2074,7 +2074,7 @@ ExecuteJMP (
> // Form: JMP32 @Rx {Index32}
> //
> Addr = VmReadMemN (VmPtr, (UINTN)Data64 + Index32);
> - if (!IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) {
> + if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) {
> EbcDebugSignalException (
> EXCEPT_EBC_ALIGNMENT_CHECK,
> EXCEPTION_FLAG_FATAL,
> @@ -2097,7 +2097,7 @@ ExecuteJMP (
> // Form: JMP32 Rx {Immed32}
> //
> Addr = (UINTN)(Data64 + Index32);
> - if (!IS_ALIGNED ((UINTN)Addr, sizeof (UINT16))) {
> + if (!ADDRESS_IS_ALIGNED_ ((UINTN)Addr, sizeof (UINT16))) {
> EbcDebugSignalException (
> EXCEPT_EBC_ALIGNMENT_CHECK,
> EXCEPTION_FLAG_FATAL,
> @@ -3158,7 +3158,7 @@ ExecuteRET (
> // Pull the return address off the VM app's stack and set the IP
> // to it
> //
> - if (!IS_ALIGNED ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) {
> + if (!ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Gpr[0], sizeof (UINT16))) {
> EbcDebugSignalException (
> EXCEPT_EBC_ALIGNMENT_CHECK,
> EXCEPTION_FLAG_FATAL,
> @@ -4733,7 +4733,7 @@ VmWriteMem16 (
> //
> // Do a simple write if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINT16))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) {
> *(UINT16 *)Addr = Data;
> } else {
> //
> @@ -4795,7 +4795,7 @@ VmWriteMem32 (
> //
> // Do a simple write if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINT32))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) {
> *(UINT32 *)Addr = Data;
> } else {
> //
> @@ -4857,7 +4857,7 @@ VmWriteMem64 (
> //
> // Do a simple write if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINT64))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) {
> *(UINT64 *)Addr = Data;
> } else {
> //
> @@ -4922,7 +4922,7 @@ VmWriteMemN (
> //
> // Do a simple write if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINTN))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) {
> *(UINTN *)Addr = Data;
> } else {
> for (Index = 0; Index < sizeof (UINTN) / sizeof (UINT32); Index++) {
> @@ -4985,7 +4985,7 @@ VmReadImmed16 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) {
> + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (INT16))) {
> return *(INT16 *)(VmPtr->Ip + Offset);
> } else {
> //
> @@ -5029,7 +5029,7 @@ VmReadImmed32 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {
> + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {
> return *(INT32 *)(VmPtr->Ip + Offset);
> }
>
> @@ -5068,7 +5068,7 @@ VmReadImmed64 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {
> + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {
> return *(UINT64 *)(VmPtr->Ip + Offset);
> }
>
> @@ -5105,7 +5105,7 @@ VmReadCode16 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) {
> + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT16))) {
> return *(UINT16 *)(VmPtr->Ip + Offset);
> } else {
> //
> @@ -5147,7 +5147,7 @@ VmReadCode32 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {
> + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT32))) {
> return *(UINT32 *)(VmPtr->Ip + Offset);
> }
>
> @@ -5184,7 +5184,7 @@ VmReadCode64 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {
> + if (ADDRESS_IS_ALIGNED_ ((UINTN)VmPtr->Ip + Offset, sizeof (UINT64))) {
> return *(UINT64 *)(VmPtr->Ip + Offset);
> }
>
> @@ -5247,7 +5247,7 @@ VmReadMem16 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINT16))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT16))) {
> return *(UINT16 *)Addr;
> }
>
> @@ -5281,7 +5281,7 @@ VmReadMem32 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINT32))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT32))) {
> return *(UINT32 *)Addr;
> }
>
> @@ -5319,7 +5319,7 @@ VmReadMem64 (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINT64))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINT64))) {
> return *(UINT64 *)Addr;
> }
>
> @@ -5388,7 +5388,7 @@ VmReadMemN (
> //
> // Read direct if aligned
> //
> - if (IS_ALIGNED (Addr, sizeof (UINTN))) {
> + if (ADDRESS_IS_ALIGNED_ (Addr, sizeof (UINTN))) {
> return *(UINTN *)Addr;
> }
>
> --
> 2.39.2
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#101508): https://edk2.groups.io/g/devel/message/101508
Mute This Topic: https://groups.io/mt/97357265/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe:
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
