diff options
| author | David Hildenbrand <david@redhat.com> | 2017-11-30 17:27:39 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-12-14 17:56:54 +0100 |
| commit | 277b156d8dd4d54fa00997ef384d4503dd057479 (patch) | |
| tree | 6d261cda9c081624c71a5a59744a41e6c11c4403 | |
| parent | 1a38921a61d1394089186c03491321b6e682793c (diff) | |
s390x/tcg: use s390_program_interrupt() in DIAG
Now we can drop the two save statements in the translate function.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20171130162744.25442-12-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | target/s390x/misc_helper.c | 2 | ||||
| -rw-r--r-- | target/s390x/translate.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 02654617b3..ee6179ef89 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -101,7 +101,7 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num) } if (r) { - program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO); + s390_program_interrupt(env, PGM_SPECIFICATION, ILEN_AUTO, GETPC()); } } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 76b222b0ce..cf8ffa217e 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2124,9 +2124,6 @@ static ExitStatus op_diag(DisasContext *s, DisasOps *o) TCGv_i32 func_code = tcg_const_i32(get_field(s->fields, i2)); check_privileged(s); - update_psw_addr(s); - gen_op_calc_cc(s); - gen_helper_diag(cpu_env, r1, r3, func_code); tcg_temp_free_i32(func_code); |