[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/31] target/s390x: Use unwind data for helper_clst
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 10/31] target/s390x: Use unwind data for helper_clst |
Date: |
Mon, 22 May 2017 20:02:51 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 5 +++--
target/s390x/translate.c | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 3c28f3a..7c9e7c7 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -337,6 +337,7 @@ uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0,
uint64_t end,
/* unsigned string compare (c is string terminator) */
uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c, uint64_t s1, uint64_t s2)
{
+ uintptr_t ra = GETPC();
uint32_t len;
c = c & 0xff;
@@ -346,8 +347,8 @@ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c,
uint64_t s1, uint64_t s2)
/* Lest we fail to service interrupts in a timely manner, limit the
amount of work we're willing to do. For now, let's cap at 8k. */
for (len = 0; len < 0x2000; ++len) {
- uint8_t v1 = cpu_ldub_data(env, s1 + len);
- uint8_t v2 = cpu_ldub_data(env, s2 + len);
+ uint8_t v1 = cpu_ldub_data_ra(env, s1 + len, ra);
+ uint8_t v2 = cpu_ldub_data_ra(env, s2 + len, ra);
if (v1 == v2) {
if (v1 == c) {
/* Equal. CC=0, and don't advance the registers. */
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index ba7d0f9..735aa82 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -1939,7 +1939,6 @@ static ExitStatus op_clm(DisasContext *s, DisasOps *o)
static ExitStatus op_clst(DisasContext *s, DisasOps *o)
{
- potential_page_fault(s);
gen_helper_clst(o->in1, cpu_env, regs[0], o->in1, o->in2);
set_cc_static(s);
return_low128(o->in2);
--
2.9.4
- Re: [Qemu-devel] [PATCH 05/31] target/s390x: Use unwind data for helper_oc, (continued)
- [Qemu-devel] [PATCH 06/31] target/s390x: Use unwind data for helper_mvc, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 09/31] target/s390x: Use unwind data for helper_srst, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 08/31] target/s390x: Use unwind data for helper_clm, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 10/31] target/s390x: Use unwind data for helper_clst,
Richard Henderson <=
- [Qemu-devel] [PATCH 07/31] target/s390x: Use unwind data for helper_clc, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 12/31] target/s390x: Use unwind data for helper_mvst, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 13/31] target/s390x: Use unwind data for helper_lam, Richard Henderson, 2017/05/22