From: Laszlo Ersek <lersek@redhat.com>
To: Jordan Justen <jordan.l.justen@intel.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: edk2-devel-01 <edk2-devel@ml01.01.org>,
Michael Zimmermann <sigmaepsilon92@gmail.com>,
Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [PATCH 17/19] ArmPkg/ArmDisassemblerLib: replace AsciiStrCat() with AsciiStrCatS()
Date: Mon, 24 Oct 2016 21:54:05 +0200 [thread overview]
Message-ID: <93732147-3d1e-bec6-0896-a7b286fd9795@redhat.com> (raw)
In-Reply-To: <147733485028.16732.10373366566840840474@jljusten-ivb>
On 10/24/16 20:47, Jordan Justen wrote:
> On 2016-10-24 00:58:46, Ard Biesheuvel wrote:
>> On 21 October 2016 at 22:27, Laszlo Ersek <lersek@redhat.com> wrote:
>>> AsciiStrCat() is deprecated / disabled under the
>>> DISABLE_NEW_DEPRECATED_INTERFACES feature test macro.
>>>
>>> The "Str" variable serves no particular purpose in the MRegList() and
>>> ThumbMRegList() functions; replace it with the pointed-to "mMregListStr" /
>>> "mThumbMregListStr" global variable (as appropriate), so that the new
>>> AsciiStrCatS() calls are as clear as possible.
>>>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>> Cc: Leif Lindholm <leif.lindholm@linaro.org>
>>> Cc: Michael Zimmermann <sigmaepsilon92@gmail.com>
>>> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=164
>>> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=165
>>> Contributed-under: TianoCore Contribution Agreement 1.0
>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>>
>> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>
>>> ---
>>>
>>> Notes:
>>> - build-tested only
>>>
>>> - Michael (CC'd) had posted a patch earlier for this:
>>> <https://lists.01.org/pipermail/edk2-devel/2016-August/000489.html>,
>>> but I only noticed that now that he pointed it out, in
>>> <https://lists.01.org/pipermail/edk2-devel/2016-October/003121.html>.
>>> I'll leave it to the ArmPkg maintainers to choose one; I don't feel
>>> strongly either way.
>>>
>>
>> Apologies to Michael for ignoring his contribution, but I'd be happy
>> for Laszlo to merge this as part of the series.
>>
>>> ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c | 22 +++++++++-----------
>>> ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c | 20 ++++++++----------
>>> 2 files changed, 19 insertions(+), 23 deletions(-)
>>>
>>> diff --git a/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c b/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c
>>> index 29a8d4438622..8551edc379c1 100644
>>> --- a/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c
>>> +++ b/ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c
>>> @@ -88,12 +88,10 @@ MRegList (
>>> )
>>> {
>>> UINTN Index, Start, End;
>>> - CHAR8 *Str;
>>> BOOLEAN First;
>>>
>>> - Str = mMregListStr;
>>> - *Str = '\0';
>>> - AsciiStrCat (Str, "{");
>>> + mMregListStr[0] = '\0';
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, "{");
>
> Maybe drop the extra space after the function name throughout this
> patch. (There are 2 instead of just one.)
Yep, I saw that; I couldn't decide whether to remove them or to leave
them undisturbed.
I will remove them.
Thanks!
Laszlo
>
> -Jordan
>
>>> for (Index = 0, First = TRUE; Index <= 15; Index++) {
>>> if ((OpCode & (1 << Index)) != 0) {
>>> Start = End = Index;
>>> @@ -102,25 +100,25 @@ MRegList (
>>> }
>>>
>>> if (!First) {
>>> - AsciiStrCat (Str, ",");
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, ",");
>>> } else {
>>> First = FALSE;
>>> }
>>>
>>> if (Start == End) {
>>> - AsciiStrCat (Str, gReg[Start]);
>>> - AsciiStrCat (Str, ", ");
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, gReg[Start]);
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, ", ");
>>> } else {
>>> - AsciiStrCat (Str, gReg[Start]);
>>> - AsciiStrCat (Str, "-");
>>> - AsciiStrCat (Str, gReg[End]);
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, gReg[Start]);
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, "-");
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, gReg[End]);
>>> }
>>> }
>>> }
>>> if (First) {
>>> - AsciiStrCat (Str, "ERROR");
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, "ERROR");
>>> }
>>> - AsciiStrCat (Str, "}");
>>> + AsciiStrCatS (mMregListStr, sizeof mMregListStr, "}");
>>>
>>> // BugBug: Make caller pass in buffer it is cleaner
>>> return mMregListStr;
>>> diff --git a/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c b/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
>>> index 5bad3afcfbf6..86d5083cb189 100644
>>> --- a/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
>>> +++ b/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
>>> @@ -397,12 +397,10 @@ ThumbMRegList (
>>> )
>>> {
>>> UINTN Index, Start, End;
>>> - CHAR8 *Str;
>>> BOOLEAN First;
>>>
>>> - Str = mThumbMregListStr;
>>> - *Str = '\0';
>>> - AsciiStrCat (Str, "{");
>>> + mThumbMregListStr[0] = '\0';
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "{");
>>>
>>> for (Index = 0, First = TRUE; Index <= 15; Index++) {
>>> if ((RegBitMask & (1 << Index)) != 0) {
>>> @@ -412,24 +410,24 @@ ThumbMRegList (
>>> }
>>>
>>> if (!First) {
>>> - AsciiStrCat (Str, ",");
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, ",");
>>> } else {
>>> First = FALSE;
>>> }
>>>
>>> if (Start == End) {
>>> - AsciiStrCat (Str, gReg[Start]);
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gReg[Start]);
>>> } else {
>>> - AsciiStrCat (Str, gReg[Start]);
>>> - AsciiStrCat (Str, "-");
>>> - AsciiStrCat (Str, gReg[End]);
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gReg[Start]);
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "-");
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gReg[End]);
>>> }
>>> }
>>> }
>>> if (First) {
>>> - AsciiStrCat (Str, "ERROR");
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "ERROR");
>>> }
>>> - AsciiStrCat (Str, "}");
>>> + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "}");
>>>
>>> // BugBug: Make caller pass in buffer it is cleaner
>>> return mThumbMregListStr;
>>> --
>>> 2.9.2
>>>
>>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2016-10-24 19:54 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-21 21:27 [PATCH 00/19] OvmfPkg, ArmVirtPkg: leave deprecated interfaces behind Laszlo Ersek
2016-10-21 21:27 ` [PATCH 01/19] MdePkg/DebugLib.h: add ASSERT_RETURN_ERROR() Laszlo Ersek
2016-10-24 20:59 ` Laszlo Ersek
2016-10-24 23:05 ` Kinney, Michael D
2016-10-25 7:54 ` Laszlo Ersek
2016-10-25 10:32 ` Gao, Liming
2016-10-27 2:53 ` Kinney, Michael D
2016-10-25 8:22 ` Zeng, Star
2016-10-25 8:33 ` Laszlo Ersek
2016-10-21 21:27 ` [PATCH 02/19] OvmfPkg/XenBusDxe: eliminate AsciiStrCpy() calls Laszlo Ersek
2016-10-24 4:44 ` Gary Lin
2016-10-21 21:27 ` [PATCH 03/19] OvmfPkg/XenBusDxe: eliminate AsciiStrCat() calls Laszlo Ersek
2016-10-24 4:44 ` Gary Lin
2016-10-21 21:27 ` [PATCH 04/19] OvmfPkg/EmuVariableFvbRuntimeDxe: eliminate unchecked PcdSetXX() calls Laszlo Ersek
2016-10-24 4:45 ` Gary Lin
2016-10-21 21:27 ` [PATCH 05/19] OvmfPkg/PlatformBootManagerLib: " Laszlo Ersek
2016-10-24 4:45 ` Gary Lin
2016-10-21 21:27 ` [PATCH 06/19] OvmfPkg/SmbiosVersionLib: " Laszlo Ersek
2016-10-24 8:00 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 07/19] OvmfPkg/PlatformDxe: " Laszlo Ersek
2016-10-21 21:27 ` [PATCH 08/19] OvmfPkg/PlatformPei: " Laszlo Ersek
2016-10-24 4:45 ` Gary Lin
2016-10-24 11:51 ` Laszlo Ersek
2016-10-21 21:27 ` [PATCH 09/19] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: " Laszlo Ersek
2016-10-21 21:27 ` [PATCH 10/19] OvmfPkg: disable deprecated interfaces Laszlo Ersek
2016-10-21 21:27 ` [PATCH 11/19] ArmVirtPkg/ArmVirtGicArchLib: eliminate unchecked PcdSetXX() calls Laszlo Ersek
2016-10-24 8:00 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 12/19] ArmVirtPkg/ArmVirtPL031FdtClientLib: " Laszlo Ersek
2016-10-24 8:00 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 13/19] ArmVirtPkg/ArmVirtPlatformLib: " Laszlo Ersek
2016-10-24 7:59 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 14/19] ArmVirtPkg/ArmVirtTimerFdtClientLib: " Laszlo Ersek
2016-10-24 7:59 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 15/19] ArmVirtPkg/FdtPciPcdProducerLib: " Laszlo Ersek
2016-10-24 7:59 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 16/19] ArmVirtPkg/PlatformBootManagerLib: " Laszlo Ersek
2016-10-24 7:58 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 17/19] ArmPkg/ArmDisassemblerLib: replace AsciiStrCat() with AsciiStrCatS() Laszlo Ersek
2016-10-24 7:58 ` Ard Biesheuvel
2016-10-24 18:47 ` Jordan Justen
2016-10-24 19:54 ` Laszlo Ersek [this message]
2016-10-21 21:27 ` [PATCH 18/19] ArmPkg/DefaultExceptionHandlerLib: " Laszlo Ersek
2016-10-24 7:57 ` Ard Biesheuvel
2016-10-24 11:52 ` Laszlo Ersek
2016-10-21 21:27 ` [PATCH 19/19] ArmVirtPkg: disable deprecated interfaces Laszlo Ersek
2016-10-25 8:25 ` Laszlo Ersek
2016-10-25 8:28 ` Ard Biesheuvel
2016-10-24 8:04 ` [PATCH 00/19] OvmfPkg, ArmVirtPkg: leave deprecated interfaces behind Ard Biesheuvel
2016-10-24 11:50 ` Laszlo Ersek
2016-10-25 8:26 ` Laszlo Ersek
2016-10-25 8:45 ` Laszlo Ersek
2016-10-25 8:49 ` Ard Biesheuvel
2016-10-24 18:48 ` Jordan Justen
2016-10-25 9:07 ` Laszlo Ersek
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=93732147-3d1e-bec6-0896-a7b286fd9795@redhat.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