[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 25/31] target/s390x: Use unwind data for helper_
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH 25/31] target/s390x: Use unwind data for helper_stctl |
Date: |
Tue, 23 May 2017 12:12:38 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 |
On 23.05.2017 05:03, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <address@hidden>
> ---
> target/s390x/mem_helper.c | 10 ++++++----
> target/s390x/translate.c | 2 --
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
> index b169e0e..1e31bd3 100644
> --- a/target/s390x/mem_helper.c
> +++ b/target/s390x/mem_helper.c
> @@ -880,11 +880,12 @@ void HELPER(lctl)(CPUS390XState *env, uint32_t r1,
> uint64_t a2, uint32_t r3)
>
> void HELPER(stctg)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3)
> {
> - int i;
> + uintptr_t ra = GETPC();
> uint64_t dest = a2;
> + uint32_t i;
>
> for (i = r1;; i = (i + 1) % 16) {
> - cpu_stq_data(env, dest, env->cregs[i]);
> + cpu_stq_data_ra(env, dest, env->cregs[i], ra);
> dest += sizeof(uint64_t);
>
> if (i == r3) {
> @@ -895,11 +896,12 @@ void HELPER(stctg)(CPUS390XState *env, uint32_t r1,
> uint64_t a2, uint32_t r3)
>
> void HELPER(stctl)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3)
> {
> - int i;
> + uintptr_t ra = GETPC();
> uint64_t dest = a2;
> + uint32_t i;
>
> for (i = r1;; i = (i + 1) % 16) {
> - cpu_stl_data(env, dest, env->cregs[i]);
> + cpu_stl_data_ra(env, dest, env->cregs[i], ra);
> dest += sizeof(uint32_t);
>
> if (i == r3) {
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index 4d964a8..3a2151f 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -3617,7 +3617,6 @@ static ExitStatus op_stctg(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));
> check_privileged(s);
> - potential_page_fault(s);
> gen_helper_stctg(cpu_env, r1, o->in2, r3);
> tcg_temp_free_i32(r1);
> tcg_temp_free_i32(r3);
> @@ -3629,7 +3628,6 @@ static ExitStatus op_stctl(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));
> check_privileged(s);
> - potential_page_fault(s);
> gen_helper_stctl(cpu_env, r1, o->in2, r3);
> tcg_temp_free_i32(r1);
> tcg_temp_free_i32(r3);
>
Reviewed-by: Thomas Huth <address@hidden>
- [Qemu-devel] [PATCH 22/31] target/s390x: Use unwind data for helper_trt, (continued)
- [Qemu-devel] [PATCH 22/31] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 21/31] target/s390x: Use unwind data for helper_tre, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 23/31] target/s390x: Use unwind data for helper_lctlg, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 25/31] target/s390x: Use unwind data for helper_stctl, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 26/31] target/s390x: Use unwind data for helper_testblock, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 27/31] target/s390x: Use unwind data for helper_tprot, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 29/31] target/s390x: Use atomic operations for COMPARE SWAP PURGE, Richard Henderson, 2017/05/22