[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/33] s390x/tcg: make stora(g) use the new _real mmu
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 14/33] s390x/tcg: make stora(g) use the new _real mmu |
Date: |
Fri, 6 Oct 2017 11:59:37 +0200 |
From: David Hildenbrand <address@hidden>
As we properly handle the return address now, we can drop
potential_page_fault().
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/mem_helper.c | 8 ++------
target/s390x/translate.c | 2 --
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index bc50bc0686..b4f2779428 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -1970,9 +1970,7 @@ uint64_t HELPER(lurag)(CPUS390XState *env, uint64_t addr)
/* store using real address */
void HELPER(stura)(CPUS390XState *env, uint64_t addr, uint64_t v1)
{
- CPUState *cs = CPU(s390_env_get_cpu(env));
-
- stl_phys(cs->as, wrap_address(env, addr), (uint32_t)v1);
+ cpu_stl_real_ra(env, wrap_address(env, addr), (uint32_t)v1, GETPC());
if ((env->psw.mask & PSW_MASK_PER) &&
(env->cregs[9] & PER_CR9_EVENT_STORE) &&
@@ -1985,9 +1983,7 @@ void HELPER(stura)(CPUS390XState *env, uint64_t addr,
uint64_t v1)
void HELPER(sturg)(CPUS390XState *env, uint64_t addr, uint64_t v1)
{
- CPUState *cs = CPU(s390_env_get_cpu(env));
-
- stq_phys(cs->as, wrap_address(env, addr), v1);
+ cpu_stq_real_ra(env, wrap_address(env, addr), v1, GETPC());
if ((env->psw.mask & PSW_MASK_PER) &&
(env->cregs[9] & PER_CR9_EVENT_STORE) &&
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index f64a31760e..9ef95141f9 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -4126,7 +4126,6 @@ static ExitStatus op_stnosm(DisasContext *s, DisasOps *o)
static ExitStatus op_stura(DisasContext *s, DisasOps *o)
{
check_privileged(s);
- potential_page_fault(s);
gen_helper_stura(cpu_env, o->in2, o->in1);
return NO_EXIT;
}
@@ -4134,7 +4133,6 @@ static ExitStatus op_stura(DisasContext *s, DisasOps *o)
static ExitStatus op_sturg(DisasContext *s, DisasOps *o)
{
check_privileged(s);
- potential_page_fault(s);
gen_helper_sturg(cpu_env, o->in2, o->in1);
return NO_EXIT;
}
--
2.13.6
- [Qemu-devel] [PULL 01/33] s390x/tcg: implement spm (SET PROGRAM MASK), (continued)
- [Qemu-devel] [PULL 01/33] s390x/tcg: implement spm (SET PROGRAM MASK), Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 03/33] s390x/tcg: add basic MSA features, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 06/33] s390x/css: introduce css data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 04/33] s390x: use generic cpu_model parsing, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 05/33] s390x/kvm: fix and cleanup storing CPU status, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 07/33] s390x/css: use ccw data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 08/33] virtio-ccw: use ccw data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 09/33] 390x/css: introduce maximum data address checking, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 11/33] s390x/tcg: fix checking for invalid memory check, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 10/33] s390x/css: support ccw IDA, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 14/33] s390x/tcg: make stora(g) use the new _real mmu,
Cornelia Huck <=
- [Qemu-devel] [PULL 13/33] s390x/tcg: make lura(g) use the new _real mmu., Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 15/33] s390x/tcg: make testblock use the new _real mmu, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 12/33] s390x/tcg: add MMU for real addresses, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 16/33] s390x/tcg: make idte/ipte use the new _real mmu, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 18/33] s390x/3270: IDA support for 3270 via CcwDataStream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 17/33] Revert "s390x/ccw: create s390 phb conditionally", Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 20/33] MAINTAINERS: use KVM s390x maintainers for kvm-stubs.c and kvm_s390x.h, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 21/33] s390x: raise CPU hotplug irq after really hotplugged, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 19/33] s390x/3270: handle writes of arbitrary length, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 22/33] s390x/cpumodel: fix max STFL(E) bit number, Cornelia Huck, 2017/10/06