Commit 2f93a3ec authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/davidhildenbrand/tags/s390x-tcg-2019-09-23' into staging 



Fix a bunch of BUGs in the mem-helpers (including the MVC instruction),
especially, to make them behave correctly on faults.

# gpg: Signature made Mon 23 Sep 2019 09:01:21 BST
# gpg:                using RSA key 1BD9CAAD735C4C3A460DFCCA4DDE10F700FF835A
# gpg:                issuer "david@redhat.com"
# gpg: Good signature from "David Hildenbrand <david@redhat.com>" [unknown]
# gpg:                 aka "David Hildenbrand <davidhildenbrand@gmail.com>" [full]
# Primary key fingerprint: 1BD9 CAAD 735C 4C3A 460D  FCCA 4DDE 10F7 00FF 835A

* remotes/davidhildenbrand/tags/s390x-tcg-2019-09-23: (30 commits)
  tests/tcg: target/s390x: Test MVC
  tests/tcg: target/s390x: Test MVO
  s390x/tcg: MVO: Fault-safe handling
  s390x/tcg: MVST: Fault-safe handling
  s390x/tcg: MVZ: Fault-safe handling
  s390x/tcg: MVN: Fault-safe handling
  s390x/tcg: MVCIN: Fault-safe handling
  s390x/tcg: NC: Fault-safe handling
  s390x/tcg: XC: Fault-safe handling
  s390x/tcg: OC: Fault-safe handling
  s390x/tcg: MVCLU: Fault-safe handling
  s390x/tcg: MVC: Fault-safe handling on destructive overlaps
  s390x/tcg: MVCS/MVCP: Use access_memmove()
  s390x/tcg: Fault-safe memmove
  s390x/tcg: Fault-safe memset
  s390x/tcg: Always use MMU_USER_IDX for CONFIG_USER_ONLY
  s390x/tcg: MVST: Fix storing back the addresses to registers
  s390x/tcg: MVST: Check for specification exceptions
  s390x/tcg: MVCS/MVCP: Properly wrap the length
  s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-bit mode
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8400efa5 5d69cbdf

target/s390x/cpu.h

+4 −0
Original line number Diff line number Diff line
@@ -328,6 +328,9 @@ extern const VMStateDescription vmstate_s390_cpu; 


static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)

{

#ifdef CONFIG_USER_ONLY

    return MMU_USER_IDX;

#else

    if (!(env->psw.mask & PSW_MASK_DAT)) {

        return MMU_REAL_IDX;

    }
@@ -351,6 +354,7 @@ static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch) 
    default:

        abort();

    }

#endif

}



static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc,

target/s390x/helper.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ DEF_HELPER_FLAGS_4(mvn, TCG_CALL_NO_WG, void, env, i32, i64, i64) 
DEF_HELPER_FLAGS_4(mvo, TCG_CALL_NO_WG, void, env, i32, i64, i64)

DEF_HELPER_FLAGS_4(mvpg, TCG_CALL_NO_WG, i32, env, i64, i64, i64)

DEF_HELPER_FLAGS_4(mvz, TCG_CALL_NO_WG, void, env, i32, i64, i64)

DEF_HELPER_4(mvst, i64, env, i64, i64, i64)

DEF_HELPER_3(mvst, i32, env, i32, i32)

DEF_HELPER_4(ex, void, env, i32, i64, i64)

DEF_HELPER_FLAGS_4(stam, TCG_CALL_NO_WG, void, env, i32, i64, i32)

DEF_HELPER_FLAGS_4(lam, TCG_CALL_NO_WG, void, env, i32, i64, i32)

target/s390x/insn-data.def

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ 
/* MOVE PAGE */

    C(0xb254, MVPG,    RRE,   Z,   r1_o, r2_o, 0, 0, mvpg, 0)

/* MOVE STRING */

    C(0xb255, MVST,    RRE,   Z,   r1_o, r2_o, 0, 0, mvst, 0)

    C(0xb255, MVST,    RRE,   Z,   0, 0, 0, 0, mvst, 0)

/* MOVE WITH OPTIONAL SPECIFICATION */

    C(0xc800, MVCOS,   SSF,   MVCOS, la1, a2, 0, 0, mvcos, 0)

/* MOVE WITH OFFSET */

target/s390x/mem_helper.c

+528 −221

File changed.

Preview size limit exceeded, changes collapsed.

target/s390x/translate.c

+10 −2
Original line number Diff line number Diff line
@@ -318,6 +318,9 @@ static inline uint64_t ld_code4(CPUS390XState *env, uint64_t pc) 


static int get_mem_index(DisasContext *s)

{

#ifdef CONFIG_USER_ONLY

    return MMU_USER_IDX;

#else

    if (!(s->base.tb->flags & FLAG_MASK_DAT)) {

        return MMU_REAL_IDX;

    }
@@ -333,6 +336,7 @@ static int get_mem_index(DisasContext *s) 
        tcg_abort();

        break;

    }

#endif

}



static void gen_exception(int excp)
@@ -3488,9 +3492,13 @@ static DisasJumpType op_mvpg(DisasContext *s, DisasOps *o) 


static DisasJumpType op_mvst(DisasContext *s, DisasOps *o)

{

    gen_helper_mvst(o->in1, cpu_env, regs[0], o->in1, o->in2);

    TCGv_i32 t1 = tcg_const_i32(get_field(s->fields, r1));

    TCGv_i32 t2 = tcg_const_i32(get_field(s->fields, r2));



    gen_helper_mvst(cc_op, cpu_env, t1, t2);

    tcg_temp_free_i32(t1);

    tcg_temp_free_i32(t2);

    set_cc_static(s);

    return_low128(o->in2);

    return DISAS_NEXT;

}