Switch remaining CP0 instructions to TCG or helper functions.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4708 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 0 insertions, 954 deletions

diff --git a/target-mips/op.c b/target-mips/op.c
index f09c2a4..ff5aed9 100644
--- a/target-mips/op.c
+++ b/target-mips/op.c
@@ -460,946 +460,6 @@ void op_dmultu (void)
 }
 #endif
 
-/* CP0 functions */
-void op_mfc0_mvpcontrol (void)
-{
-    T0 = env->mvp->CP0_MVPControl;
-    FORCE_RET();
-}
-
-void op_mfc0_mvpconf0 (void)
-{
-    T0 = env->mvp->CP0_MVPConf0;
-    FORCE_RET();
-}
-
-void op_mfc0_mvpconf1 (void)
-{
-    T0 = env->mvp->CP0_MVPConf1;
-    FORCE_RET();
-}
-
-void op_mfc0_random (void)
-{
-    CALL_FROM_TB0(do_mfc0_random);
-    FORCE_RET();
-}
-
-void op_mfc0_tcstatus (void)
-{
-    T0 = env->CP0_TCStatus[env->current_tc];
-    FORCE_RET();
-}
-
-void op_mftc0_tcstatus(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->CP0_TCStatus[other_tc];
-    FORCE_RET();
-}
-
-void op_mfc0_tcbind (void)
-{
-    T0 = env->CP0_TCBind[env->current_tc];
-    FORCE_RET();
-}
-
-void op_mftc0_tcbind(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->CP0_TCBind[other_tc];
-    FORCE_RET();
-}
-
-void op_mfc0_tcrestart (void)
-{
-    T0 = env->PC[env->current_tc];
-    FORCE_RET();
-}
-
-void op_mftc0_tcrestart(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->PC[other_tc];
-    FORCE_RET();
-}
-
-void op_mfc0_tchalt (void)
-{
-    T0 = env->CP0_TCHalt[env->current_tc];
-    FORCE_RET();
-}
-
-void op_mftc0_tchalt(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->CP0_TCHalt[other_tc];
-    FORCE_RET();
-}
-
-void op_mfc0_tccontext (void)
-{
-    T0 = env->CP0_TCContext[env->current_tc];
-    FORCE_RET();
-}
-
-void op_mftc0_tccontext(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->CP0_TCContext[other_tc];
-    FORCE_RET();
-}
-
-void op_mfc0_tcschedule (void)
-{
-    T0 = env->CP0_TCSchedule[env->current_tc];
-    FORCE_RET();
-}
-
-void op_mftc0_tcschedule(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->CP0_TCSchedule[other_tc];
-    FORCE_RET();
-}
-
-void op_mfc0_tcschefback (void)
-{
-    T0 = env->CP0_TCScheFBack[env->current_tc];
-    FORCE_RET();
-}
-
-void op_mftc0_tcschefback(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->CP0_TCScheFBack[other_tc];
-    FORCE_RET();
-}
-
-void op_mfc0_count (void)
-{
-    CALL_FROM_TB0(do_mfc0_count);
-    FORCE_RET();
-}
-
-void op_mftc0_entryhi(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = (env->CP0_EntryHi & ~0xff) | (env->CP0_TCStatus[other_tc] & 0xff);
-    FORCE_RET();
-}
-
-void op_mftc0_status(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-    uint32_t tcstatus = env->CP0_TCStatus[other_tc];
-
-    T0 = env->CP0_Status & ~0xf1000018;
-    T0 |= tcstatus & (0xf << CP0TCSt_TCU0);
-    T0 |= (tcstatus & (1 << CP0TCSt_TMX)) >> (CP0TCSt_TMX - CP0St_MX);
-    T0 |= (tcstatus & (0x3 << CP0TCSt_TKSU)) >> (CP0TCSt_TKSU - CP0St_KSU);
-    FORCE_RET();
-}
-
-void op_mfc0_lladdr (void)
-{
-    T0 = (int32_t)env->CP0_LLAddr >> 4;
-    FORCE_RET();
-}
-
-void op_mfc0_watchlo (void)
-{
-    T0 = (int32_t)env->CP0_WatchLo[PARAM1];
-    FORCE_RET();
-}
-
-void op_mfc0_watchhi (void)
-{
-    T0 = env->CP0_WatchHi[PARAM1];
-    FORCE_RET();
-}
-
-void op_mfc0_debug (void)
-{
-    T0 = env->CP0_Debug;
-    if (env->hflags & MIPS_HFLAG_DM)
-        T0 |= 1 << CP0DB_DM;
-    FORCE_RET();
-}
-
-void op_mftc0_debug(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    /* XXX: Might be wrong, check with EJTAG spec. */
-    T0 = (env->CP0_Debug & ~((1 << CP0DB_SSt) | (1 << CP0DB_Halt))) |
-         (env->CP0_Debug_tcstatus[other_tc] &
-          ((1 << CP0DB_SSt) | (1 << CP0DB_Halt)));
-    FORCE_RET();
-}
-
-void op_mtc0_index (void)
-{
-    int num = 1;
-    unsigned int tmp = env->tlb->nb_tlb;
-
-    do {
-        tmp >>= 1;
-        num <<= 1;
-    } while (tmp);
-    env->CP0_Index = (env->CP0_Index & 0x80000000) | (T0 & (num - 1));
-    FORCE_RET();
-}
-
-void op_mtc0_mvpcontrol (void)
-{
-    uint32_t mask = 0;
-    uint32_t newval;
-
-    if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP))
-        mask |= (1 << CP0MVPCo_CPA) | (1 << CP0MVPCo_VPC) |
-                (1 << CP0MVPCo_EVP);
-    if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC))
-        mask |= (1 << CP0MVPCo_STLB);
-    newval = (env->mvp->CP0_MVPControl & ~mask) | (T0 & mask);
-
-    // TODO: Enable/disable shared TLB, enable/disable VPEs.
-
-    env->mvp->CP0_MVPControl = newval;
-    FORCE_RET();
-}
-
-void op_mtc0_vpecontrol (void)
-{
-    uint32_t mask;
-    uint32_t newval;
-
-    mask = (1 << CP0VPECo_YSI) | (1 << CP0VPECo_GSI) |
-           (1 << CP0VPECo_TE) | (0xff << CP0VPECo_TargTC);
-    newval = (env->CP0_VPEControl & ~mask) | (T0 & mask);
-
-    /* Yield scheduler intercept not implemented. */
-    /* Gating storage scheduler intercept not implemented. */
-
-    // TODO: Enable/disable TCs.
-
-    env->CP0_VPEControl = newval;
-    FORCE_RET();
-}
-
-void op_mtc0_vpeconf0 (void)
-{
-    uint32_t mask = 0;
-    uint32_t newval;
-
-    if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) {
-        if (env->CP0_VPEConf0 & (1 << CP0VPEC0_VPA))
-            mask |= (0xff << CP0VPEC0_XTC);
-        mask |= (1 << CP0VPEC0_MVP) | (1 << CP0VPEC0_VPA);
-    }
-    newval = (env->CP0_VPEConf0 & ~mask) | (T0 & mask);
-
-    // TODO: TC exclusive handling due to ERL/EXL.
-
-    env->CP0_VPEConf0 = newval;
-    FORCE_RET();
-}
-
-void op_mtc0_vpeconf1 (void)
-{
-    uint32_t mask = 0;
-    uint32_t newval;
-
-    if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC))
-        mask |= (0xff << CP0VPEC1_NCX) | (0xff << CP0VPEC1_NCP2) |
-                (0xff << CP0VPEC1_NCP1);
-    newval = (env->CP0_VPEConf1 & ~mask) | (T0 & mask);
-
-    /* UDI not implemented. */
-    /* CP2 not implemented. */
-
-    // TODO: Handle FPU (CP1) binding.
-
-    env->CP0_VPEConf1 = newval;
-    FORCE_RET();
-}
-
-void op_mtc0_yqmask (void)
-{
-    /* Yield qualifier inputs not implemented. */
-    env->CP0_YQMask = 0x00000000;
-    FORCE_RET();
-}
-
-void op_mtc0_vpeschedule (void)
-{
-    env->CP0_VPESchedule = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_vpeschefback (void)
-{
-    env->CP0_VPEScheFBack = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_vpeopt (void)
-{
-    env->CP0_VPEOpt = T0 & 0x0000ffff;
-    FORCE_RET();
-}
-
-void op_mtc0_entrylo0 (void)
-{
-    /* Large physaddr (PABITS) not implemented */
-    /* 1k pages not implemented */
-    env->CP0_EntryLo0 = T0 & 0x3FFFFFFF;
-    FORCE_RET();
-}
-
-void op_mtc0_tcstatus (void)
-{
-    uint32_t mask = env->CP0_TCStatus_rw_bitmask;
-    uint32_t newval;
-
-    newval = (env->CP0_TCStatus[env->current_tc] & ~mask) | (T0 & mask);
-
-    // TODO: Sync with CP0_Status.
-
-    env->CP0_TCStatus[env->current_tc] = newval;
-    FORCE_RET();
-}
-
-void op_mttc0_tcstatus (void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    // TODO: Sync with CP0_Status.
-
-    env->CP0_TCStatus[other_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_tcbind (void)
-{
-    uint32_t mask = (1 << CP0TCBd_TBE);
-    uint32_t newval;
-
-    if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC))
-        mask |= (1 << CP0TCBd_CurVPE);
-    newval = (env->CP0_TCBind[env->current_tc] & ~mask) | (T0 & mask);
-    env->CP0_TCBind[env->current_tc] = newval;
-    FORCE_RET();
-}
-
-void op_mttc0_tcbind (void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-    uint32_t mask = (1 << CP0TCBd_TBE);
-    uint32_t newval;
-
-    if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC))
-        mask |= (1 << CP0TCBd_CurVPE);
-    newval = (env->CP0_TCBind[other_tc] & ~mask) | (T0 & mask);
-    env->CP0_TCBind[other_tc] = newval;
-    FORCE_RET();
-}
-
-void op_mtc0_tcrestart (void)
-{
-    env->PC[env->current_tc] = T0;
-    env->CP0_TCStatus[env->current_tc] &= ~(1 << CP0TCSt_TDS);
-    env->CP0_LLAddr = 0ULL;
-    /* MIPS16 not implemented. */
-    FORCE_RET();
-}
-
-void op_mttc0_tcrestart (void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    env->PC[other_tc] = T0;
-    env->CP0_TCStatus[other_tc] &= ~(1 << CP0TCSt_TDS);
-    env->CP0_LLAddr = 0ULL;
-    /* MIPS16 not implemented. */
-    FORCE_RET();
-}
-
-void op_mtc0_tchalt (void)
-{
-    env->CP0_TCHalt[env->current_tc] = T0 & 0x1;
-
-    // TODO: Halt TC / Restart (if allocated+active) TC.
-
-    FORCE_RET();
-}
-
-void op_mttc0_tchalt (void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    // TODO: Halt TC / Restart (if allocated+active) TC.
-
-    env->CP0_TCHalt[other_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_tccontext (void)
-{
-    env->CP0_TCContext[env->current_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mttc0_tccontext (void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    env->CP0_TCContext[other_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_tcschedule (void)
-{
-    env->CP0_TCSchedule[env->current_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mttc0_tcschedule (void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    env->CP0_TCSchedule[other_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_tcschefback (void)
-{
-    env->CP0_TCScheFBack[env->current_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mttc0_tcschefback (void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    env->CP0_TCScheFBack[other_tc] = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_entrylo1 (void)
-{
-    /* Large physaddr (PABITS) not implemented */
-    /* 1k pages not implemented */
-    env->CP0_EntryLo1 = T0 & 0x3FFFFFFF;
-    FORCE_RET();
-}
-
-void op_mtc0_context (void)
-{
-    env->CP0_Context = (env->CP0_Context & 0x007FFFFF) | (T0 & ~0x007FFFFF);
-    FORCE_RET();
-}
-
-void op_mtc0_pagemask (void)
-{
-    /* 1k pages not implemented */
-    env->CP0_PageMask = T0 & (0x1FFFFFFF & (TARGET_PAGE_MASK << 1));
-    FORCE_RET();
-}
-
-void op_mtc0_pagegrain (void)
-{
-    /* SmartMIPS not implemented */
-    /* Large physaddr (PABITS) not implemented */
-    /* 1k pages not implemented */
-    env->CP0_PageGrain = 0;
-    FORCE_RET();
-}
-
-void op_mtc0_wired (void)
-{
-    env->CP0_Wired = T0 % env->tlb->nb_tlb;
-    FORCE_RET();
-}
-
-void op_mtc0_srsconf0 (void)
-{
-    env->CP0_SRSConf0 |= T0 & env->CP0_SRSConf0_rw_bitmask;
-    FORCE_RET();
-}
-
-void op_mtc0_srsconf1 (void)
-{
-    env->CP0_SRSConf1 |= T0 & env->CP0_SRSConf1_rw_bitmask;
-    FORCE_RET();
-}
-
-void op_mtc0_srsconf2 (void)
-{
-    env->CP0_SRSConf2 |= T0 & env->CP0_SRSConf2_rw_bitmask;
-    FORCE_RET();
-}
-
-void op_mtc0_srsconf3 (void)
-{
-    env->CP0_SRSConf3 |= T0 & env->CP0_SRSConf3_rw_bitmask;
-    FORCE_RET();
-}
-
-void op_mtc0_srsconf4 (void)
-{
-    env->CP0_SRSConf4 |= T0 & env->CP0_SRSConf4_rw_bitmask;
-    FORCE_RET();
-}
-
-void op_mtc0_hwrena (void)
-{
-    env->CP0_HWREna = T0 & 0x0000000F;
-    FORCE_RET();
-}
-
-void op_mtc0_count (void)
-{
-    CALL_FROM_TB2(cpu_mips_store_count, env, T0);
-    FORCE_RET();
-}
-
-void op_mtc0_entryhi (void)
-{
-    target_ulong old, val;
-
-    /* 1k pages not implemented */
-    val = T0 & ((TARGET_PAGE_MASK << 1) | 0xFF);
-#if defined(TARGET_MIPS64)
-    val &= env->SEGMask;
-#endif
-    old = env->CP0_EntryHi;
-    env->CP0_EntryHi = val;
-    if (env->CP0_Config3 & (1 << CP0C3_MT)) {
-        uint32_t tcst = env->CP0_TCStatus[env->current_tc] & ~0xff;
-        env->CP0_TCStatus[env->current_tc] = tcst | (val & 0xff);
-    }
-    /* If the ASID changes, flush qemu's TLB.  */
-    if ((old & 0xFF) != (val & 0xFF))
-        CALL_FROM_TB2(cpu_mips_tlb_flush, env, 1);
-    FORCE_RET();
-}
-
-void op_mttc0_entryhi(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    env->CP0_EntryHi = (env->CP0_EntryHi & 0xff) | (T0 & ~0xff);
-    env->CP0_TCStatus[other_tc] = (env->CP0_TCStatus[other_tc] & ~0xff) | (T0 & 0xff);
-    FORCE_RET();
-}
-
-void op_mtc0_compare (void)
-{
-    CALL_FROM_TB2(cpu_mips_store_compare, env, T0);
-    FORCE_RET();
-}
-
-void op_mtc0_status (void)
-{
-    uint32_t val, old;
-    uint32_t mask = env->CP0_Status_rw_bitmask;
-
-    val = T0 & mask;
-    old = env->CP0_Status;
-    env->CP0_Status = (env->CP0_Status & ~mask) | val;
-    CALL_FROM_TB1(compute_hflags, env);
-    if (loglevel & CPU_LOG_EXEC)
-        CALL_FROM_TB2(do_mtc0_status_debug, old, val);
-    CALL_FROM_TB1(cpu_mips_update_irq, env);
-    FORCE_RET();
-}
-
-void op_mttc0_status(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-    uint32_t tcstatus = env->CP0_TCStatus[other_tc];
-
-    env->CP0_Status = T0 & ~0xf1000018;
-    tcstatus = (tcstatus & ~(0xf << CP0TCSt_TCU0)) | (T0 & (0xf << CP0St_CU0));
-    tcstatus = (tcstatus & ~(1 << CP0TCSt_TMX)) | ((T0 & (1 << CP0St_MX)) << (CP0TCSt_TMX - CP0St_MX));
-    tcstatus = (tcstatus & ~(0x3 << CP0TCSt_TKSU)) | ((T0 & (0x3 << CP0St_KSU)) << (CP0TCSt_TKSU - CP0St_KSU));
-    env->CP0_TCStatus[other_tc] = tcstatus;
-    FORCE_RET();
-}
-
-void op_mtc0_intctl (void)
-{
-    /* vectored interrupts not implemented, no performance counters. */
-    env->CP0_IntCtl = (env->CP0_IntCtl & ~0x000002e0) | (T0 & 0x000002e0);
-    FORCE_RET();
-}
-
-void op_mtc0_srsctl (void)
-{
-    uint32_t mask = (0xf << CP0SRSCtl_ESS) | (0xf << CP0SRSCtl_PSS);
-    env->CP0_SRSCtl = (env->CP0_SRSCtl & ~mask) | (T0 & mask);
-    FORCE_RET();
-}
-
-void op_mtc0_srsmap (void)
-{
-    env->CP0_SRSMap = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_cause (void)
-{
-    uint32_t mask = 0x00C00300;
-    uint32_t old = env->CP0_Cause;
-
-    if (env->insn_flags & ISA_MIPS32R2)
-        mask |= 1 << CP0Ca_DC;
-
-    env->CP0_Cause = (env->CP0_Cause & ~mask) | (T0 & mask);
-
-    if ((old ^ env->CP0_Cause) & (1 << CP0Ca_DC)) {
-        if (env->CP0_Cause & (1 << CP0Ca_DC))
-            CALL_FROM_TB1(cpu_mips_stop_count, env);
-        else
-            CALL_FROM_TB1(cpu_mips_start_count, env);
-    }
-
-    /* Handle the software interrupt as an hardware one, as they
-       are very similar */
-    if (T0 & CP0Ca_IP_mask) {
-        CALL_FROM_TB1(cpu_mips_update_irq, env);
-    }
-    FORCE_RET();
-}
-
-void op_mtc0_epc (void)
-{
-    env->CP0_EPC = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_ebase (void)
-{
-    /* vectored interrupts not implemented */
-    /* Multi-CPU not implemented */
-    env->CP0_EBase = 0x80000000 | (T0 & 0x3FFFF000);
-    FORCE_RET();
-}
-
-void op_mtc0_config0 (void)
-{
-    env->CP0_Config0 = (env->CP0_Config0 & 0x81FFFFF8) | (T0 & 0x00000007);
-    FORCE_RET();
-}
-
-void op_mtc0_config2 (void)
-{
-    /* tertiary/secondary caches not implemented */
-    env->CP0_Config2 = (env->CP0_Config2 & 0x8FFF0FFF);
-    FORCE_RET();
-}
-
-void op_mtc0_watchlo (void)
-{
-    /* Watch exceptions for instructions, data loads, data stores
-       not implemented. */
-    env->CP0_WatchLo[PARAM1] = (T0 & ~0x7);
-    FORCE_RET();
-}
-
-void op_mtc0_watchhi (void)
-{
-    env->CP0_WatchHi[PARAM1] = (T0 & 0x40FF0FF8);
-    env->CP0_WatchHi[PARAM1] &= ~(env->CP0_WatchHi[PARAM1] & T0 & 0x7);
-    FORCE_RET();
-}
-
-void op_mtc0_xcontext (void)
-{
-    target_ulong mask = (1ULL << (env->SEGBITS - 7)) - 1;
-    env->CP0_XContext = (env->CP0_XContext & mask) | (T0 & ~mask);
-    FORCE_RET();
-}
-
-void op_mtc0_framemask (void)
-{
-    env->CP0_Framemask = T0; /* XXX */
-    FORCE_RET();
-}
-
-void op_mtc0_debug (void)
-{
-    env->CP0_Debug = (env->CP0_Debug & 0x8C03FC1F) | (T0 & 0x13300120);
-    if (T0 & (1 << CP0DB_DM))
-        env->hflags |= MIPS_HFLAG_DM;
-    else
-        env->hflags &= ~MIPS_HFLAG_DM;
-    FORCE_RET();
-}
-
-void op_mttc0_debug(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    /* XXX: Might be wrong, check with EJTAG spec. */
-    env->CP0_Debug_tcstatus[other_tc] = T0 & ((1 << CP0DB_SSt) | (1 << CP0DB_Halt));
-    env->CP0_Debug = (env->CP0_Debug & ((1 << CP0DB_SSt) | (1 << CP0DB_Halt))) |
-                     (T0 & ~((1 << CP0DB_SSt) | (1 << CP0DB_Halt)));
-    FORCE_RET();
-}
-
-void op_mtc0_depc (void)
-{
-    env->CP0_DEPC = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_performance0 (void)
-{
-    env->CP0_Performance0 = T0 & 0x000007ff;
-    FORCE_RET();
-}
-
-void op_mtc0_taglo (void)
-{
-    env->CP0_TagLo = T0 & 0xFFFFFCF6;
-    FORCE_RET();
-}
-
-void op_mtc0_datalo (void)
-{
-    env->CP0_DataLo = T0; /* XXX */
-    FORCE_RET();
-}
-
-void op_mtc0_taghi (void)
-{
-    env->CP0_TagHi = T0; /* XXX */
-    FORCE_RET();
-}
-
-void op_mtc0_datahi (void)
-{
-    env->CP0_DataHi = T0; /* XXX */
-    FORCE_RET();
-}
-
-void op_mtc0_errorepc (void)
-{
-    env->CP0_ErrorEPC = T0;
-    FORCE_RET();
-}
-
-void op_mtc0_desave (void)
-{
-    env->CP0_DESAVE = T0;
-    FORCE_RET();
-}
-
-#if defined(TARGET_MIPS64)
-void op_dmfc0_tcrestart (void)
-{
-    T0 = env->PC[env->current_tc];
-    FORCE_RET();
-}
-
-void op_dmfc0_tchalt (void)
-{
-    T0 = env->CP0_TCHalt[env->current_tc];
-    FORCE_RET();
-}
-
-void op_dmfc0_tccontext (void)
-{
-    T0 = env->CP0_TCContext[env->current_tc];
-    FORCE_RET();
-}
-
-void op_dmfc0_tcschedule (void)
-{
-    T0 = env->CP0_TCSchedule[env->current_tc];
-    FORCE_RET();
-}
-
-void op_dmfc0_tcschefback (void)
-{
-    T0 = env->CP0_TCScheFBack[env->current_tc];
-    FORCE_RET();
-}
-
-void op_dmfc0_lladdr (void)
-{
-    T0 = env->CP0_LLAddr >> 4;
-    FORCE_RET();
-}
-
-void op_dmfc0_watchlo (void)
-{
-    T0 = env->CP0_WatchLo[PARAM1];
-    FORCE_RET();
-}
-#endif /* TARGET_MIPS64 */
-
-/* MIPS MT functions */
-void op_mftgpr(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->gpr[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mftlo(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->LO[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mfthi(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->HI[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mftacx(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->ACX[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mftdsp(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->DSPControl[other_tc];
-    FORCE_RET();
-}
-
-void op_mttgpr(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->gpr[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mttlo(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->LO[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mtthi(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->HI[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mttacx(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->ACX[other_tc][PARAM1];
-    FORCE_RET();
-}
-
-void op_mttdsp(void)
-{
-    int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC);
-
-    T0 = env->DSPControl[other_tc];
-    FORCE_RET();
-}
-
-
-void op_dmt(void)
-{
-    // TODO
-    T0 = 0;
-    // rt = T0
-    FORCE_RET();
-}
-
-void op_emt(void)
-{
-    // TODO
-    T0 = 0;
-    // rt = T0
-    FORCE_RET();
-}
-
-void op_dvpe(void)
-{
-    // TODO
-    T0 = 0;
-    // rt = T0
-    FORCE_RET();
-}
-
-void op_evpe(void)
-{
-    // TODO
-    T0 = 0;
-    // rt = T0
-    FORCE_RET();
-}
-
-void op_fork(void)
-{
-    // T0 = rt, T1 = rs
-    T0 = 0;
-    // TODO: store to TC register
-    FORCE_RET();
-}
-
-void op_yield(void)
-{
-    if (T0 < 0) {
-        /* No scheduling policy implemented. */
-        if (T0 != -2) {
-            if (env->CP0_VPEControl & (1 << CP0VPECo_YSI) &&
-                env->CP0_TCStatus[env->current_tc] & (1 << CP0TCSt_DT)) {
-                env->CP0_VPEControl &= ~(0x7 << CP0VPECo_EXCPT);
-                env->CP0_VPEControl |= 4 << CP0VPECo_EXCPT;
-                CALL_FROM_TB1(do_raise_exception, EXCP_THREAD);
-            }
-        }
-    } else if (T0 == 0) {
-	if (0 /* TODO: TC underflow */) {
-            env->CP0_VPEControl &= ~(0x7 << CP0VPECo_EXCPT);
-            CALL_FROM_TB1(do_raise_exception, EXCP_THREAD);
-        } else {
-            // TODO: Deallocate TC
-        }
-    } else if (T0 > 0) {
-        /* Yield qualifier inputs not implemented. */
-        env->CP0_VPEControl &= ~(0x7 << CP0VPECo_EXCPT);
-        env->CP0_VPEControl |= 2 << CP0VPECo_EXCPT;
-        CALL_FROM_TB1(do_raise_exception, EXCP_THREAD);
-    }
-    T0 = env->CP0_YQMask;
-    FORCE_RET();
-}
-
 /* CP1 functions */
 #if 0
 # define DEBUG_FPU_STATE() CALL_FROM_TB1(dump_fpu, env)
@@ -1407,20 +467,6 @@ void op_yield(void)
 # define DEBUG_FPU_STATE() do { } while(0)
 #endif
 
-void op_cfc1 (void)
-{
-    CALL_FROM_TB1(do_cfc1, PARAM1);
-    DEBUG_FPU_STATE();
-    FORCE_RET();
-}
-
-void op_ctc1 (void)
-{
-    CALL_FROM_TB1(do_ctc1, PARAM1);
-    DEBUG_FPU_STATE();
-    FORCE_RET();
-}
-
 void op_mfc1 (void)
 {
     T0 = (int32_t)WT0;