Commit 2294d05d authored by Jin Guojie's avatar Jin Guojie Committed by Richard Henderson
Browse files

tcg-mips: Adjust move functions for mips64 



tcg_out_mov: using OPC_OR as most mips assemblers do;
tcg_out_movi: extended to 64-bit immediate.

Tested-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Tested-by: default avatarJames Hogan <james.hogan@imgtec.com>
Tested-by: default avatarYunQiang Su <wzssyqa@gmail.com>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarJin Guojie <jinguojie@loongson.cn>
Message-Id: <1483592275-4496-6-git-send-email-jinguojie@loongson.cn>
parent 7f54eaa3

tcg/mips/tcg-target.inc.c

+25 −9
Original line number Diff line number Diff line
@@ -544,23 +544,39 @@ static inline void tcg_out_mov(TCGContext *s, TCGType type, 
{

    /* Simple reg-reg move, optimising out the 'do nothing' case */

    if (ret != arg) {

        tcg_out_opc_reg(s, OPC_ADDU, ret, arg, TCG_REG_ZERO);

        tcg_out_opc_reg(s, OPC_OR, ret, arg, TCG_REG_ZERO);

    }

}



static inline void tcg_out_movi(TCGContext *s, TCGType type,

                                TCGReg reg, tcg_target_long arg)

static void tcg_out_movi(TCGContext *s, TCGType type,

                         TCGReg ret, tcg_target_long arg)

{

    if (TCG_TARGET_REG_BITS == 64 && type == TCG_TYPE_I32) {

        arg = (int32_t)arg;

    }

    if (arg == (int16_t)arg) {

        tcg_out_opc_imm(s, OPC_ADDIU, reg, TCG_REG_ZERO, arg);

    } else if (arg == (uint16_t)arg) {

        tcg_out_opc_imm(s, OPC_ORI, reg, TCG_REG_ZERO, arg);

        tcg_out_opc_imm(s, OPC_ADDIU, ret, TCG_REG_ZERO, arg);

        return;

    }

    if (arg == (uint16_t)arg) {

        tcg_out_opc_imm(s, OPC_ORI, ret, TCG_REG_ZERO, arg);

        return;

    }

    if (TCG_TARGET_REG_BITS == 32 || arg == (int32_t)arg) {

        tcg_out_opc_imm(s, OPC_LUI, ret, TCG_REG_ZERO, arg >> 16);

    } else {

        tcg_out_opc_imm(s, OPC_LUI, reg, TCG_REG_ZERO, arg >> 16);

        if (arg & 0xffff) {

            tcg_out_opc_imm(s, OPC_ORI, reg, reg, arg & 0xffff);

        tcg_out_movi(s, TCG_TYPE_I32, ret, arg >> 31 >> 1);

        if (arg & 0xffff0000ull) {

            tcg_out_dsll(s, ret, ret, 16);

            tcg_out_opc_imm(s, OPC_ORI, ret, ret, arg >> 16);

            tcg_out_dsll(s, ret, ret, 16);

        } else {

            tcg_out_dsll(s, ret, ret, 32);

        }

    }

    if (arg & 0xffff) {

        tcg_out_opc_imm(s, OPC_ORI, ret, ret, arg & 0xffff);

    }

}



static inline void tcg_out_bswap16(TCGContext *s, TCGReg ret, TCGReg arg)