public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Sami Mujawar" <sami.mujawar@arm.com>
To: Leif Lindholm <quic_llindhol@quicinc.com>, devel@edk2.groups.io
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Andrei Warkentin" <andrei.warkentin@intel.com>,
	"Ard Biesheuvel" <ardb+tianocore@kernel.org>,
	"nd@arm.com" <nd@arm.com>
Subject: Re: [edk2-devel] [PATCH v2 4/5] MdePkg/BaseLib: correct register sizes in AArch64 SetJump/LongJump
Date: Fri, 29 Sep 2023 16:07:43 +0100	[thread overview]
Message-ID: <e5c5b371-a79c-1988-a322-9cd75bd0b359@arm.com> (raw)
In-Reply-To: <20230926171523.368706-5-quic_llindhol@quicinc.com>

Hi Leif,

Thank you for this patch.

These changes look good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 26/09/2023 06:15 pm, Leif Lindholm wrote:
> Both in SetJump and in InternalLongJump, 32-bit w register views were
> used for the UINTN return value. In SetJump, this did not cause errors;
> it was only counterintuitive. But in InternalLongJump, it meant the top
> 32 bits of Value were stripped off.
>
> Change all of these to use the 64-bit x register views.
>
> Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
> Reanimated-by: Andrei Warkentin <andrei.warkentin@intel.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> ---
>   MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S   | 8 ++++----
>   MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm | 8 ++++----
>   2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
> index de79ad3a0a3e..3e58119b25d2 100644
> --- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
> +++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
> @@ -61,7 +61,7 @@ ASM_PFX(SetJump):
>           FPR_LAYOUT
>   #undef REG_PAIR
>   #undef REG_ONE
> -        mov     w0, #0
> +        mov     x0, #0
>           ret
>   
>   #/**
> @@ -91,9 +91,9 @@ ASM_PFX(InternalLongJump):
>   #undef REG_PAIR
>   #undef REG_ONE
>           mov     sp, x16
> -        cmp     w1, #0
> -        mov     w0, #1
> -        csel    w0, w1, w0, ne
> +        cmp     x1, #0
> +        mov     x0, #1
> +        csel    x0, x1, x0, ne
>           ret
>   
>   ASM_FUNCTION_REMOVE_IF_UNREFERENCED
> diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
> index c2774eece311..6ec8f35f2c9f 100644
> --- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
> +++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
> @@ -59,7 +59,7 @@ SetJump
>           FPR_LAYOUT
>   #undef REG_PAIR
>   #undef REG_ONE
> -        mov     w0, #0
> +        mov     x0, #0
>           ret
>   
>   ;/**
> @@ -88,10 +88,10 @@ InternalLongJump
>   #undef REG_PAIR
>   #undef REG_ONE
>           mov     sp, x16
> -        cmp     w1, #0
> -        mov     w0, #1
> +        cmp     x1, #0
> +        mov     x0, #1
>           beq     exit
> -        mov     w0, w1
> +        mov     x0, x1
>   exit
>           // use br not ret, as ret is guaranteed to mispredict
>           br      x30


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109203): https://edk2.groups.io/g/devel/message/109203
Mute This Topic: https://groups.io/mt/101600808/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



  reply	other threads:[~2023-09-29 15:08 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-26 17:15 [edk2-devel] [PATCH v2 0/5] MdePkg: various fixes to ARM/AArch64 SetJump/LongJump Leif Lindholm
2023-09-26 17:15 ` [edk2-devel] [PATCH v2 1/5] MdePkg/BaseLib: fix comments in ARM* SetJump/LongJump implementations Leif Lindholm
2023-09-29 15:06   ` Sami Mujawar
2023-09-26 17:15 ` [edk2-devel] [PATCH v2 2/5] MdePkg/BaseLib: add ASSERT in ARM* SetJump implementations Leif Lindholm
2023-09-29 15:06   ` Sami Mujawar
2023-10-02 15:52     ` Leif Lindholm
2023-09-26 17:15 ` [edk2-devel] [PATCH v2 3/5] MdePkg/BaseLib: use normal register init in ARM " Leif Lindholm
2023-09-29 15:07   ` Sami Mujawar
2023-10-02 18:00   ` Philippe Mathieu-Daudé
2023-10-03 10:43     ` Leif Lindholm
2023-09-26 17:15 ` [edk2-devel] [PATCH v2 4/5] MdePkg/BaseLib: correct register sizes in AArch64 SetJump/LongJump Leif Lindholm
2023-09-29 15:07   ` Sami Mujawar [this message]
2023-09-29 22:00   ` Andrei Warkentin
2023-10-02 17:56   ` Philippe Mathieu-Daudé
2023-09-26 17:15 ` [edk2-devel] [PATCH v2 5/5] MdePkg/BaseLib: ensure ARM LongJump never returns 0 Leif Lindholm
2023-09-29 15:07   ` Sami Mujawar
2023-10-02 17:58   ` Philippe Mathieu-Daudé

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=e5c5b371-a79c-1988-a322-9cd75bd0b359@arm.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