[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 09/70] target/s390x: Use unwind data for helper_cl
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 09/70] target/s390x: Use unwind data for helper_clm |
Date: |
Tue, 6 Jun 2017 17:30:18 -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 | 11 ++++++-----
target/s390x/translate.c | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 50689bb..3e75cae 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -268,16 +268,16 @@ uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l,
uint64_t s1, uint64_t s2)
uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask,
uint64_t addr)
{
- uint8_t r, d;
- uint32_t cc;
+ uintptr_t ra = GETPC();
+ uint32_t cc = 0;
HELPER_LOG("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64 "\n", __func__, r1,
mask, addr);
- cc = 0;
+
while (mask) {
if (mask & 8) {
- d = cpu_ldub_data(env, addr);
- r = (r1 & 0xff000000UL) >> 24;
+ uint8_t d = cpu_ldub_data_ra(env, addr, ra);
+ uint8_t r = extract32(r1, 24, 8);
HELPER_LOG("mask 0x%x %02x/%02x (0x%" PRIx64 ") ", mask, r, d,
addr);
if (r < d) {
@@ -292,6 +292,7 @@ uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1,
uint32_t mask,
mask = (mask << 1) & 0xf;
r1 <<= 8;
}
+
HELPER_LOG("\n");
return cc;
}
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index c47b818..d4c5fa3 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -1933,7 +1933,6 @@ static ExitStatus op_clm(DisasContext *s, DisasOps *o)
TCGv_i32 m3 = tcg_const_i32(get_field(s->fields, m3));
TCGv_i32 t1 = tcg_temp_new_i32();
tcg_gen_extrl_i64_i32(t1, o->in1);
- potential_page_fault(s);
gen_helper_clm(cc_op, cpu_env, t1, m3, o->in2);
set_cc_static(s);
tcg_temp_free_i32(t1);
--
2.9.4
- [Qemu-devel] [PULL v2 00/70] target/s390x tcg patches, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 01/70] target/s390x: Add support for the TEST BLOCK instruction, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 02/70] target/s390x: Use cpu_loop_exit_restore for tlb_fill, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 03/70] target/s390x: Move helper_ex to end of file, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 04/70] target/s390x: Use unwind data for helper_nc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 05/70] target/s390x: Use unwind data for helper_oc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 06/70] target/s390x: Use unwind data for helper_xc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 08/70] target/s390x: Use unwind data for helper_clc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 07/70] target/s390x: Use unwind data for helper_mvc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 09/70] target/s390x: Use unwind data for helper_clm,
Richard Henderson <=
- [Qemu-devel] [PULL v2 10/70] target/s390x: Use unwind data for helper_srst, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 11/70] target/s390x: Use unwind data for helper_clst, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 12/70] target/s390x: Use unwind data for helper_mvpg, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 13/70] target/s390x: Use unwind data for helper_mvst, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 14/70] target/s390x: Use unwind data for helper_lam, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 15/70] target/s390x: Use unwind data for helper_stam, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 16/70] target/s390x: Use unwind data for helper_mvcl, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 17/70] target/s390x: Use unwind data for helper_mvcle, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 19/70] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 18/70] target/s390x: Use unwind data for helper_clcle, Richard Henderson, 2017/06/06