[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/31] target/s390x: Use unwind data for helper_test
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 26/31] target/s390x: Use unwind data for helper_testblock |
Date: |
Mon, 22 May 2017 20:03:07 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 3 +++
target/s390x/translate.c | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 1e31bd3..a874f8a 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -912,6 +912,7 @@ void HELPER(stctl)(CPUS390XState *env, uint32_t r1,
uint64_t a2, uint32_t r3)
uint32_t HELPER(testblock)(CPUS390XState *env, uint64_t real_addr)
{
+ uintptr_t ra = GETPC();
CPUState *cs = CPU(s390_env_get_cpu(env));
uint64_t abs_addr;
int i;
@@ -920,12 +921,14 @@ uint32_t HELPER(testblock)(CPUS390XState *env, uint64_t
real_addr)
abs_addr = mmu_real2abs(env, real_addr) & TARGET_PAGE_MASK;
if (!address_space_access_valid(&address_space_memory, abs_addr,
TARGET_PAGE_SIZE, true)) {
+ cpu_restore_state(cs, ra);
program_interrupt(env, PGM_ADDRESSING, 4);
return 1;
}
/* Check low-address protection */
if ((env->cregs[0] & CR0_LOWPROT) && real_addr < 0x2000) {
+ cpu_restore_state(cs, ra);
program_interrupt(env, PGM_PROTECTION, 4);
return 1;
}
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 3a2151f..694e099 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -4047,7 +4047,6 @@ static ExitStatus op_tcxb(DisasContext *s, DisasOps *o)
static ExitStatus op_testblock(DisasContext *s, DisasOps *o)
{
check_privileged(s);
- potential_page_fault(s);
gen_helper_testblock(cc_op, cpu_env, o->in2);
set_cc_static(s);
return NO_EXIT;
--
2.9.4
- Re: [Qemu-devel] [PATCH 22/31] target/s390x: Use unwind data for helper_trt, (continued)
- [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 <=
- [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
- [Qemu-devel] [PATCH 30/31] target/s390x: Implement CSPG, Richard Henderson, 2017/05/22