From: "Leif Lindholm" <quic_llindhol@quicinc.com>
To: Sami Mujawar <sami.mujawar@arm.com>
Cc: devel@edk2.groups.io,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Ard Biesheuvel" <ardb+tianocore@kernel.org>,
"nd@arm.com" <nd@arm.com>
Subject: Re: [edk2-devel] [PATCH v2 2/5] MdePkg/BaseLib: add ASSERT in ARM* SetJump implementations
Date: Mon, 2 Oct 2023 16:52:14 +0100 [thread overview]
Message-ID: <ZRrnLi8/GUB8uCbu@qc-i7.hemma.eciton.net> (raw)
In-Reply-To: <cee07c5a-7d4a-8bff-ec9e-dc613b3bf688@arm.com>
On Fri, Sep 29, 2023 at 16:06:54 +0100, Sami Mujawar wrote:
> Hi Leif,
>
> Thank you for this patch.
>
> This patch looks good to me.
>
> Just a question, should we also do the same for the AArch32 builds?
Hmm, fair point.
But I just managed to get rid of this set after nearly 4 years :):)
> In either case,
>
> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Thanks!
Commit message typo in 5/5 fixed and series merged as
f6a314e5b5dc..1a66bd51ca21.
Regards,
Leif
> Regards,
>
> Sami Mujawar
>
> On 26/09/2023 06:15 pm, Leif Lindholm wrote:
> > The SetJump comment header states that:
> > If JumpBuffer is NULL, then ASSERT().
> >
> > However, this was not currently done.
> > Add a call to InternalAssertJumpBuffer.
> >
> > Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.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, 16 insertions(+)
> >
> > diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
> > index 78db9b3d1e78..de79ad3a0a3e 100644
> > --- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
> > +++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
> > @@ -46,6 +46,14 @@ GCC_ASM_EXPORT(InternalLongJump)
> > #
> > ASM_PFX(SetJump):
> > AARCH64_BTI(c)
> > +#ifndef MDEPKG_NDEBUG
> > + stp x29, x30, [sp, #-32]!
> > + mov x29, sp
> > + str x0, [sp, #16]
> > + bl InternalAssertJumpBuffer
> > + ldr x0, [sp, #16]
> > + ldp x29, x30, [sp], #32
> > +#endif
> > mov x16, sp // use IP0 so save SP
> > #define REG_PAIR(REG1, REG2, OFFS) stp REG1, REG2, [x0, OFFS]
> > #define REG_ONE(REG1, OFFS) str REG1, [x0, OFFS]
> > diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
> > index d8b267addc1a..c2774eece311 100644
> > --- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
> > +++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
> > @@ -44,6 +44,14 @@
> > ; );
> > ;
> > SetJump
> > +#ifndef MDEPKG_NDEBUG
> > + stp x29, x30, [sp, #-32]!
> > + mov x29, sp
> > + str x0, [sp, #16]
> > + bl InternalAssertJumpBuffer
> > + ldr x0, [sp, #16]
> > + ldp x29, x30, [sp], #32
> > +#endif
> > mov x16, sp // use IP0 so save SP
> > #define REG_PAIR(REG1, REG2, OFFS) stp REG1, REG2, [x0, OFFS]
> > #define REG_ONE(REG1, OFFS) str REG1, [x0, OFFS]
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109256): https://edk2.groups.io/g/devel/message/109256
Mute This Topic: https://groups.io/mt/101600803/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2023-10-02 15:52 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 [this message]
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
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=ZRrnLi8/GUB8uCbu@qc-i7.hemma.eciton.net \
--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