tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPkg/ArmDisassemblerLib: replace AsciiStrCat() with AsciiStrCatS() 

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>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Laszlo Ersek 2016-10-21 21:31:09 +02:00
parent 2ea0fee9c7
commit f00ace96f3
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ArmPkg/Library/ArmDisassemblerLib/ArmDisassembler.c
View File

@ -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, "{");
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;

20
ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
View File

@ -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;