diff options
| author | Tim Northover <tnorthover@apple.com> | 2013-06-26 16:52:32 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2013-06-26 16:52:32 +0000 |
| commit | 52f77f5cda047842d23868871227e32843afc9f2 (patch) | |
| tree | 12542436d6e7ece23df0a22197555c294aa0da47 /llvm/lib/Target/ARM/AsmParser | |
| parent | 0b2ffe30e4e9c623698af38683aab0714d428f5d (diff) | |
| download | bcm5719-llvm-52f77f5cda047842d23868871227e32843afc9f2.tar.gz bcm5719-llvm-52f77f5cda047842d23868871227e32843afc9f2.zip | |
ARM: allow predicated barriers in Thumb mode
The barrier instructions are only "always-execute" in ARM mode, they can quite
happily sit inside an IT block in Thumb.
llvm-svn: 184964
Diffstat (limited to 'llvm/lib/Target/ARM/AsmParser')
| -rw-r--r-- | llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 647fdb396d7..f80fba61028 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -4966,12 +4966,12 @@ getMnemonicAcceptInfo(StringRef Mnemonic, bool &CanAcceptCarrySet, } else CanAcceptCarrySet = false; - if (Mnemonic == "cbnz" || Mnemonic == "setend" || Mnemonic == "dmb" || - Mnemonic == "cps" || Mnemonic == "mcr2" || Mnemonic == "it" || - Mnemonic == "mcrr2" || Mnemonic == "cbz" || Mnemonic == "cdp2" || - Mnemonic == "trap" || Mnemonic == "mrc2" || Mnemonic == "mrrc2" || - Mnemonic == "dsb" || Mnemonic == "isb" || Mnemonic == "setend" || - (Mnemonic == "clrex" && !isThumb()) || + if (Mnemonic == "cbnz" || Mnemonic == "setend" || Mnemonic == "cps" || + Mnemonic == "mcr2" || Mnemonic == "it" || Mnemonic == "mcrr2" || + Mnemonic == "cbz" || Mnemonic == "cdp2" || Mnemonic == "trap" || + Mnemonic == "mrc2" || Mnemonic == "mrrc2" || Mnemonic == "setend" || + ((Mnemonic == "clrex" || Mnemonic == "dmb" || Mnemonic == "dsb" || + Mnemonic == "isb") && !isThumb()) || (Mnemonic == "nop" && isThumbOne()) || ((Mnemonic == "pld" || Mnemonic == "pli" || Mnemonic == "pldw" || Mnemonic == "ldc2" || Mnemonic == "ldc2l" || |
