From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuKvr-0004xC-DY for qemu-devel@nongnu.org; Mon, 18 May 2015 09:18:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuKvl-0004VM-CB for qemu-devel@nongnu.org; Mon, 18 May 2015 09:18:11 -0400 Received: from cantor2.suse.de ([195.135.220.15]:40506 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuKvl-0004VD-6T for qemu-devel@nongnu.org; Mon, 18 May 2015 09:18:05 -0400 Message-ID: <5559E689.8070401@suse.de> Date: Mon, 18 May 2015 15:18:01 +0200 From: Alexander Graf MIME-Version: 1.0 References: <1431818883-14944-1-git-send-email-aurelien@aurel32.net> In-Reply-To: <1431818883-14944-1-git-send-email-aurelien@aurel32.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] target-s390x: fix CC computation for EX instruction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno , qemu-devel@nongnu.org Cc: Richard Henderson On 05/17/2015 01:28 AM, Aurelien Jarno wrote: > Commit 7a6c7067f optimized CC computation by only saving cc_op before > calling helpers as they either don't touch the CC or generate a new > static value. This however doesn't work for the EX instruction as the > helper changes or not the CC value depending on the actual executed > instruction (e.g. MVC vs CLC). > > This patches force a CC computation before calling the helper. This > fixes random memory corruption occuring in guests. > > Cc: Richard Henderson > Cc: Alexander Graf > Signed-off-by: Aurelien Jarno Sounds plausible to me, though I'm surprised I didn't run into this myself yet. Richard? Alex > --- > target-s390x/translate.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target-s390x/translate.c b/target-s390x/translate.c > index 80e3a54..10522df 100644 > --- a/target-s390x/translate.c > +++ b/target-s390x/translate.c > @@ -2095,7 +2095,7 @@ static ExitStatus op_ex(DisasContext *s, DisasOps *o) > TCGv_i64 tmp; > > update_psw_addr(s); > - update_cc_op(s); > + gen_op_calc_cc(s); > > tmp = tcg_const_i64(s->next_pc); > gen_helper_ex(cc_op, cpu_env, cc_op, o->in1, o->in2, tmp);