This is an archive of the discontinued LLVM Phabricator instance.

Differential D15226

[mips][ias] Range check uimm8 operands
ClosedPublic

Authored by dsanders on Dec 4 2015, 3:42 AM.

Details

Reviewers
vkalintiris
Commits
rG106d2d469343: [mips][ias] Range check uimm8 operands
rL255018: [mips][ias] Range check uimm8 operands
Summary

Depends on D15190

Diff Detail

Event Timeline

dsanders updated this revision to Diff 41864.Dec 4 2015, 3:42 AM
dsanders retitled this revision from to [mips][ias] Range check uimm8 operands.
dsanders updated this object.
dsanders added a reviewer: vkalintiris.
dsanders added a parent revision: D15190: [mips][ias] Range check uimm6 operands and fix a bug this revealed..
dsanders added a subscriber: llvm-commits.
Herald added a subscriber: dsanders. · View Herald TranscriptDec 4 2015, 3:42 AM
vkalintiris accepted this revision.Dec 5 2015, 7:26 AM
vkalintiris edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Dec 5 2015, 7:26 AM
dsanders closed this revision.Dec 8 2015, 6:45 AM
Closed by commit rL255018: [mips][ias] Range check uimm8 operands (authored by dsanders). · Explain WhyDec 8 2015, 6:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
Mips/
AsmParser/
3 lines
6 lines
4 lines
test/
MC/
Mips/
msa/
3 lines
6 lines

Diff 41864

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

