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

[Evan Cheng]

Changes in directory llvm/lib/Target/ARM:

ARMRegisterInfo.cpp updated: 1.52 -> 1.53
ARMTargetMachine.cpp updated: 1.19 -> 1.20
---
Log message:

Also set alignment of stack-based structs to 4 in thumb mode.

---
Diffs of the changes:  (+7 -8)

 ARMRegisterInfo.cpp  |    3 +--
 ARMTargetMachine.cpp |   12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)


Index: llvm/lib/Target/ARM/ARMRegisterInfo.cpp
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.52 llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.53
--- llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.52	Wed Jan 31 19:49:46 2007
+++ llvm/lib/Target/ARM/ARMRegisterInfo.cpp	Wed Jan 31 20:18:36 2007
@@ -708,8 +708,7 @@
     }
 
     Offset += InstrOffs * Scale;
-    assert((Scale == 1 || (Offset & (Scale-1)) == 0) &&
-           "Can't encode this offset!");
+    assert((Offset & (Scale-1)) == 0 && "Can't encode this offset!");
     if (Offset < 0) {
       Offset = -Offset;
       isSub = true;


Index: llvm/lib/Target/ARM/ARMTargetMachine.cpp
diff -u llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.19 llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.20
--- llvm/lib/Target/ARM/ARMTargetMachine.cpp:1.19	Wed Jan 31 16:08:40 2007
+++ llvm/lib/Target/ARM/ARMTargetMachine.cpp	Wed Jan 31 20:18:36 2007
@@ -35,12 +35,12 @@
 ARMTargetMachine::ARMTargetMachine(const Module &M, const std::string &FS)
   : Subtarget(M, FS),
     DataLayout(Subtarget.isTargetDarwin() ?
-               (Subtarget.isThumb() ?
-                std::string("e-p:32:32-d:32:32-l:32:32-s:16:32-b:8:32-B:8:32") :
-                std::string("e-p:32:32-d:32:32-l:32:32")) :
-               (Subtarget.isThumb() ?
-                std::string("e-p:32:32-d:32:64-l:32:64-s:16:32-b:8:32-B:8:32") :
-                std::string("e-p:32:32-d:32:64-l:32:64"))),
+          (Subtarget.isThumb() ?
+           std::string("e-p:32:32-d:32:32-l:32:32-s:16:32-b:8:32-B:8:32-A:32") :
+           std::string("e-p:32:32-d:32:32-l:32:32")) :
+          (Subtarget.isThumb() ?
+           std::string("e-p:32:32-d:32:64-l:32:64-s:16:32-b:8:32-B:8:32-A:32") :
+           std::string("e-p:32:32-d:32:64-l:32:64"))),
     InstrInfo(Subtarget),
     FrameInfo(Subtarget) {}