On 23.05.2017 05:02, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <r...@twiddle.net>
> ---
> 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 <th...@redhat.com>
