[llvm-branch-commits] [llvm-branch] r91314 - in /llvm/branches/Apple/Zoidberg/lib/Target/ARM: ARMInstrInfo.td ARMInstrThumb2.td

[Jim Grosbach]

Author: grosbach
Date: Mon Dec 14 13:24:48 2009
New Revision: 91314

URL: http://llvm.org/viewvc/llvm-project?rev=91314&view=rev
Log:
merge 91313

Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrInfo.td
    llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrThumb2.td

Modified: llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrInfo.td?rev=91314&r1=91313&r2=91314&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrInfo.td (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrInfo.td Mon Dec 14 13:24:48 2009
@@ -1575,7 +1575,7 @@
                         Pseudo, NoItinerary,
                         "dmb", "",
                         [(ARMMemBarrier)]>,
-                        Requires<[HasV7]> {
+                        Requires<[IsARM, HasV7]> {
   let Inst{31-4} = 0xf57ff05;
   // FIXME: add support for options other than a full system DMB
   let Inst{3-0} = 0b1111;
@@ -1585,7 +1585,7 @@
                         Pseudo, NoItinerary,
                         "dsb", "",
                         [(ARMSyncBarrier)]>,
-                        Requires<[HasV7]> {
+                        Requires<[IsARM, HasV7]> {
   let Inst{31-4} = 0xf57ff04;
   // FIXME: add support for options other than a full system DSB
   let Inst{3-0} = 0b1111;

Modified: llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrThumb2.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrThumb2.td?rev=91314&r1=91313&r2=91314&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrThumb2.td (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrThumb2.td Mon Dec 14 13:24:48 2009
@@ -1073,14 +1073,16 @@
 def t2Int_MemBarrierV7 : AInoP<(outs), (ins),
                         Pseudo, NoItinerary,
                         "dmb", "",
-                        [(ARMMemBarrier)]> {
+                        [(ARMMemBarrier)]>,
+                        Requires<[IsThumb2]> {
   // FIXME: add support for options other than a full system DMB
 }
 
 def t2Int_SyncBarrierV7 : AInoP<(outs), (ins),
                         Pseudo, NoItinerary,
                         "dsb", "",
-                        [(ARMSyncBarrier)]> {
+                        [(ARMSyncBarrier)]>,
+                        Requires<[IsThumb2]> {
   // FIXME: add support for options other than a full system DSB
 }
 }