[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 28/33] target/s390x: Use unwind data for helper_l
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 28/33] target/s390x: Use unwind data for helper_lra |
Date: |
Wed, 24 May 2017 12:22:41 -0700 |
Fix saving exception_index around mmu_translate; eliminate a dead store.
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 6 +++---
target/s390x/translate.c | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index a8c85c9..17d8257 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -1208,17 +1208,17 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr)
{
CPUState *cs = CPU(s390_env_get_cpu(env));
uint32_t cc = 0;
- int old_exc = cs->exception_index;
uint64_t asc = env->psw.mask & PSW_MASK_ASC;
uint64_t ret;
- int flags;
+ int old_exc, flags;
/* XXX incomplete - has more corner cases */
if (!(env->psw.mask & PSW_MASK_64) && (addr >> 32)) {
+ cpu_restore_state(cs, GETPC());
program_interrupt(env, PGM_SPECIAL_OP, 2);
}
- cs->exception_index = old_exc;
+ old_exc = cs->exception_index;
if (mmu_translate(env, addr, 0, asc, &ret, &flags, true)) {
cc = 3;
}
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 7b9c111..141be22 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -2560,7 +2560,6 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps *o)
static ExitStatus op_lra(DisasContext *s, DisasOps *o)
{
check_privileged(s);
- potential_page_fault(s);
gen_helper_lra(o->out, cpu_env, o->in2);
set_cc_static(s);
return NO_EXIT;
--
2.9.4
- [Qemu-devel] [PATCH v2 18/33] target/s390x: Use unwind data for helper_cksm, (continued)
- [Qemu-devel] [PATCH v2 18/33] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 20/33] target/s390x: Use unwind data for helper_tr, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 21/33] target/s390x: Use unwind data for helper_tre, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 22/33] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 23/33] target/s390x: Use unwind data for helper_lctlg, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 24/33] target/s390x: Use unwind data for helper_lctl, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 26/33] target/s390x: Use unwind data for helper_testblock, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 27/33] target/s390x: Use unwind data for helper_tprot, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 25/33] target/s390x: Use unwind data for helper_stctl, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 28/33] target/s390x: Use unwind data for helper_lra,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 31/33] target/s390x: Fix EXECUTE with R1==0, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 30/33] target/s390x: Fix some helper_ex problems, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 29/33] target/s390x: Use unwind data for helper_mvcs/mvcp, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 32/33] target/s390x: Use atomic operations for COMPARE SWAP PURGE, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 33/33] target/s390x: Implement CSPG, Richard Henderson, 2017/05/24