Commit 3bf1f5ec authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150918' into staging 



MIPS patches 2015-09-18

Changes:
* fixes for rdhwr, tlbwr, mtc0, recip.fmt, rsqrt.fmt and daui instructions
* removal of MIPS_DEBUG code
* use tcg_gen_extrh_i64_i32()
* improve random tlb index generation in cpu_mips_get_random()
* exception handling improvements to correctly restore icount

# gpg: Signature made Fri 18 Sep 2015 12:15:28 BST using RSA key ID 0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"

* remotes/lalrae/tags/mips-20150918:
  target-mips: improve exception handling
  target-mips: correct MTC0 instruction on MIPS64
  target-mips: add missing restriction in DAUI instruction
  target-mips: fix corner case in TLBWR causing QEMU to hang
  pic32: use LCG algorithm for generated random index of TLBWR instruction
  target-mips: get rid of MIPS_DEBUG_SIGN_EXTENSIONS
  target-mips: get rid of MIPS_DEBUG
  target-mips: Fix RDHWR on CP0.Count
  target-mips: remove wrong checks for recip.fmt and rsqrt.fmt
  target-mips: Use tcg_gen_extrh_i64_i32

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 16a1b6e9 9c708c7f

hw/mips/cputimer.c

+11 −3
Original line number Diff line number Diff line
@@ -30,13 +30,21 @@ 
/* XXX: do not use a global */

uint32_t cpu_mips_get_random (CPUMIPSState *env)

{

    static uint32_t lfsr = 1;

    static uint32_t seed = 1;

    static uint32_t prev_idx = 0;

    uint32_t idx;

    uint32_t nb_rand_tlb = env->tlb->nb_tlb - env->CP0_Wired;



    if (nb_rand_tlb == 1) {

        return env->tlb->nb_tlb - 1;

    }



    /* Don't return same value twice, so get another value */

    do {

        lfsr = (lfsr >> 1) ^ (-(lfsr & 1u) & 0xd0000001u);

        idx = lfsr % (env->tlb->nb_tlb - env->CP0_Wired) + env->CP0_Wired;

        /* Use a simple algorithm of Linear Congruential Generator

         * from ISO/IEC 9899 standard. */

        seed = 1103515245 * seed + 12345;

        idx = (seed >> 16) % nb_rand_tlb + env->CP0_Wired;

    } while (idx == prev_idx);

    prev_idx = idx;

    return idx;

target-mips/cpu.h

+24 −0
Original line number Diff line number Diff line
@@ -1049,4 +1049,28 @@ static inline void cpu_mips_store_cause(CPUMIPSState *env, target_ulong val) 
}

#endif



static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,

                                                        uint32_t exception,

                                                        int error_code,

                                                        uintptr_t pc)

{

    CPUState *cs = CPU(mips_env_get_cpu(env));



    if (exception < EXCP_SC) {

        qemu_log_mask(CPU_LOG_INT, "%s: %d %d\n",

                      __func__, exception, error_code);

    }

    cs->exception_index = exception;

    env->error_code = error_code;



    cpu_loop_exit_restore(cs, pc);

}



static inline void QEMU_NORETURN do_raise_exception(CPUMIPSState *env,

                                                    uint32_t exception,

                                                    uintptr_t pc)

{

    do_raise_exception_err(env, exception, 0, pc);

}



#endif /* !defined (__MIPS_CPU_H__) */

target-mips/helper.h

+1 −0
Original line number Diff line number Diff line 
DEF_HELPER_3(raise_exception_err, noreturn, env, i32, int)

DEF_HELPER_2(raise_exception, noreturn, env, i32)

DEF_HELPER_1(raise_exception_debug, noreturn, env)



DEF_HELPER_1(do_semihosting, void, env)

target-mips/msa_helper.c

+85 −73
Original line number Diff line number Diff line
@@ -1352,7 +1352,7 @@ void helper_msa_ctcmsa(CPUMIPSState *env, target_ulong elm, uint32_t cd) 
        /* check exception */

        if ((GET_FP_ENABLE(env->active_tc.msacsr) | FP_UNIMPLEMENTED)

            & GET_FP_CAUSE(env->active_tc.msacsr)) {

            helper_raise_exception(env, EXCP_MSAFPE);

            do_raise_exception(env, EXCP_MSAFPE, GETPC());

        }

        break;

    }
@@ -1505,14 +1505,14 @@ static inline void clear_msacsr_cause(CPUMIPSState *env) 
    SET_FP_CAUSE(env->active_tc.msacsr, 0);

}



static inline void check_msacsr_cause(CPUMIPSState *env)

static inline void check_msacsr_cause(CPUMIPSState *env, uintptr_t retaddr)

