aboutsummaryrefslogtreecommitdiff
path: root/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
diff options
context:
space:
mode:
authorBruno Cardoso Lopes <bruno.cardoso@gmail.com>2011-01-20 16:35:57 +0000
committerBruno Cardoso Lopes <bruno.cardoso@gmail.com>2011-01-20 16:35:57 +0000
commitfa5bd27fbe5188ca708ac0dda4f32d90505da9f5 (patch)
treed2fffbe014bd03949a1933acabe78cde151a43db /lib/Target/ARM/AsmParser/ARMAsmParser.cpp
parentfafb8a1ba5ce86ee2e7c43b255d582828752e656 (diff)
Add mcr* and mr*c support to thumb targets
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123917 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
-rw-r--r--lib/Target/ARM/AsmParser/ARMAsmParser.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 6a8b658215..ba42b1ec10 100644
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -1193,12 +1193,16 @@ GetMnemonicAcceptInfo(StringRef Mnemonic, bool &CanAcceptCarrySet,
Mnemonic == "cps" || Mnemonic == "mcr2" || Mnemonic == "it" ||
Mnemonic == "mcrr2" || Mnemonic == "cbz" || Mnemonic == "cdp2" ||
Mnemonic == "trap" || Mnemonic == "mrc2" || Mnemonic == "mrrc2" ||
- Mnemonic == "dsb" || Mnemonic == "movs" || Mnemonic == "isb" ||
- (isThumb && Mnemonic == "bkpt")) {
+ Mnemonic == "dsb" || Mnemonic == "movs" || Mnemonic == "isb") {
CanAcceptPredicationCode = false;
} else {
CanAcceptPredicationCode = true;
}
+
+ if (isThumb)
+ if (Mnemonic == "bkpt" || Mnemonic == "mcr" || Mnemonic == "mcrr" ||
+ Mnemonic == "mrc" || Mnemonic == "mrrc")
+ CanAcceptPredicationCode = false;
}
/// Parse an arm instruction mnemonic followed by its operands.