diff --git a/target-sparc/exec.h b/target-sparc/exec.h
index 942b8118975fb7f832ac25f46dac7fd9680c0f24..5f48ba8e6a33d1d0fc683d672af13e733859c29e 100644
--- a/target-sparc/exec.h
+++ b/target-sparc/exec.h
@@ -152,6 +152,10 @@ void do_rdpsr();
 
 static inline void env_to_regs(void)
 {
+#if defined(reg_REGWPTR)
+    REGWPTR = env->regbase + (env->cwp * 16);
+    env->regwptr = REGWPTR;
+#endif
 }
 
 static inline void regs_to_env(void)