summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2011-09-09 20:24:45 +0000
committerJim Grosbach <grosbach@apple.com>2011-09-09 20:24:45 +0000
commit62c33955e234cef3eca2f3b78bf4f4e27f7b8436 (patch)
tree6d352c1eeb2fd4dff419f1e1d30bd1b8d2bdf107 /llvm/lib/Target
parenteee3fca1c0d394f2fe465ebc59abecdd11efb375 (diff)
downloadbcm5719-llvm-62c33955e234cef3eca2f3b78bf4f4e27f7b8436.tar.gz
bcm5719-llvm-62c33955e234cef3eca2f3b78bf4f4e27f7b8436.zip
Thumb2 assembly parsing and encoding for MLA and MLS.
llvm-svn: 139399
Diffstat (limited to 'llvm/lib/Target')
-rw-r--r--llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index b994d0fa758..882c4fe3d20 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -3184,9 +3184,9 @@ getMnemonicAcceptInfo(StringRef Mnemonic, bool &CanAcceptCarrySet,
Mnemonic == "mul" || Mnemonic == "bic" || Mnemonic == "asr" ||
Mnemonic == "umlal" || Mnemonic == "orr" || Mnemonic == "mvn" ||
Mnemonic == "rsb" || Mnemonic == "rsc" || Mnemonic == "orn" ||
- Mnemonic == "sbc" || Mnemonic == "mla" || Mnemonic == "umull" ||
+ Mnemonic == "sbc" || Mnemonic == "umull" ||
Mnemonic == "eor" || Mnemonic == "smlal" || Mnemonic == "neg" ||
- (Mnemonic == "mov" && !isThumb())) {
+ ((Mnemonic == "mov" || Mnemonic == "mla") && !isThumb())) {
CanAcceptCarrySet = true;
} else {
CanAcceptCarrySet = false;
OpenPOWER on IntegriCloud