From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD6PQ-0001bJ-E6 for qemu-devel@nongnu.org; Tue, 23 May 2017 05:47:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD6PM-0004C3-DU for qemu-devel@nongnu.org; Tue, 23 May 2017 05:47:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38822) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dD6PM-0004BV-8I for qemu-devel@nongnu.org; Tue, 23 May 2017 05:47:16 -0400 References: <20170523030312.6360-1-rth@twiddle.net> <20170523030312.6360-15-rth@twiddle.net> From: Thomas Huth Message-ID: Date: Tue, 23 May 2017 11:47:12 +0200 MIME-Version: 1.0 In-Reply-To: <20170523030312.6360-15-rth@twiddle.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 14/31] target/s390x: Use unwind data for helper_stam List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson , qemu-devel@nongnu.org On 23.05.2017 05:02, Richard Henderson wrote: > Signed-off-by: Richard Henderson > --- > target/s390x/mem_helper.c | 3 ++- > target/s390x/translate.c | 1 - > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c > index 4ecec74..d6d5047 100644 > --- a/target/s390x/mem_helper.c > +++ b/target/s390x/mem_helper.c > @@ -466,10 +466,11 @@ void HELPER(lam)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) > /* store access registers r1 to r3 in memory at a2 */ > void HELPER(stam)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) > { > + uintptr_t ra = GETPC(); > int i; > > for (i = r1;; i = (i + 1) % 16) { > - cpu_stl_data(env, a2, env->aregs[i]); > + cpu_stl_data_ra(env, a2, env->aregs[i], ra); > a2 += 4; > > if (i == r3) { > diff --git a/target/s390x/translate.c b/target/s390x/translate.c > index 1fc58a1..da7b5a6 100644 > --- a/target/s390x/translate.c > +++ b/target/s390x/translate.c > @@ -3867,7 +3867,6 @@ static ExitStatus op_stam(DisasContext *s, DisasOps *o) > { > TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); > TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); > - potential_page_fault(s); > gen_helper_stam(cpu_env, r1, o->in2, r3); > tcg_temp_free_i32(r1); > tcg_temp_free_i32(r3); > Reviewed-by: Thomas Huth