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

[Jim Grosbach]

Author: grosbach
Date: Mon Dec 14 15:25:53 2009
New Revision: 91330

URL: http://llvm.org/viewvc/llvm-project?rev=91330&view=rev
Log:
merge 91143 91327

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

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

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrFormats.td (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrFormats.td Mon Dec 14 15:25:53 2009
@@ -302,7 +302,7 @@
   let Inst{27-23} = 0b00011;
   let Inst{22-21} = opcod;
   let Inst{20} = 0;
-  let Inst{11-0}  = 0b111110011111;
+  let Inst{11-4}  = 0b11111001;
 }
 
 // addrmode1 instructions

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=91330&r1=91329&r2=91330&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrInfo.td (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMInstrInfo.td Mon Dec 14 15:25:53 2009
@@ -1705,7 +1705,7 @@
 def LDREX  : AIldrex<0b00, (outs GPR:$dest), (ins GPR:$ptr), NoItinerary,
                     "ldrex", "\t$dest, [$ptr]",
                     []>;
-def LDREXD : AIldrex<0b00, (outs GPR:$dest, GPR:$dest2), (ins GPR:$ptr),
+def LDREXD : AIldrex<0b01, (outs GPR:$dest, GPR:$dest2), (ins GPR:$ptr),
                     NoItinerary,
                     "ldrexd", "\t$dest, $dest2, [$ptr]",
                     []>;
@@ -1724,7 +1724,7 @@
                     NoItinerary,
                     "strex", "\t$success, $src, [$ptr]",
                     []>;
-def STREXD : AIstrex<0b00, (outs GPR:$success),
+def STREXD : AIstrex<0b01, (outs GPR:$success),
                     (ins GPR:$src, GPR:$src2, GPR:$ptr),
                     NoItinerary,
                     "strexd", "\t$success, $src, $src2, [$ptr]",