[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/69] target/s390x: Use unwind data for helper_clst
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 11/69] target/s390x: Use unwind data for helper_clst |
Date: |
Sun, 4 Jun 2017 10:34:11 -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 | 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 33d83e5..af2801e 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -362,6 +362,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;
@@ -371,8 +372,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 cd33c51..a24e288 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -1937,7 +1937,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
- [Qemu-devel] [PULL 00/69] target/s390x tcg patches, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 02/69] target/s390x: Use cpu_loop_exit_restore for tlb_fill, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 01/69] target/s390x: Add support for the TEST BLOCK instruction, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 03/69] target/s390x: Move helper_ex to end of file, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 05/69] target/s390x: Use unwind data for helper_oc, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 04/69] target/s390x: Use unwind data for helper_nc, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 06/69] target/s390x: Use unwind data for helper_xc, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 07/69] target/s390x: Use unwind data for helper_mvc, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 10/69] target/s390x: Use unwind data for helper_srst, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 08/69] target/s390x: Use unwind data for helper_clc, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 11/69] target/s390x: Use unwind data for helper_clst,
Richard Henderson <=
- [Qemu-devel] [PULL 12/69] target/s390x: Use unwind data for helper_mvpg, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 09/69] target/s390x: Use unwind data for helper_clm, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 13/69] target/s390x: Use unwind data for helper_mvst, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 15/69] target/s390x: Use unwind data for helper_stam, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 16/69] target/s390x: Use unwind data for helper_mvcl, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 14/69] target/s390x: Use unwind data for helper_lam, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 18/69] target/s390x: Use unwind data for helper_clcle, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 20/69] target/s390x: Use unwind data for helper_unpk, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 17/69] target/s390x: Use unwind data for helper_mvcle, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 19/69] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/06/04