[mips] Adding support for symbolic constants for mips64r6

[petarj]

Summary

This patch adds support for symbolic constants for mips64r6.

[dsanders]

This patch affects all Mips subtargets. Could you correct the title and summary of the patch?

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

4611–4619

The change to parseImm() breaks the following code:

.set foo,$25
jr foo

Before this change, the 'foo' was parsed by parseAnyRegister() and was added to the operand list as the register $25. After this change, it's parsed by parseImm() and added to the operand list as the expression 'foo'.

test/MC/Mips/mips64r6/immediate.s

1

(regarding the directory): This isn't mips64r6 specific so it should be moved up one level to test/MC/Mips
(regarding the filename): The filename should mention symbols since this test is defining a symbol and making sure it's evaluated at assembly time.

[sdardis]

Ping?

[abeserminji]

Hello,

I've checked this change and concluded that provided test (test/MC/Mips/mips64r6/immediate.s) is passing successfully after r277995.

@sdardis
Do you maybe know some case for which mentioned revision does not work well?

[sdardis]

I don't recall any other cases.

[petarj]

This issue should be closed in that case.

[petarj]

Abandoning change since per Aleksandar's words it was fixed by:

commit 7dd6fd6b287f4a425ad4c85c485afa69d3bbf0f8
Author: Daniel Sanders <[e-mail]>
Date: Mon Aug 8 11:50:25 2016 +0000

Re-commit r277988: [mips][ias] Fix all the hacks related to MIPS-specific unary operators (%hi/%lo/%gp_rel/etc.).

Hopefully with the MSVC builds fixed. I've added a missing '#include <tuple>'
that gcc and clang don't seem to need.

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

case AsmToken::Dollar: {
     return false;
   }
   // Else drop to expression parsing.
   case AsmToken::LParen:
   case AsmToken::Minus:
   case AsmToken::Plus:
   case AsmToken::Integer:
   case AsmToken::Tilde:
+  case AsmToken::Identifier:
   case AsmToken::String: {
     DEBUG(dbgs() << ".. generic integer\n");
     OperandMatchResultTy ResTy = parseImm(Operands);
     return ResTy != MatchOperand_Success;
   }
   case AsmToken::Percent: {
     // It is a symbol reference or constant expression.
     const MCExpr *IdVal;
MipsAsmParser::parseImm(OperandVector &Operands) {
   switch (getLexer().getKind()) {
   default:
     return MatchOperand_NoMatch;
   case AsmToken::LParen:
   case AsmToken::Minus:
   case AsmToken::Plus:
   case AsmToken::Integer:
   case AsmToken::Tilde:
+  case AsmToken::Identifier:
   case AsmToken::String:
     break;
   }
 
   const MCExpr *IdVal;
   SMLoc S = Parser.getTok().getLoc();
   if (getParser().parseExpression(IdVal))
     return MatchOperand_ParseFail;
 
   SMLoc E = SMLoc::getFromPointer(Parser.getTok().getLoc().getPointer() - 1);
   Operands.push_back(MipsOperand::CreateImm(IdVal, S, E, *this));
   return MatchOperand_Success;
 }
 
 MipsAsmParser::OperandMatchResultTy
 MipsAsmParser::parseJumpTarget(OperandVector &Operands) {
   MCAsmParser &Parser = getParser();
   DEBUG(dbgs() << "parseJumpTarget\n");
 
   SMLoc S = getLexer().getLoc();
 
   // Integers and expressions are acceptable
   OperandMatchResultTy ResTy = parseImm(Operands);
   if (ResTy != MatchOperand_NoMatch)
     return ResTy;
 
   // Registers are a valid target and have priority over symbols.
   ResTy = parseAnyRegister(Operands);
   if (ResTy != MatchOperand_NoMatch)
     return ResTy;
 
   const MCExpr *Expr = nullptr;
   if (Parser.parseExpression(Expr)) {
     // We have no way of knowing if a symbol was consumed so we must ParseFail
     return MatchOperand_ParseFail;
   }
   Operands.push_back(
       MipsOperand::CreateImm(Expr, S, getLexer().getLoc(), *this));

test/MC/Mips/mips64r6/immediate.s

+# RUN: llvm-mc -triple=mips64el-linux-gnu -arch=mips64el -mcpu=mips64r6 %s -filetype=obj -o - | llvm-objdump -d - | FileCheck %s
+
+.text
+
+FRAME_SIZE = 16
+
+andi $4, $5, FRAME_SIZE       # CHECK: andi $4, $5, 16
+daddiu $4, $5, FRAME_SIZE     # CHECK: daddiu $4, $5, 16
+lui $4, FRAME_SIZE            # CHECK: aui  $zero, $4, 16
+ori $3, $4, FRAME_SIZE        # CHECK: ori  $3, $4, 16
+slti $4, $3, FRAME_SIZE       # CHECK: slti $4, $3, 16
+sltiu $7, $8, FRAME_SIZE      # CHECK: sltiu  $7, $8, 16
+xori $4, $5, FRAME_SIZE       # CHECK: xori $4, $5, 16
+
+
+