Show First 20 Lines • Show All 3,643 Lines • ▼ Show 20 Lines case Match_UImm5_0_Report_UImm6:
// operand to avoid confusing the user. // operand to avoid confusing the user.
return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo), return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
"expected 6-bit unsigned immediate"); "expected 6-bit unsigned immediate");
case Match_UImm5_Lsl2: case Match_UImm5_Lsl2:
return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo), return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
"expected both 7-bit unsigned immediate and multiple of 4"); "expected both 7-bit unsigned immediate and multiple of 4");
case Match_UImm6_0: case Match_UImm6_0:
return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo), "expected 6-bit unsigned immediate"); return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo), "expected 6-bit unsigned immediate");
case Match_UImm8_0:
return Error(RefineErrorLoc(IDLoc, Operands, ErrorInfo),
"expected 8-bit unsigned immediate");
} }
llvm_unreachable("Implement any new match types added!"); llvm_unreachable("Implement any new match types added!");
} }
void MipsAsmParser::warnIfRegIndexIsAT(unsigned RegIndex, SMLoc Loc) { void MipsAsmParser::warnIfRegIndexIsAT(unsigned RegIndex, SMLoc Loc) {
if (RegIndex != 0 && AssemblerOptions.back()->getATRegIndex() == RegIndex) if (RegIndex != 0 && AssemblerOptions.back()->getATRegIndex() == RegIndex)
Warning(Loc, "used $at (currently $" + Twine(RegIndex) + Warning(Loc, "used $at (currently $" + Twine(RegIndex) +
▲ Show 20 Lines • Show All 2,526 Lines • Show Last 20 Lines

lib/Target/Mips/MipsInstrInfo.td

Show First 20 Lines • Show All 388 Lines • ▼ Show 20 Linesclass ConstantUImmAsmOperandClass<int Bits, list<AsmOperandClass> Supers = [],
int Offset = 0> : AsmOperandClass { int Offset = 0> : AsmOperandClass {
let Name = "ConstantUImm" # Bits # "_" # Offset; let Name = "ConstantUImm" # Bits # "_" # Offset;
let RenderMethod = "addConstantUImmOperands<" # Bits # ", " # Offset # ">"; let RenderMethod = "addConstantUImmOperands<" # Bits # ", " # Offset # ">";
let PredicateMethod = "isConstantUImm<" # Bits # ", " # Offset # ">"; let PredicateMethod = "isConstantUImm<" # Bits # ", " # Offset # ">";
let SuperClasses = Supers; let SuperClasses = Supers;
let DiagnosticType = "UImm" # Bits # "_" # Offset; let DiagnosticType = "UImm" # Bits # "_" # Offset;
} }
def ConstantUImm8AsmOperandClass
: ConstantUImmAsmOperandClass<8, []>;
def ConstantUImm6AsmOperandClass def ConstantUImm6AsmOperandClass
: ConstantUImmAsmOperandClass<6, []>; : ConstantUImmAsmOperandClass<6, [ConstantUImm8AsmOperandClass]>;
def ConstantUImm5Plus32AsmOperandClass def ConstantUImm5Plus32AsmOperandClass
: ConstantUImmAsmOperandClass<5, [ConstantUImm6AsmOperandClass], 32>; : ConstantUImmAsmOperandClass<5, [ConstantUImm6AsmOperandClass], 32>;
def ConstantUImm5Plus32NormalizeAsmOperandClass def ConstantUImm5Plus32NormalizeAsmOperandClass
: ConstantUImmAsmOperandClass<5, [ConstantUImm6AsmOperandClass], 32> { : ConstantUImmAsmOperandClass<5, [ConstantUImm6AsmOperandClass], 32> {
let Name = "ConstantUImm5_32_Norm"; let Name = "ConstantUImm5_32_Norm";
// We must also subtract 32 when we render the operand. // We must also subtract 32 when we render the operand.
let RenderMethod = "addConstantUImmOperands<5, 32, -32>"; let RenderMethod = "addConstantUImmOperands<5, 32, -32>";
} }
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines
// Zero // Zero
def uimmz : Operand<i32> { def uimmz : Operand<i32> {
let PrintMethod = "printUnsignedImm"; let PrintMethod = "printUnsignedImm";
let ParserMatchClass = ConstantImmzAsmOperandClass; let ParserMatchClass = ConstantImmzAsmOperandClass;
} }
// Unsigned Operands // Unsigned Operands
foreach I = {1, 2, 3, 4, 5, 6} in foreach I = {1, 2, 3, 4, 5, 6, 8} in
def uimm # I : Operand<i32> { def uimm # I : Operand<i32> {
let PrintMethod = "printUnsignedImm"; let PrintMethod = "printUnsignedImm";
let ParserMatchClass = let ParserMatchClass =
!cast<AsmOperandClass>("ConstantUImm" # I # "AsmOperandClass"); !cast<AsmOperandClass>("ConstantUImm" # I # "AsmOperandClass");
} }
def uimm2_plus1 : Operand<i32> { def uimm2_plus1 : Operand<i32> {
let PrintMethod = "printUnsignedImm"; let PrintMethod = "printUnsignedImm";
▲ Show 20 Lines • Show All 1,753 Lines • Show Last 20 Lines

lib/Target/Mips/MipsMSAInstrInfo.td

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines
def uimm4_ptr : Operand<iPTR> { def uimm4_ptr : Operand<iPTR> {
let PrintMethod = "printUnsignedImm8"; let PrintMethod = "printUnsignedImm8";
} }
def uimm6_ptr : Operand<iPTR> { def uimm6_ptr : Operand<iPTR> {
let PrintMethod = "printUnsignedImm8"; let PrintMethod = "printUnsignedImm8";
} }
def uimm8 : Operand<i32> {
let PrintMethod = "printUnsignedImm8";
}
def simm5 : Operand<i32>; def simm5 : Operand<i32>;
def vsplat_uimm1 : Operand<vAny> { def vsplat_uimm1 : Operand<vAny> {
let PrintMethod = "printUnsignedImm8"; let PrintMethod = "printUnsignedImm8";
} }
def vsplat_uimm2 : Operand<vAny> { def vsplat_uimm2 : Operand<vAny> {
let PrintMethod = "printUnsignedImm8"; let PrintMethod = "printUnsignedImm8";
▲ Show 20 Lines • Show All 3,812 Lines • Show Last 20 Lines

test/MC/Mips/msa/invalid-64.s

Show All 31 Lines# RUN: FileCheck %s < %t1
sat_u.b $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate sat_u.b $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate
sat_u.b $w31, $w31, 8 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate sat_u.b $w31, $w31, 8 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate
sat_u.h $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate sat_u.h $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate
sat_u.h $w31, $w31, 16 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate sat_u.h $w31, $w31, 16 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate
sat_u.w $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate sat_u.w $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate
sat_u.w $w31, $w31, 32 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate sat_u.w $w31, $w31, 32 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate
sat_u.d $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate sat_u.d $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate
sat_u.d $w31, $w31, 64 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate sat_u.d $w31, $w31, 64 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate
shf.b $w19, $w30, -1 # CHECK: :[[@LINE]]:23: error: expected 8-bit unsigned immediate
shf.h $w17, $w8, -1 # CHECK: :[[@LINE]]:22: error: expected 8-bit unsigned immediate
shf.w $w14, $w3, -1 # CHECK: :[[@LINE]]:22: error: expected 8-bit unsigned immediate
sldi.b $w0, $w29[-1] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate sldi.b $w0, $w29[-1] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate
sldi.b $w0, $w29[16] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate sldi.b $w0, $w29[16] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate
sldi.d $w4, $w12[-1] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate sldi.d $w4, $w12[-1] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate
sldi.d $w4, $w12[2] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate sldi.d $w4, $w12[2] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate
sldi.h $w8, $w17[-1] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate sldi.h $w8, $w17[-1] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate
sldi.h $w8, $w17[8] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate sldi.h $w8, $w17[8] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate
sldi.w $w20, $w27[-1] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate sldi.w $w20, $w27[-1] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate
sldi.w $w20, $w27[4] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate sldi.w $w20, $w27[4] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate
Show All 16 Lines

test/MC/Mips/msa/invalid.s

Show All 29 Lines# RUN: FileCheck %s < %t1
sat_u.b $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate sat_u.b $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate
sat_u.b $w31, $w31, 8 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate sat_u.b $w31, $w31, 8 # CHECK: :[[@LINE]]:25: error: expected 3-bit unsigned immediate
sat_u.h $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate sat_u.h $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate
sat_u.h $w31, $w31, 16 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate sat_u.h $w31, $w31, 16 # CHECK: :[[@LINE]]:25: error: expected 4-bit unsigned immediate
sat_u.w $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate sat_u.w $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate
sat_u.w $w31, $w31, 32 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate sat_u.w $w31, $w31, 32 # CHECK: :[[@LINE]]:25: error: expected 5-bit unsigned immediate
sat_u.d $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate sat_u.d $w31, $w31, -1 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate
sat_u.d $w31, $w31, 64 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate sat_u.d $w31, $w31, 64 # CHECK: :[[@LINE]]:25: error: expected 6-bit unsigned immediate
shf.b $w19, $w30, -1 # CHECK: :[[@LINE]]:23: error: expected 8-bit unsigned immediate
shf.b $w19, $w30, 256 # CHECK: :[[@LINE]]:23: error: expected 8-bit unsigned immediate
shf.h $w17, $w8, -1 # CHECK: :[[@LINE]]:22: error: expected 8-bit unsigned immediate
shf.h $w17, $w8, 256 # CHECK: :[[@LINE]]:22: error: expected 8-bit unsigned immediate
shf.w $w14, $w3, -1 # CHECK: :[[@LINE]]:22: error: expected 8-bit unsigned immediate
shf.w $w14, $w3, 256 # CHECK: :[[@LINE]]:22: error: expected 8-bit unsigned immediate
sldi.b $w0, $w29[-1] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate sldi.b $w0, $w29[-1] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate
sldi.b $w0, $w29[16] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate sldi.b $w0, $w29[16] # CHECK: :[[@LINE]]:22: error: expected 4-bit unsigned immediate
sldi.d $w4, $w12[-1] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate sldi.d $w4, $w12[-1] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate
sldi.d $w4, $w12[2] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate sldi.d $w4, $w12[2] # CHECK: :[[@LINE]]:22: error: expected 1-bit unsigned immediate
sldi.h $w8, $w17[-1] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate sldi.h $w8, $w17[-1] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate
sldi.h $w8, $w17[8] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate sldi.h $w8, $w17[8] # CHECK: :[[@LINE]]:22: error: expected 3-bit unsigned immediate
sldi.w $w20, $w27[-1] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate sldi.w $w20, $w27[-1] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate
sldi.w $w20, $w27[4] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate sldi.w $w20, $w27[4] # CHECK: :[[@LINE]]:23: error: expected 2-bit unsigned immediate
Show All 16 Lines