[llvm-commits] CVS: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp

[Evan Cheng]

Changes in directory llvm/lib/Target/ARM:

ARMConstantIslandPass.cpp updated: 1.20 -> 1.21
---
Log message:

Pasto. Lots of it.

---
Diffs of the changes:  (+3 -5)

 ARMConstantIslandPass.cpp |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Index: llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
diff -u llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.20 llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.21
--- llvm/lib/Target/ARM/ARMConstantIslandPass.cpp:1.20	Thu Feb  1 04:16:15 2007
+++ llvm/lib/Target/ARM/ARMConstantIslandPass.cpp	Thu Feb  1 14:44:52 2007
@@ -311,12 +311,10 @@
             Scale = 4;  // Taking the address of a CP entry.
             break;
           case ARMII::AddrMode2:
-            Bits = 12;
-            Scale = 2;  // +-offset_12
+            Bits = 12;  // +-offset_12
             break;
           case ARMII::AddrMode3:
-            Bits = 8;
-            Scale = 2;  // +-offset_8
+            Bits = 8;   // +-offset_8
             break;
             // addrmode4 has no immediate offset.
           case ARMII::AddrMode5:
@@ -342,7 +340,7 @@
 
           // Remember that this is a user of a CP entry.
           MachineInstr *CPEMI =CPEMIs[I->getOperand(op).getConstantPoolIndex()];
-          unsigned MaxOffs = (1 << (Bits-1)) * Scale;          
+          unsigned MaxOffs = ((1 << Bits)-1) * Scale;          
           CPUsers.push_back(CPUser(I, CPEMI, MaxOffs));
           
           // Instructions can only use one CP entry, don't bother scanning the