This is an archive of the discontinued LLVM Phabricator instance.

Differential D30462

[ARM] Fix parsing of special register masks
ClosedPublic

Authored by olista01 on Feb 28 2017, 8:19 AM.

Details

Reviewers
rengolin
SjoerdMeijer
t.p.northover
Commits
rG5d35b9e56c19: [ARM] Fix parsing of special register masks
rL296607: [ARM] Fix parsing of special register masks
Summary

This parsing code was incorrectly checking for invalid characters, so an invalid instruction like:

msr spsr_w, r0

would be emitted as:

msr spsr_cxsf, r0

Diff Detail

Repository
rL LLVM

Event Timeline

olista01 created this revision.Feb 28 2017, 8:19 AM
Herald added a subscriber: aemerson. · View Herald TranscriptFeb 28 2017, 8:19 AM
olista01 edited the summary of this revision. (Show Details)Feb 28 2017, 8:25 AM
rengolin accepted this revision.Feb 28 2017, 1:07 PM

Ouch! LGTM. Thanks!

This revision is now accepted and ready to land.Feb 28 2017, 1:07 PM
Closed by commit rL296607: [ARM] Fix parsing of special register masks (authored by olista01). · Explain WhyMar 1 2017, 3:03 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Target/
ARM/
AsmParser/
2 lines
test/
MC/
ARM/
11 lines

Diff 90144

llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 4,324 Lines • ▼ Show 20 Lines for (int i = 0, e = Flags.size(); i != e; ++i) {
.Case("c", 1) .Case("c", 1)
.Case("x", 2) .Case("x", 2)
.Case("s", 4) .Case("s", 4)
.Case("f", 8) .Case("f", 8)
.Default(~0U); .Default(~0U);
// If some specific flag is already set, it means that some letter is // If some specific flag is already set, it means that some letter is
// present more than once, this is not acceptable. // present more than once, this is not acceptable.
if (FlagsVal == ~0U || (FlagsVal & Flag)) if (Flag == ~0U || (FlagsVal & Flag))
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
FlagsVal |= Flag; FlagsVal |= Flag;
} }
} else // No match for special register. } else // No match for special register.
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
// Special register without flags is NOT equivalent to "fc" flags. // Special register without flags is NOT equivalent to "fc" flags.
// NOTE: This is a divergence from gas' behavior. Uncommenting the following // NOTE: This is a divergence from gas' behavior. Uncommenting the following
▲ Show 20 Lines • Show All 6,052 Lines • Show Last 20 Lines

llvm/trunk/test/MC/ARM/invalid-special-reg.s

@ RUN: not llvm-mc -triple armv7a--none-eabi < %s |& FileCheck %s
@ RUN: not llvm-mc -triple thumbv7a--none-eabi < %s |& FileCheck %s
msr apsr_c, r0
@ CHECK: invalid operand for instruction
msr cpsr_w
@ CHECK: invalid operand for instruction
msr cpsr_cc
@ CHECK: invalid operand for instruction
msr xpsr_c
@ CHECK: invalid operand for instruction