[llvm-branch-commits] [llvm-branch] r113639 - in /llvm/branches/release_28: ./ lib/Target/ARM/ARMBaseInstrInfo.cpp

[Bill Wendling]

Author: void
Date: Fri Sep 10 16:48:08 2010
New Revision: 113639

URL: http://llvm.org/viewvc/llvm-project?rev=113639&view=rev
Log:
Approved by Evan:

$ svn merge -c 113637 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113637 into '.':
U    lib/Target/ARM/ARMBaseInstrInfo.cpp


Modified:
    llvm/branches/release_28/   (props changed)
    llvm/branches/release_28/lib/Target/ARM/ARMBaseInstrInfo.cpp

Propchange: llvm/branches/release_28/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 16:48:08 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:113109,113123,113146,113158,113255,113257,113260,113297,113299,113303,113322,113345,113365-113366,113394,113483-113485,113576
+/llvm/trunk:113109,113123,113146,113158,113255,113257,113260,113297,113299,113303,113322,113345,113365-113366,113394,113483-113485,113576,113637

Modified: llvm/branches/release_28/lib/Target/ARM/ARMBaseInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_28/lib/Target/ARM/ARMBaseInstrInfo.cpp?rev=113639&r1=113638&r2=113639&view=diff
==============================================================================
--- llvm/branches/release_28/lib/Target/ARM/ARMBaseInstrInfo.cpp (original)
+++ llvm/branches/release_28/lib/Target/ARM/ARMBaseInstrInfo.cpp Fri Sep 10 16:48:08 2010
@@ -923,6 +923,11 @@
 
   unsigned PCLabelId = AFI->createConstPoolEntryUId();
   ARMConstantPoolValue *NewCPV = 0;
+  // FIXME: The below assumes PIC relocation model and that the function
+  // is Thumb mode (t1 or t2). PCAdjustment would be 8 for ARM mode PIC, and
+  // zero for non-PIC in ARM or Thumb. The callers are all of thumb LDR
+  // instructions, so that's probably OK, but is PIC always correct when
+  // we get here?
   if (ACPV->isGlobalValue())
     NewCPV = new ARMConstantPoolValue(ACPV->getGV(), PCLabelId,
                                       ARMCP::CPValue, 4);
@@ -932,6 +937,9 @@
   else if (ACPV->isBlockAddress())
     NewCPV = new ARMConstantPoolValue(ACPV->getBlockAddress(), PCLabelId,
                                       ARMCP::CPBlockAddress, 4);
+  else if (ACPV->isLSDA())
+    NewCPV = new ARMConstantPoolValue(MF.getFunction(), PCLabelId,
+                                      ARMCP::CPLSDA, 4);
   else
     llvm_unreachable("Unexpected ARM constantpool value type!!");
   CPI = MCP->getConstantPoolIndex(NewCPV, MCPE.getAlignment());