This is an archive of the discontinued LLVM Phabricator instance.

Differential D17725

[mips] Range check uimm16_64
ClosedPublic

Authored by dsanders on Feb 29 2016, 9:28 AM.

Details

Reviewers
vkalintiris
Commits
rG127d2d2b4650: [mips] Range check uimm16_64
rL263427: [mips] Range check uimm16_64
Summary

Depends on D17723

Diff Detail

Event Timeline

dsanders updated this revision to Diff 49387.Feb 29 2016, 9:28 AM
dsanders retitled this revision from to [mips] Range check uimm16_64.
dsanders updated this object.
dsanders added a reviewer: vkalintiris.
dsanders added a parent revision: D17723: [mips] Simplify ordering of range checked immediate classes..
dsanders added a subscriber: llvm-commits.
Herald added a subscriber: dsanders. · View Herald TranscriptFeb 29 2016, 9:28 AM
vkalintiris accepted this revision.Mar 7 2016, 4:53 AM
vkalintiris edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Mar 7 2016, 4:53 AM
dsanders closed this revision.Mar 14 2016, 5:49 AM

Revision Contents

PathSize
lib/
Target/
Mips/
15 lines
test/
MC/
Mips/
mips64r2/
6 lines

Diff 49387

lib/Target/Mips/MipsInstrInfo.td

Show First 20 Lines • Show All 629 Lines • ▼ Show 20 Lines
def uimm6_lsl2 : Operand<OtherVT> { def uimm6_lsl2 : Operand<OtherVT> {
let EncoderMethod = "getUImm6Lsl2Encoding"; let EncoderMethod = "getUImm6Lsl2Encoding";
let DecoderMethod = "DecodeUImmWithOffsetAndScale<6, 0, 4>"; let DecoderMethod = "DecodeUImmWithOffsetAndScale<6, 0, 4>";
let ParserMatchClass = ConstantUImm6Lsl2AsmOperandClass; let ParserMatchClass = ConstantUImm6Lsl2AsmOperandClass;
} }
foreach I = {16} in foreach I = {16} in
def uimm # I : Operand<i32> { def uimm # I : Operand<i32> {
let PrintMethod = "printUImm<16>"; let PrintMethod = "printUImm<" # I # ">";
let ParserMatchClass = let ParserMatchClass =
!cast<AsmOperandClass>("UImm" # I # "AsmOperandClass"); !cast<AsmOperandClass>("UImm" # I # "AsmOperandClass");
} }
// Like uimm16_64 but coerces simm16 to uimm16. // Like uimm16_64 but coerces simm16 to uimm16.
def uimm16_relaxed : Operand<i32> { def uimm16_relaxed : Operand<i32> {
let PrintMethod = "printUImm<16>"; let PrintMethod = "printUImm<16>";
let ParserMatchClass = let ParserMatchClass =
!cast<AsmOperandClass>("UImm16RelaxedAsmOperandClass"); !cast<AsmOperandClass>("UImm16RelaxedAsmOperandClass");
} }
foreach I = {5} in foreach I = {5} in
def uimm # I # _64 : Operand<i64> { def uimm # I # _64 : Operand<i64> {
let PrintMethod = "printUImm<5>"; let PrintMethod = "printUImm<" # I # ">";
let ParserMatchClass = let ParserMatchClass =
!cast<AsmOperandClass>("ConstantUImm" # I # "AsmOperandClass"); !cast<AsmOperandClass>("ConstantUImm" # I # "AsmOperandClass");
} }
def uimm16_64 : Operand<i64> { foreach I = {16} in
let PrintMethod = "printUImm<16>"; def uimm # I # _64 : Operand<i64> {
let PrintMethod = "printUImm<" # I # ">";
let ParserMatchClass = let ParserMatchClass =
!cast<AsmOperandClass>("UImm16AsmOperandClass"); !cast<AsmOperandClass>("UImm" # I # "AsmOperandClass");
} }
// Like uimm16_64 but coerces simm16 to uimm16. // Like uimm16_64 but coerces simm16 to uimm16.
def uimm16_64_relaxed : Operand<i64> { def uimm16_64_relaxed : Operand<i64> {
let PrintMethod = "printUImm<16>"; let PrintMethod = "printUImm<16>";
let ParserMatchClass = let ParserMatchClass =
!cast<AsmOperandClass>("UImm16RelaxedAsmOperandClass"); !cast<AsmOperandClass>("UImm16RelaxedAsmOperandClass");
} }
▲ Show 20 Lines • Show All 1,750 Lines • Show Last 20 Lines

test/MC/Mips/mips64r2/invalid.s

