RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-16 16:37:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PowerPC] Fix memory corruption in AsmParser

Browse Source 
As pointed out by Evgeniy Stepanov, assigning a std::string temporary
to a StringRef is not a good idea.  Rework MatchRegisterName to avoid
using the .lower routine.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@181192 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ulrich Weigand 2013-05-06 11:16:57 +00:00
parent 5d042c6374
commit 7d55b6bb1a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
View File

@ -508,29 +508,29 @@ MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
bool PPCAsmParser:: bool PPCAsmParser::
MatchRegisterName(const AsmToken &Tok, unsigned &RegNo, int64_t &IntVal) { MatchRegisterName(const AsmToken &Tok, unsigned &RegNo, int64_t &IntVal) {
if (Tok.is(AsmToken::Identifier)) { if (Tok.is(AsmToken::Identifier)) {
StringRef Name = Tok.getString().lower(); StringRef Name = Tok.getString();
if (Name == "lr") { if (Name.equals_lower("lr")) {
RegNo = isPPC64()? PPC::LR8 : PPC::LR; RegNo = isPPC64()? PPC::LR8 : PPC::LR;
IntVal = 8; IntVal = 8;
return false; return false;
} else if (Name == "ctr") { } else if (Name.equals_lower("ctr")) {
RegNo = isPPC64()? PPC::CTR8 : PPC::CTR; RegNo = isPPC64()? PPC::CTR8 : PPC::CTR;
IntVal = 9; IntVal = 9;
return false; return false;
} else if (Name.startswith("r") && } else if (Name.substr(0, 1).equals_lower("r") &&
!Name.substr(1).getAsInteger(10, IntVal) && IntVal < 32) { !Name.substr(1).getAsInteger(10, IntVal) && IntVal < 32) {
RegNo = isPPC64()? XRegs[IntVal] : RRegs[IntVal]; RegNo = isPPC64()? XRegs[IntVal] : RRegs[IntVal];
return false; return false;
} else if (Name.startswith("f") && } else if (Name.substr(0, 1).equals_lower("f") &&
!Name.substr(1).getAsInteger(10, IntVal) && IntVal < 32) { !Name.substr(1).getAsInteger(10, IntVal) && IntVal < 32) {
RegNo = FRegs[IntVal]; RegNo = FRegs[IntVal];
return false; return false;
} else if (Name.startswith("v") && } else if (Name.substr(0, 1).equals_lower("v") &&
!Name.substr(1).getAsInteger(10, IntVal) && IntVal < 32) { !Name.substr(1).getAsInteger(10, IntVal) && IntVal < 32) {
RegNo = VRegs[IntVal]; RegNo = VRegs[IntVal];
return false; return false;
} else if (Name.startswith("cr") && } else if (Name.substr(0, 2).equals_lower("cr") &&
!Name.substr(2).getAsInteger(10, IntVal) && IntVal < 8) { !Name.substr(2).getAsInteger(10, IntVal) && IntVal < 8) {
RegNo = CRRegs[IntVal]; RegNo = CRRegs[IntVal];
return false; return false;