aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/ARM
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2010-09-14 15:39:43 -0700
committerShih-wei Liao <sliao@google.com>2010-09-14 15:39:43 -0700
commit5eeaf26c4d2b001102b8b788b7f458d854772381 (patch)
tree64eaf00be1b40b7dfd68604d645699f86dd77d58 /lib/Target/ARM
parenta95f589c757c8c857096a07e0d376ca9aaec6c2c (diff)
parente1e63e8abb587eb6094fc47569b3a9b4516efb21 (diff)
downloadexternal_llvm-5eeaf26c4d2b001102b8b788b7f458d854772381.zip
external_llvm-5eeaf26c4d2b001102b8b788b7f458d854772381.tar.gz
external_llvm-5eeaf26c4d2b001102b8b788b7f458d854772381.tar.bz2
Merge commit 'refs/changes/82/67782/1' of ssh://android-git.corp.google.com:29418/platform/external/llvm into update_llvm
Diffstat (limited to 'lib/Target/ARM')
-rw-r--r--lib/Target/ARM/ARMCodeEmitter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMCodeEmitter.cpp b/lib/Target/ARM/ARMCodeEmitter.cpp
index b1a702f..2f5552d 100644
--- a/lib/Target/ARM/ARMCodeEmitter.cpp
+++ b/lib/Target/ARM/ARMCodeEmitter.cpp
@@ -812,7 +812,7 @@ unsigned ARMCodeEmitter::getMachineSoImmOpValue(unsigned SoImm) {
unsigned ARMCodeEmitter::getAddrModeSBit(const MachineInstr &MI,
const TargetInstrDesc &TID) const {
- for (unsigned i = MI.getNumOperands(), e = TID.getNumOperands(); i != e; --i){
+ for (unsigned i = MI.getNumOperands(), e = TID.getNumOperands(); i >= e; --i){
const MachineOperand &MO = MI.getOperand(i-1);
if (MO.isReg() && MO.isDef() && MO.getReg() == ARM::CPSR)
return 1 << ARMII::S_BitShift;