From: "Gao, Liming" <liming.gao@intel.com>
To: Leif Lindholm <leif.lindholm@linaro.org>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH v2] BaseTools: align ERROR/WARNING/RETURN macros with MdePkg versions
Date: Fri, 8 Dec 2017 00:52:56 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E18C4B5@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20171207173800.26730-1-leif.lindholm@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Leif Lindholm
> Sent: Friday, December 8, 2017 1:38 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [PATCH v2] BaseTools: align ERROR/WARNING/RETURN macros with MdePkg versions
>
> BaseTools' BaseTypes.h defined the ENCODE_ERROR macro as
> #define ENCODE_ERROR(a) ((RETURN_STATUS)(MAX_BIT | (a)))
> whereas MdePkg defines it as
> #define ENCODE_ERROR(StatusCode) ((RETURN_STATUS)(MAX_BIT | (StatusCode)))
>
> When building with GCC 6.3 (at least) the former triggers
> "error: overflow in implicit constant conversion [-Werror=overflow]"
> Resolve this by aligning it with the latter one.
>
> This also requires aligning the BaseTools typedef of RETURN_STATUS with
> the MdePkg one: INTN -> UINTN.
>
> While at it, update adjacent ENCODE_WARNING and RETURN_ERROR as well.
>
> Add an explicit initialization of *Alignment to 0 in GenFfs.c
> GetAlignmentFromFile to get rid of a warning occuring with GCC after
> this change (-Werror=maybe-uninitialized).
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
>
> v2 updated for ENCODE_WARNING and RETURN_ERROR, as requested
> by Liming.
>
> BaseTools/Source/C/GenFfs/GenFfs.c | 1 +
> BaseTools/Source/C/Include/Common/BaseTypes.h | 8 ++++----
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
> index e2fb3e0d1e..3b4a9b7761 100644
> --- a/BaseTools/Source/C/GenFfs/GenFfs.c
> +++ b/BaseTools/Source/C/GenFfs/GenFfs.c
> @@ -529,6 +529,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
>
> InFileHandle = NULL;
> PeFileBuffer = NULL;
> + *Alignment = 0;
>
> memset (&ImageContext, 0, sizeof (ImageContext));
>
> diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h
> index 198647ab95..08b60bae11 100644
> --- a/BaseTools/Source/C/Include/Common/BaseTypes.h
> +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h
> @@ -170,15 +170,15 @@
> // EFI Error Codes common to all execution phases
> //
>
> -typedef INTN RETURN_STATUS;
> +typedef UINTN RETURN_STATUS;
>
> ///
> /// Set the upper bit to indicate EFI Error.
> ///
> -#define ENCODE_ERROR(a) (MAX_BIT | (a))
> +#define ENCODE_ERROR(a) ((RETURN_STATUS)(MAX_BIT | (a)))
>
> -#define ENCODE_WARNING(a) (a)
> -#define RETURN_ERROR(a) ((a) < 0)
> +#define ENCODE_WARNING(a) ((RETURN_STATUS)(a))
> +#define RETURN_ERROR(a) (((INTN)(RETURN_STATUS)(a)) < 0)
>
> #define RETURN_SUCCESS 0
> #define RETURN_LOAD_ERROR ENCODE_ERROR (1)
> --
> 2.11.0
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2017-12-08 0:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 17:38 [PATCH v2] BaseTools: align ERROR/WARNING/RETURN macros with MdePkg versions Leif Lindholm
2017-12-08 0:52 ` Gao, Liming [this message]
2017-12-08 9:55 ` Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E18C4B5@SHSMSX104.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox