[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 25/70] target/s390x: Use unwind data for helper_lc
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 25/70] target/s390x: Use unwind data for helper_lctl |
Date: |
Tue, 6 Jun 2017 17:30:34 -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 | 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 68e3817..614cdb2 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -878,18 +878,19 @@ void HELPER(lctlg)(CPUS390XState *env, uint32_t r1,
uint64_t a2, uint32_t r3)
void HELPER(lctl)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3)
{
+ uintptr_t ra = GETPC();
S390CPU *cpu = s390_env_get_cpu(env);
bool PERchanged = false;
- int i;
uint64_t src = a2;
- uint32_t val;
+ uint32_t i;
for (i = r1;; i = (i + 1) % 16) {
- val = cpu_ldl_data(env, src);
+ uint32_t val = cpu_ldl_data_ra(env, src, ra);
if ((uint32_t)env->cregs[i] != val && i >= 9 && i <= 11) {
PERchanged = true;
}
- env->cregs[i] = (env->cregs[i] & 0xFFFFFFFF00000000ULL) | val;
+ env->cregs[i] = deposit64(env->cregs[i], 0, 32, val);
+ HELPER_LOG("load ctl %d from 0x%" PRIx64 " == 0x%x\n", i, src, val);
src += sizeof(uint32_t);
if (i == r3) {
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 2386c41..3a98c57 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -2545,7 +2545,6 @@ static ExitStatus op_lctl(DisasContext *s, DisasOps *o)
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
check_privileged(s);
- potential_page_fault(s);
gen_helper_lctl(cpu_env, r1, o->in2, r3);
tcg_temp_free_i32(r1);
tcg_temp_free_i32(r3);
--
2.9.4
- [Qemu-devel] [PULL v2 15/70] target/s390x: Use unwind data for helper_stam, (continued)
- [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
- [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 <=
- [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, 2017/06/06
- [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