{

    if ((GET_FP_CAUSE(env->active_tc.msacsr) &

            (GET_FP_ENABLE(env->active_tc.msacsr) | FP_UNIMPLEMENTED)) == 0) {

        UPDATE_FP_FLAGS(env->active_tc.msacsr,

                GET_FP_CAUSE(env->active_tc.msacsr));

    } else {

        helper_raise_exception(env, EXCP_MSAFPE);

        do_raise_exception(env, EXCP_MSAFPE, retaddr);

    }

}
@@ -1851,7 +1851,8 @@ static inline int32 float64_to_q32(float64 a, float_status *status) 
    } while (0)



static inline void compare_af(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                              wr_t *pwt, uint32_t df, int quiet)

                              wr_t *pwt, uint32_t df, int quiet,

                              uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -1873,13 +1874,14 @@ static inline void compare_af(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_un(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                              wr_t *pwt, uint32_t df, int quiet)

                              wr_t *pwt, uint32_t df, int quiet,

                              uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -1903,13 +1905,14 @@ static inline void compare_un(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_eq(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                              wr_t *pwt, uint32_t df, int quiet)

                              wr_t *pwt, uint32_t df, int quiet,

                              uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -1931,13 +1934,14 @@ static inline void compare_eq(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_ueq(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                               wr_t *pwt, uint32_t df, int quiet)

                               wr_t *pwt, uint32_t df, int quiet,

                               uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -1959,13 +1963,14 @@ static inline void compare_ueq(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_lt(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                              wr_t *pwt, uint32_t df, int quiet)

                              wr_t *pwt, uint32_t df, int quiet,

                              uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -1987,13 +1992,14 @@ static inline void compare_lt(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_ult(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                               wr_t *pwt, uint32_t df, int quiet)

                               wr_t *pwt, uint32_t df, int quiet,

                               uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -2015,13 +2021,14 @@ static inline void compare_ult(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_le(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                              wr_t *pwt, uint32_t df, int quiet)

                              wr_t *pwt, uint32_t df, int quiet,

                              uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -2043,13 +2050,14 @@ static inline void compare_le(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_ule(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                               wr_t *pwt, uint32_t df, int quiet)

                               wr_t *pwt, uint32_t df, int quiet,

                               uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -2071,13 +2079,14 @@ static inline void compare_ule(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_or(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                              wr_t *pwt, uint32_t df, int quiet)

                              wr_t *pwt, uint32_t df, int quiet,

                              uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -2099,13 +2108,14 @@ static inline void compare_or(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_une(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                               wr_t *pwt, uint32_t df, int quiet)

                               wr_t *pwt, uint32_t df, int quiet,

                               uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -2127,13 +2137,15 @@ static inline void compare_une(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}



static inline void compare_ne(CPUMIPSState *env, wr_t *pwd, wr_t *pws,

                              wr_t *pwt, uint32_t df, int quiet) {

                              wr_t *pwt, uint32_t df, int quiet,

                              uintptr_t retaddr)

{

    wr_t wx, *pwx = &wx;

    uint32_t i;
@@ -2154,7 +2166,7 @@ static inline void compare_ne(CPUMIPSState *env, wr_t *pwd, wr_t *pws, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, retaddr);



    msa_move_v(pwd, pwx);

}
@@ -2165,7 +2177,7 @@ void helper_msa_fcaf_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_af(env, pwd, pws, pwt, df, 1);

    compare_af(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fcun_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2174,7 +2186,7 @@ void helper_msa_fcun_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_un(env, pwd, pws, pwt, df, 1);

    compare_un(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fceq_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2183,7 +2195,7 @@ void helper_msa_fceq_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_eq(env, pwd, pws, pwt, df, 1);

    compare_eq(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fcueq_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2192,7 +2204,7 @@ void helper_msa_fcueq_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ueq(env, pwd, pws, pwt, df, 1);

    compare_ueq(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fclt_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2201,7 +2213,7 @@ void helper_msa_fclt_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_lt(env, pwd, pws, pwt, df, 1);

    compare_lt(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fcult_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2210,7 +2222,7 @@ void helper_msa_fcult_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ult(env, pwd, pws, pwt, df, 1);

    compare_ult(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fcle_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2219,7 +2231,7 @@ void helper_msa_fcle_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_le(env, pwd, pws, pwt, df, 1);

    compare_le(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fcule_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2228,7 +2240,7 @@ void helper_msa_fcule_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ule(env, pwd, pws, pwt, df, 1);

    compare_ule(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fsaf_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2237,7 +2249,7 @@ void helper_msa_fsaf_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_af(env, pwd, pws, pwt, df, 0);

    compare_af(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fsun_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2246,7 +2258,7 @@ void helper_msa_fsun_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_un(env, pwd, pws, pwt, df, 0);

    compare_un(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fseq_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2255,7 +2267,7 @@ void helper_msa_fseq_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_eq(env, pwd, pws, pwt, df, 0);

    compare_eq(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fsueq_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2264,7 +2276,7 @@ void helper_msa_fsueq_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ueq(env, pwd, pws, pwt, df, 0);

    compare_ueq(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fslt_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2273,7 +2285,7 @@ void helper_msa_fslt_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_lt(env, pwd, pws, pwt, df, 0);

    compare_lt(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fsult_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2282,7 +2294,7 @@ void helper_msa_fsult_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ult(env, pwd, pws, pwt, df, 0);

    compare_ult(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fsle_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2291,7 +2303,7 @@ void helper_msa_fsle_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_le(env, pwd, pws, pwt, df, 0);

    compare_le(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fsule_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2300,7 +2312,7 @@ void helper_msa_fsule_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ule(env, pwd, pws, pwt, df, 0);

    compare_ule(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fcor_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2309,7 +2321,7 @@ void helper_msa_fcor_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_or(env, pwd, pws, pwt, df, 1);

    compare_or(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fcune_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2318,7 +2330,7 @@ void helper_msa_fcune_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_une(env, pwd, pws, pwt, df, 1);

    compare_une(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fcne_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2327,7 +2339,7 @@ void helper_msa_fcne_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ne(env, pwd, pws, pwt, df, 1);

    compare_ne(env, pwd, pws, pwt, df, 1, GETPC());

}



void helper_msa_fsor_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2336,7 +2348,7 @@ void helper_msa_fsor_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_or(env, pwd, pws, pwt, df, 0);

    compare_or(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fsune_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2345,7 +2357,7 @@ void helper_msa_fsune_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_une(env, pwd, pws, pwt, df, 0);

    compare_une(env, pwd, pws, pwt, df, 0, GETPC());

}



void helper_msa_fsne_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
@@ -2354,7 +2366,7 @@ void helper_msa_fsne_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
    wr_t *pwd = &(env->active_fpu.fpr[wd].wr);

    wr_t *pws = &(env->active_fpu.fpr[ws].wr);

    wr_t *pwt = &(env->active_fpu.fpr[wt].wr);

    compare_ne(env, pwd, pws, pwt, df, 0);

    compare_ne(env, pwd, pws, pwt, df, 0, GETPC());

}



#define float16_is_zero(ARG) 0
@@ -2404,7 +2416,7 @@ void helper_msa_fadd_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());

    msa_move_v(pwd, pwx);

}
@@ -2434,7 +2446,7 @@ void helper_msa_fsub_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());

    msa_move_v(pwd, pwx);

}
@@ -2464,7 +2476,7 @@ void helper_msa_fmul_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2495,7 +2507,7 @@ void helper_msa_fdiv_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2542,7 +2554,7 @@ void helper_msa_fmadd_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2577,7 +2589,7 @@ void helper_msa_fmsub_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2614,7 +2626,7 @@ void helper_msa_fexp2_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2666,7 +2678,7 @@ void helper_msa_fexdo_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());

    msa_move_v(pwd, pwx);

}
@@ -2712,7 +2724,7 @@ void helper_msa_ftq_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2791,7 +2803,7 @@ void helper_msa_fmin_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2822,7 +2834,7 @@ void helper_msa_fmin_a_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2865,7 +2877,7 @@ void helper_msa_fmax_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2896,7 +2908,7 @@ void helper_msa_fmax_a_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2958,7 +2970,7 @@ void helper_msa_ftrunc_s_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -2988,7 +3000,7 @@ void helper_msa_ftrunc_u_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3018,7 +3030,7 @@ void helper_msa_fsqrt_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3067,7 +3079,7 @@ void helper_msa_frsqrt_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3097,7 +3109,7 @@ void helper_msa_frcp_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3127,7 +3139,7 @@ void helper_msa_frint_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3181,7 +3193,7 @@ void helper_msa_flog2_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3216,7 +3228,7 @@ void helper_msa_fexupl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());

    msa_move_v(pwd, pwx);

}
@@ -3250,7 +3262,7 @@ void helper_msa_fexupr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());

    msa_move_v(pwd, pwx);

}
@@ -3331,7 +3343,7 @@ void helper_msa_ftint_s_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3361,7 +3373,7 @@ void helper_msa_ftint_u_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3397,7 +3409,7 @@ void helper_msa_ffint_s_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}
@@ -3427,7 +3439,7 @@ void helper_msa_ffint_u_df(CPUMIPSState *env, uint32_t df, uint32_t wd, 
        assert(0);

    }



    check_msacsr_cause(env);

    check_msacsr_cause(env, GETPC());



    msa_move_v(pwd, pwx);

}

target-mips/op_helper.c

+148 −115

File changed.

Preview size limit exceeded, changes collapsed.