[llvm-branch-commits] [llvm-branch] r106449 - in /llvm/branches/Apple/Troughton: ./ lib/Target/ARM/ARMBaseRegisterInfo.cpp utils/TableGen/ARMDecoderEmitter.cpp

[Bob Wilson]

Author: bwilson
Date: Mon Jun 21 14:00:21 2010
New Revision: 106449

URL: http://llvm.org/viewvc/llvm-project?rev=106449&view=rev
Log:
Merge changes to fix MC test failure.

--- Merging r106309 into '.':
U    utils/TableGen/ARMDecoderEmitter.cpp
U    lib/Target/ARM/ARMInstrInfo.td
U    lib/Target/ARM/ARMBaseRegisterInfo.cpp
--- Merging r106314 into '.':
G    lib/Target/ARM/ARMInstrInfo.td

Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/lib/Target/ARM/ARMBaseRegisterInfo.cpp
    llvm/branches/Apple/Troughton/utils/TableGen/ARMDecoderEmitter.cpp

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 14:00:21 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105997-105998,106004,106015,106021,106024,106027,106030,106051,106057,106146,106149,106152,106155,106157,106164,106199,106203-106204,106227,106229,106289,106291-106292,106312,106318,106321,106324,106333,106336,106342,106345
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105997-105998,106004,106015,106021,106024,106027,106030,106051,106057,106146,106149,106152,106155,106157,106164,106199,106203-106204,106227,106229,106289,106291-106292,106309,106312,106314,106318,106321,106324,106333,106336,106342,106345

Modified: llvm/branches/Apple/Troughton/lib/Target/ARM/ARMBaseRegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/Target/ARM/ARMBaseRegisterInfo.cpp?rev=106449&r1=106448&r2=106449&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/Target/ARM/ARMBaseRegisterInfo.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/Target/ARM/ARMBaseRegisterInfo.cpp Mon Jun 21 14:00:21 2010
@@ -1667,7 +1667,8 @@
         addGlobalAddress(JumpTarget.getGlobal(), JumpTarget.getOffset(),
                          JumpTarget.getTargetFlags());
     } else if (RetOpcode == ARM::TCRETURNdiND) {
-      BuildMI(MBB, MBBI, dl, TII.get(ARM::TAILJMPdND)).
+      BuildMI(MBB, MBBI, dl,
+            TII.get(STI.isThumb() ? ARM::TAILJMPdNDt : ARM::TAILJMPdND)).
         addGlobalAddress(JumpTarget.getGlobal(), JumpTarget.getOffset(),
                          JumpTarget.getTargetFlags());
     } else if (RetOpcode == ARM::TCRETURNri) {

Modified: llvm/branches/Apple/Troughton/utils/TableGen/ARMDecoderEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/utils/TableGen/ARMDecoderEmitter.cpp?rev=106449&r1=106448&r2=106449&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/utils/TableGen/ARMDecoderEmitter.cpp (original)
+++ llvm/branches/Apple/Troughton/utils/TableGen/ARMDecoderEmitter.cpp Mon Jun 21 14:00:21 2010
@@ -1579,6 +1579,7 @@
     if (Name == "TCRETURNdi" || Name == "TCRETURNdiND" ||
         Name == "TCRETURNri" || Name == "TCRETURNriND" ||
         Name == "TAILJMPd"  || Name == "TAILJMPdND" ||
+        Name == "TAILJMPdNDt" ||
         Name == "TAILJMPr"  || Name == "TAILJMPrND" ||
         Name == "MOVr_TC")
       return false;