diff --git a/lib/Target/PowerPC/PPCInstr64Bit.td b/lib/Target/PowerPC/PPCInstr64Bit.td
index ff45287631f..f6cca74dcaf 100644
--- a/lib/Target/PowerPC/PPCInstr64Bit.td
+++ b/lib/Target/PowerPC/PPCInstr64Bit.td
@@ -105,12 +105,13 @@ def RLDICR : MDForm_1<30, 1,
 
 
 let isLoad = 1, PPC970_Unit = 2 in {
-def LWA  : DSForm_1<58, 2, (ops G8RC:$rT, memrix:$src),
-                    "lwa $rT, $src", LdStLWA,
-                    []>, isPPC64, PPC970_DGroup_Cracked;
-def LD   : DSForm_2<58, 0, (ops G8RC:$rT, memrix:$src),
-                    "ld $rT, $src", LdStLD,
-                    []>, isPPC64;
+def LWA  : DSForm_1<58, 2, (ops G8RC:$rD, memrix:$src),
+                    "lwa $rD, $src", LdStLWA,
+                    [(set G8RC:$rD, (sextload ixaddr:$src, i32))]>, isPPC64,
+                    PPC970_DGroup_Cracked;
+def LD   : DSForm_2<58, 0, (ops G8RC:$rD, memrix:$src),
+                    "ld $rD, $src", LdStLD,
+                    [(set G8RC:$rD, (load ixaddr:$src))]>, isPPC64;
 
 def LWAX : XForm_1<31, 341, (ops G8RC:$rD, memrr:$src),
                    "lwax $rD, $src", LdStLHA,
@@ -121,14 +122,14 @@ def LDX  : XForm_1<31,  21, (ops G8RC:$rD, memrr:$src),
                    [(set G8RC:$rD, (load xaddr:$src))]>, isPPC64;
 }
 let isStore = 1, noResults = 1, PPC970_Unit = 2 in {
-def STD  : DSForm_2<62, 0, (ops G8RC:$rT, memrix:$src),
-                    "std $rT, $src", LdStSTD,
-                    []>, isPPC64;
-
-def STDX  : XForm_8<31, 149, (ops GPRC:$rS, memrr:$dst),
+def STD  : DSForm_2<62, 0, (ops G8RC:$rS, memrix:$dst),
+                    "std $rS, $dst", LdStSTD,
+                    [(store G8RC:$rS, ixaddr:$dst)]>, isPPC64;
+def STDX  : XForm_8<31, 149, (ops G8RC:$rS, memrr:$dst),
                    "stdx $rS, $dst", LdStSTD,
-                   []>, isPPC64, PPC970_DGroup_Cracked;
-def STDUX : XForm_8<31, 181, (ops GPRC:$rS, memrr:$dst),
+                   [(store G8RC:$rS, iaddr:$dst)]>, isPPC64,
+                   PPC970_DGroup_Cracked;
+def STDUX : XForm_8<31, 181, (ops G8RC:$rS, memrr:$dst),
                    "stdux $rS, $dst", LdStSTD,
                    []>, isPPC64;