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

This patch fixes a bug in floating point operands parsing, when instruction alias uses default register operand.

Browse Source 
llvm-svn: 194562
This commit is contained in:
Vladimir Medic 2013-11-13 09:48:53 +00:00
parent 794a353c2c
commit 841be82cec
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -1159,9 +1159,7 @@ MipsAsmParser::ParseOperand(SmallVectorImpl<MCParsedAsmOperand *> &Operands,
return true;
SMLoc E = SMLoc::getFromPointer(Parser.getTok().getLoc().getPointer() - 1);
MCSymbol *Sym = getContext().GetOrCreateSymbol("$" + Identifier);
// Otherwise create a symbol reference.
const MCExpr *Res =
MCSymbolRefExpr::Create(Sym, MCSymbolRefExpr::VK_None, getContext());
@ -1170,6 +1168,25 @@ MipsAsmParser::ParseOperand(SmallVectorImpl<MCParsedAsmOperand *> &Operands,
return false;
}
case AsmToken::Identifier:
// For instruction aliases like "bc1f $Label" dedicated parser will
// eat the '$' sign before failing. So in order to look for appropriate
// label we must check first if we have already consumed '$'.
if (hasConsumedDollar) {
hasConsumedDollar = false;
SMLoc S = Parser.getTok().getLoc();
StringRef Identifier;
if (Parser.parseIdentifier(Identifier))
return true;
SMLoc E =
SMLoc::getFromPointer(Parser.getTok().getLoc().getPointer() - 1);
MCSymbol *Sym = getContext().GetOrCreateSymbol("$" + Identifier);
// Create a symbol reference.
const MCExpr *Res =
MCSymbolRefExpr::Create(Sym, MCSymbolRefExpr::VK_None, getContext());
Operands.push_back(MipsOperand::CreateImm(Res, S, E));
return false;
}
// Look for the existing symbol, we should check if
// we need to assigne the propper RegisterKind.
if (searchSymbolAlias(Operands, MipsOperand::Kind_None))

4
test/MC/Mips/mips-fpu-instructions.s
View File

@ -138,6 +138,8 @@
#------------------------------------------------------------------------------
# FP move instructions
#------------------------------------------------------------------------------
# CHECK: bc1f $BB_1 # encoding: [A,A,0x00,0x45]
# CHECK: # fixup A - offset: 0, value: ($BB_1), kind: fixup_Mips_PC16
# CHECK: cfc1 $6, $0 # encoding: [0x00,0x00,0x46,0x44]
# CHECK: ctc1 $10, $31 # encoding: [0x00,0xf8,0xca,0x44]
@ -173,7 +175,7 @@
# CHECK: sdc2 $4, 16($sp) # encoding: [0x10,0x00,0xa4,0xfb]
# CHECK: lwc2 $11, 12($ra) # encoding: [0x0c,0x00,0xeb,0xcb]
# CHECK: ldc2 $11, 12($ra) # encoding: [0x0c,0x00,0xeb,0xdb]
bc1f $fcc0, $BB_1
cfc1 $a2,$0
ctc1 $10,$31
mfc1 $a2,$f7