[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 30/70] target/s390x: Use unwind data for helper_mv
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 30/70] target/s390x: Use unwind data for helper_mvcs/mvcp |
Date: |
Tue, 6 Jun 2017 17:30:39 -0700 |
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Aurelien Jarno <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 8 ++++++--
target/s390x/translate.c | 2 --
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 17d8257..a73d486 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -1082,6 +1082,7 @@ uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1,
uint64_t r2)
uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2)
{
+ uintptr_t ra = GETPC();
int cc = 0, i;
HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n",
@@ -1095,7 +1096,8 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l,
uint64_t a1, uint64_t a2)
/* XXX replace w/ memcpy */
for (i = 0; i < l; i++) {
- cpu_stb_secondary(env, a1 + i, cpu_ldub_primary(env, a2 + i));
+ uint8_t x = cpu_ldub_primary_ra(env, a2 + i, ra);
+ cpu_stb_secondary_ra(env, a1 + i, x, ra);
}
return cc;
@@ -1103,6 +1105,7 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l,
uint64_t a1, uint64_t a2)
uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2)
{
+ uintptr_t ra = GETPC();
int cc = 0, i;
HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n",
@@ -1116,7 +1119,8 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l,
uint64_t a1, uint64_t a2)
/* XXX replace w/ memcpy */
for (i = 0; i < l; i++) {
- cpu_stb_primary(env, a1 + i, cpu_ldub_secondary(env, a2 + i));
+ uint8_t x = cpu_ldub_secondary_ra(env, a2 + i, ra);
+ cpu_stb_primary_ra(env, a1 + i, x, ra);
}
return cc;
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 80b08b9..e99fbd9 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -2894,7 +2894,6 @@ static ExitStatus op_mvcp(DisasContext *s, DisasOps *o)
{
int r1 = get_field(s->fields, l1);
check_privileged(s);
- potential_page_fault(s);
gen_helper_mvcp(cc_op, cpu_env, regs[r1], o->addr1, o->in2);
set_cc_static(s);
return NO_EXIT;
@@ -2904,7 +2903,6 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *o)
{
int r1 = get_field(s->fields, l1);
check_privileged(s);
- potential_page_fault(s);
gen_helper_mvcs(cc_op, cpu_env, regs[r1], o->addr1, o->in2);
set_cc_static(s);
return NO_EXIT;
--
2.9.4
- [Qemu-devel] [PULL v2 18/70] target/s390x: Use unwind data for helper_clcle, (continued)
- [Qemu-devel] [PULL v2 18/70] target/s390x: Use unwind data for helper_clcle, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 20/70] target/s390x: Use unwind data for helper_unpk, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 21/70] target/s390x: Use unwind data for helper_tr, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 22/70] target/s390x: Use unwind data for helper_tre, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 23/70] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 24/70] target/s390x: Use unwind data for helper_lctlg, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 25/70] target/s390x: Use unwind data for helper_lctl, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 26/70] target/s390x: Use unwind data for helper_stctl, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 27/70] target/s390x: Use unwind data for helper_testblock, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 28/70] target/s390x: Use unwind data for helper_tprot, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 30/70] target/s390x: Use unwind data for helper_mvcs/mvcp,
Richard Henderson <=
- [Qemu-devel] [PULL v2 32/70] target/s390x: Fix EXECUTE with R1==0, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 29/70] target/s390x: Use unwind data for helper_lra, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 31/70] target/s390x: Fix some helper_ex problems, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 34/70] target/s390x: Implement CSPG, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 33/70] target/s390x: Use atomic operations for COMPARE SWAP PURGE, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 36/70] target/s390x: End the TB after EXECUTE, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 37/70] target/s390x: Implement EXECUTE via new TranslationBlock, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 35/70] target/s390x: Save current ilen during translation, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 38/70] target/s390x: Re-implement a few EXECUTE target insns directly, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 40/70] target/s390x: remove dead code in translate.c, Richard Henderson, 2017/06/06