From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2C0611A1E3A for ; Mon, 24 Oct 2016 11:47:31 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP; 24 Oct 2016 11:47:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,542,1473145200"; d="scan'208";a="23115937" Received: from jlmcguir-mobl2.amr.corp.intel.com (HELO localhost) ([10.252.135.104]) by fmsmga005.fm.intel.com with ESMTP; 24 Oct 2016 11:47:30 -0700 MIME-Version: 1.0 To: Ard Biesheuvel , "Laszlo Ersek" Message-ID: <147733485028.16732.10373366566840840474@jljusten-ivb> From: Jordan Justen In-Reply-To: Cc: "edk2-devel-01" , "Michael Zimmermann" , "Leif Lindholm" References: <20161021212737.15974-1-lersek@redhat.com> <20161021212737.15974-18-lersek@redhat.com> User-Agent: alot/0.3.7 Date: Mon, 24 Oct 2016 11:47:30 -0700 Subject: Re: [PATCH 17/19] ArmPkg/ArmDisassemblerLib: replace AsciiStrCat() with AsciiStrCatS() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2016 18:47:31 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 2016-10-24 00:58:46, Ard Biesheuvel wrote: > On 21 October 2016 at 22:27, Laszlo Ersek 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 > > Cc: Leif Lindholm > > Cc: Michael Zimmermann > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D164 > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D165 > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Laszlo Ersek > = > Reviewed-by: Ard Biesheuvel > = > > --- > > > > Notes: > > - build-tested only > > > > - Michael (CC'd) had posted a patch earlier for this: > > , > > but I only noticed that now that he pointed it out, in > > . > > I'll leave it to the ArmPkg maintainers to choose one; I don't fe= el > > 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/ArmP= kg/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 =3D mMregListStr; > > - *Str =3D '\0'; > > - AsciiStrCat (Str, "{"); > > + mMregListStr[0] =3D '\0'; > > + AsciiStrCatS (mMregListStr, sizeof mMregListStr, "{"); Maybe drop the extra space after the function name throughout this patch. (There are 2 instead of just one.) -Jordan > > for (Index =3D 0, First =3D TRUE; Index <=3D 15; Index++) { > > if ((OpCode & (1 << Index)) !=3D 0) { > > Start =3D End =3D Index; > > @@ -102,25 +100,25 @@ MRegList ( > > } > > > > if (!First) { > > - AsciiStrCat (Str, ","); > > + AsciiStrCatS (mMregListStr, sizeof mMregListStr, ","); > > } else { > > First =3D FALSE; > > } > > > > if (Start =3D=3D 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/Ar= mPkg/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 =3D mThumbMregListStr; > > - *Str =3D '\0'; > > - AsciiStrCat (Str, "{"); > > + mThumbMregListStr[0] =3D '\0'; > > + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "{"); > > > > for (Index =3D 0, First =3D TRUE; Index <=3D 15; Index++) { > > if ((RegBitMask & (1 << Index)) !=3D 0) { > > @@ -412,24 +410,24 @@ ThumbMRegList ( > > } > > > > if (!First) { > > - AsciiStrCat (Str, ","); > > + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, ",= "); > > } else { > > First =3D FALSE; > > } > > > > if (Start =3D=3D End) { > > - AsciiStrCat (Str, gReg[Start]); > > + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gR= eg[Start]); > > } else { > > - AsciiStrCat (Str, gReg[Start]); > > - AsciiStrCat (Str, "-"); > > - AsciiStrCat (Str, gReg[End]); > > + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gR= eg[Start]); > > + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "-= "); > > + AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gR= eg[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