Commit 3f4de675 authored by Aurelien Jarno's avatar Aurelien Jarno Committed by Alexander Graf
Browse files

target-s390x: implement TRANSLATE EXTENDED instruction 



It is part of the basic zArchitecture instructions.

Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 54f00775

target-s390x/helper.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ DEF_HELPER_FLAGS_3(sqxb, TCG_CALL_NO_WG, i64, env, i64, i64) 
DEF_HELPER_FLAGS_1(cvd, TCG_CALL_NO_RWG_SE, i64, s32)

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

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

DEF_HELPER_4(tre, i64, env, i64, i64, i64)

DEF_HELPER_4(trt, i32, env, i32, i64, i64)

DEF_HELPER_4(cksm, i64, env, i64, i64, i64)

DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64)

target-s390x/insn-data.def

+2 −0
Original line number Diff line number Diff line
@@ -761,6 +761,8 @@ 
    C(0xdc00, TR,      SS_a,  Z,   la1, a2, 0, 0, tr, 0)

/* TRANSLATE AND TEST */

    C(0xdd00, TRT,     SS_a,  Z,   la1, a2, 0, 0, trt, 0)

/* TRANSLATE EXTENDED */

    C(0xb2a5, TRE,     RRE,   Z,   0, r2, r1_P, 0, tre, 0)



/* UNPACK */

    /* Really format SS_b, but we pack both lengths into one argument

target-s390x/mem_helper.c

+39 −0
Original line number Diff line number Diff line
@@ -804,6 +804,45 @@ void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t array, 
    }

}



uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array,

                     uint64_t len, uint64_t trans)

{

    uint8_t end = env->regs[0] & 0xff;

    uint64_t l = len;

    uint64_t i;



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

        array &= 0x7fffffff;

        l = (uint32_t)l;

    }



    /* 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.  */

    if (l > 0x2000) {

        l = 0x2000;

        env->cc_op = 3;

    } else {

        env->cc_op = 0;

    }



    for (i = 0; i < l; i++) {

        uint8_t byte, new_byte;



        byte = cpu_ldub_data(env, array + i);



        if (byte == end) {

            env->cc_op = 1;

            break;

        }



        new_byte = cpu_ldub_data(env, trans + byte);

        cpu_stb_data(env, array + i, new_byte);

    }



    env->retxl = len - i;

    return array + i;

}



uint32_t HELPER(trt)(CPUS390XState *env, uint32_t len, uint64_t array,

                     uint64_t trans)

{

target-s390x/translate.c

+9 −0
Original line number Diff line number Diff line
@@ -3787,6 +3787,15 @@ static ExitStatus op_tr(DisasContext *s, DisasOps *o) 
    return NO_EXIT;

}



static ExitStatus op_tre(DisasContext *s, DisasOps *o)

{

    potential_page_fault(s);

    gen_helper_tre(o->out, cpu_env, o->out, o->out2, o->in2);

    return_low128(o->out2);

    set_cc_static(s);

    return NO_EXIT;

}



static ExitStatus op_trt(DisasContext *s, DisasOps *o)

{

    TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1));