[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/31] target/s390x: Use unwind data for helper_unpk
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 19/31] target/s390x: Use unwind data for helper_unpk |
Date: |
Mon, 22 May 2017 20:03:00 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 9 +++++----
target/s390x/translate.c | 1 -
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index da81b38..d37e691 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -660,6 +660,7 @@ uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1,
void HELPER(unpk)(CPUS390XState *env, uint32_t len, uint64_t dest,
uint64_t src)
{
+ uintptr_t ra = GETPC();
int len_dest = len >> 4;
int len_src = len & 0xf;
uint8_t b;
@@ -669,8 +670,8 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len,
uint64_t dest,
src += len_src;
/* last byte is special, it only flips the nibbles */
- b = cpu_ldub_data(env, src);
- cpu_stb_data(env, dest, (b << 4) | (b >> 4));
+ b = cpu_ldub_data_ra(env, src, ra);
+ cpu_stb_data_ra(env, dest, (b << 4) | (b >> 4), ra);
src--;
len_src--;
@@ -680,7 +681,7 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len,
uint64_t dest,
uint8_t cur_byte = 0;
if (len_src > 0) {
- cur_byte = cpu_ldub_data(env, src);
+ cur_byte = cpu_ldub_data_ra(env, src, ra);
}
len_dest--;
@@ -699,7 +700,7 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len,
uint64_t dest,
/* zone bits */
cur_byte |= 0xf0;
- cpu_stb_data(env, dest, cur_byte);
+ cpu_stb_data_ra(env, dest, cur_byte, ra);
}
}
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 21c21a6..e8eefec 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -4099,7 +4099,6 @@ static ExitStatus op_trt(DisasContext *s, DisasOps *o)
static ExitStatus op_unpk(DisasContext *s, DisasOps *o)
{
TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1));
- potential_page_fault(s);
gen_helper_unpk(cpu_env, l, o->addr1, o->in2);
tcg_temp_free_i32(l);
return NO_EXIT;
--
2.9.4
- Re: [Qemu-devel] [PATCH 14/31] target/s390x: Use unwind data for helper_stam, (continued)
- [Qemu-devel] [PATCH 16/31] target/s390x: Use unwind data for helper_mvcle, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 17/31] target/s390x: Use unwind data for helper_clcle, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 18/31] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 19/31] target/s390x: Use unwind data for helper_unpk,
Richard Henderson <=
- [Qemu-devel] [PATCH 20/31] target/s390x: Use unwind data for helper_tr, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 22/31] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 21/31] target/s390x: Use unwind data for helper_tre, Richard Henderson, 2017/05/22