wrwim insn fix (Paul Robinson)

diff --git a/target-sparc/op.c b/target-sparc/op.c
index 7ea209ea86f9968eb2fc704217e18f0ffdd0f968..1ec15d28b1376f27669883f1fc36d510068c1574 100644 (file)
--- a/target-sparc/op.c
+++ b/target-sparc/op.c
@@ -844,6 +844,15 @@ void OPPROTO op_wrpsr(void)
     FORCE_RET();
 }
 
+void OPPROTO op_wrwim(void)
+{
+#if NWINDOWS == 32
+    env->wim = T0;
+#else
+    env->wim = T0 & ((1 << NWINDOWS) - 1);
+#endif
+}
+
 void OPPROTO op_rett(void)
 {
     helper_rett();

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index a522d778be60625b54560ce7f413a04fd91a7aeb..455dd171e450501d97ae104f92efebdfaea2a64e 100644 (file)
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -2005,7 +2005,7 @@ static void disas_sparc_insn(DisasContext * dc)
                                goto illegal_insn;
                            }
 #else
-                           gen_op_movl_env_T0(offsetof(CPUSPARCState, wim));
+                           gen_op_wrwim();
 #endif
                         }
                         break;