commit 171b31e7c7b771dc9e20fcb8305fc330ee59c7a6
author ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Apr 15 21:26:37 2007 +0000
committer ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Apr 15 21:26:37 2007 +0000
tree c5dcf9876370f9221c47a7c1f0455bb3751a5748
parent 80c27194a7be757ef5a9cec978d1d8faaa4cee81

Don't use T2 for INS, it conflicts with branch delay slot handling.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2674 c046a42c-6fe2-441c-8c8c-71466251a162

target-mips/op.c

diff --git a/target-mips/op.c b/target-mips/op.c
index 2ea84b6..08ef228 100644
--- a/target-mips/op.c
+++ b/target-mips/op.c
@@ -2234,7 +2234,7 @@
     unsigned int size = PARAM2;
     target_ulong mask = ((size < 32) ? ((1 << size) - 1) : ~0) << pos;
 
-    T0 = (T2 & ~mask) | (((uint32_t)T1 << pos) & mask);
+    T0 = (T0 & ~mask) | (((uint32_t)T1 << pos) & mask);
     RETURN();
 }
 
@@ -2260,7 +2260,7 @@
     unsigned int size = PARAM2;
     target_ulong mask = ((size < 32) ? ((1 << size) - 1) : ~0) << pos;
 
-    T0 = (T2 & ~mask) | ((T1 << pos) & mask);
+    T0 = (T0 & ~mask) | ((T1 << pos) & mask);
     RETURN();
 }