# Instructions that are valid for the current ISA but should be rejected by the assembler (e.g. # Instructions that are valid for the current ISA but should be rejected by the assembler (e.g.
# invalid set of operands or operand's restrictions not met). # invalid set of operands or operand's restrictions not met).
# RUN: not llvm-mc %s -triple=mips64-unknown-linux -mcpu=mips64r2 2>%t1 # RUN: not llvm-mc %s -triple=mips64-unknown-linux -mcpu=mips64r2 2>%t1
# RUN: FileCheck %s < %t1 # RUN: FileCheck %s < %t1
.text .text
.set noreorder .set noreorder
andi $2, $3, -1 # CHECK: :[[@LINE]]:22: error: expected 16-bit unsigned immediate
andi $2, $3, 65536 # CHECK: :[[@LINE]]:22: error: expected 16-bit unsigned immediate
cache -1, 255($7) # CHECK: :[[@LINE]]:15: error: expected 5-bit unsigned immediate cache -1, 255($7) # CHECK: :[[@LINE]]:15: error: expected 5-bit unsigned immediate
cache 32, 255($7) # CHECK: :[[@LINE]]:15: error: expected 5-bit unsigned immediate cache 32, 255($7) # CHECK: :[[@LINE]]:15: error: expected 5-bit unsigned immediate
# FIXME: Check various 'pos + size' constraints on dext* # FIXME: Check various 'pos + size' constraints on dext*
dext $2, $3, -1, 1 # CHECK: :[[@LINE]]:22: error: expected 6-bit unsigned immediate dext $2, $3, -1, 1 # CHECK: :[[@LINE]]:22: error: expected 6-bit unsigned immediate
dext $2, $3, 64, 1 # CHECK: :[[@LINE]]:22: error: expected 6-bit unsigned immediate dext $2, $3, 64, 1 # CHECK: :[[@LINE]]:22: error: expected 6-bit unsigned immediate
dext $2, $3, 1, 0 # CHECK: :[[@LINE]]:25: error: expected immediate in range 1 .. 32 dext $2, $3, 1, 0 # CHECK: :[[@LINE]]:25: error: expected immediate in range 1 .. 32
dext $2, $3, 1, 33 # CHECK: :[[@LINE]]:25: error: expected immediate in range 1 .. 32 dext $2, $3, 1, 33 # CHECK: :[[@LINE]]:25: error: expected immediate in range 1 .. 32
dextm $2, $3, -1, 1 # CHECK: :[[@LINE]]:23: error: expected 5-bit unsigned immediate dextm $2, $3, -1, 1 # CHECK: :[[@LINE]]:23: error: expected 5-bit unsigned immediate
Show All 34 Lines# RUN: FileCheck %s < %t1
ext $2, $3, 32, 1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate ext $2, $3, 32, 1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
ext $2, $3, 1, 0 # CHECK: :[[@LINE]]:24: error: expected immediate in range 1 .. 32 ext $2, $3, 1, 0 # CHECK: :[[@LINE]]:24: error: expected immediate in range 1 .. 32
ext $2, $3, 1, 33 # CHECK: :[[@LINE]]:24: error: expected immediate in range 1 .. 32 ext $2, $3, 1, 33 # CHECK: :[[@LINE]]:24: error: expected immediate in range 1 .. 32
# FIXME: Check size on ins # FIXME: Check size on ins
ins $2, $3, -1, 1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate ins $2, $3, -1, 1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
ins $2, $3, 32, 1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate ins $2, $3, 32, 1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
jalr.hb $31 # CHECK: :[[@LINE]]:{{[0-9]+}}: error: source and destination must be different jalr.hb $31 # CHECK: :[[@LINE]]:{{[0-9]+}}: error: source and destination must be different
jalr.hb $31, $31 # CHECK: :[[@LINE]]:{{[0-9]+}}: error: source and destination must be different jalr.hb $31, $31 # CHECK: :[[@LINE]]:{{[0-9]+}}: error: source and destination must be different
ori $2, $3, -1 # CHECK: :[[@LINE]]:21: error: expected 16-bit unsigned immediate
ori $2, $3, 65536 # CHECK: :[[@LINE]]:21: error: expected 16-bit unsigned immediate
pref -1, 255($7) # CHECK: :[[@LINE]]:14: error: expected 5-bit unsigned immediate pref -1, 255($7) # CHECK: :[[@LINE]]:14: error: expected 5-bit unsigned immediate
pref 32, 255($7) # CHECK: :[[@LINE]]:14: error: expected 5-bit unsigned immediate pref 32, 255($7) # CHECK: :[[@LINE]]:14: error: expected 5-bit unsigned immediate
sll $2, $3, -1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate sll $2, $3, -1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
sll $2, $3, 32 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate sll $2, $3, 32 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
srl $2, $3, -1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate srl $2, $3, -1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
srl $2, $3, 32 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate srl $2, $3, 32 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
sra $2, $3, -1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate sra $2, $3, -1 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
sra $2, $3, 32 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate sra $2, $3, 32 # CHECK: :[[@LINE]]:21: error: expected 5-bit unsigned immediate
rotr $2, $3, -1 # CHECK: :[[@LINE]]:22: error: expected 5-bit unsigned immediate rotr $2, $3, -1 # CHECK: :[[@LINE]]:22: error: expected 5-bit unsigned immediate
rotr $2, $3, 32 # CHECK: :[[@LINE]]:22: error: expected 5-bit unsigned immediate rotr $2, $3, 32 # CHECK: :[[@LINE]]:22: error: expected 5-bit unsigned immediate
xori $2, $3, -1 # CHECK: :[[@LINE]]:22: error: expected 16-bit unsigned immediate
xori $2, $3, 65536 # CHECK: :[[@LINE]]:22: error: expected 16-bit unsigned immediate