Commit be24bb4f authored by Thiemo Seufer's avatar Thiemo Seufer
Browse files

Pass T0/T1 explicitly to helper functions, and clean up a few dyngen 

leftovers.


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

target-mips/exec.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ void dump_fpu(CPUState *env); 
void fpu_dump_state(CPUState *env, FILE *f,

                    int (*fpu_fprintf)(FILE *f, const char *fmt, ...),

                    int flags);

void dump_sc (void);



int cpu_mips_handle_mmu_fault (CPUState *env, target_ulong address, int rw,

                               int mmu_idx, int is_softmmu);

target-mips/helper.h

+150 −150
Original line number Diff line number Diff line
@@ -7,157 +7,157 @@ DEF_HELPER(void, do_raise_exception, (int excp)) 
DEF_HELPER(void, do_interrupt_restart, (void))



#ifdef TARGET_MIPS64

DEF_HELPER(void, do_ldl, (int mem_idx))

DEF_HELPER(void, do_ldr, (int mem_idx))

DEF_HELPER(void, do_sdl, (int mem_idx))

DEF_HELPER(void, do_sdr, (int mem_idx))

DEF_HELPER(target_ulong, do_ldl, (target_ulong t0, target_ulong t1, int mem_idx))

DEF_HELPER(target_ulong, do_ldr, (target_ulong t0, target_ulong t1, int mem_idx))

DEF_HELPER(void, do_sdl, (target_ulong t0, target_ulong t1, int mem_idx))

DEF_HELPER(void, do_sdr, (target_ulong t0, target_ulong t1, int mem_idx))

#endif

DEF_HELPER(void, do_lwl, (int mem_idx))

DEF_HELPER(void, do_lwr, (int mem_idx))

DEF_HELPER(void, do_swl, (int mem_idx))

DEF_HELPER(void, do_swr, (int mem_idx))

DEF_HELPER(target_ulong, do_lwl, (target_ulong t0, target_ulong t1, int mem_idx))

DEF_HELPER(target_ulong, do_lwr, (target_ulong t0, target_ulong t1, int mem_idx))

DEF_HELPER(void, do_swl, (target_ulong t0, target_ulong t1, int mem_idx))

DEF_HELPER(void, do_swr, (target_ulong t0, target_ulong t1, int mem_idx))



DEF_HELPER(void, do_clo, (void))

DEF_HELPER(void, do_clz, (void))

DEF_HELPER(target_ulong, do_clo, (target_ulong t0))

DEF_HELPER(target_ulong, do_clz, (target_ulong t0))

#ifdef TARGET_MIPS64

DEF_HELPER(void, do_dclo, (void))

DEF_HELPER(void, do_dclz, (void))

DEF_HELPER(void, do_dmult, (void))

DEF_HELPER(void, do_dmultu, (void))

DEF_HELPER(target_ulong, do_dclo, (target_ulong t0))

DEF_HELPER(target_ulong, do_dclz, (target_ulong t0))

DEF_HELPER(void, do_dmult, (target_ulong t0, target_ulong t1))

DEF_HELPER(void, do_dmultu, (target_ulong t0, target_ulong t1))

#endif



DEF_HELPER(void, do_muls, (void))

DEF_HELPER(void, do_mulsu, (void))

DEF_HELPER(void, do_macc, (void))

DEF_HELPER(void, do_maccu, (void))

DEF_HELPER(void, do_msac, (void))

DEF_HELPER(void, do_msacu, (void))

DEF_HELPER(void, do_mulhi, (void))

DEF_HELPER(void, do_mulhiu, (void))

DEF_HELPER(void, do_mulshi, (void))

DEF_HELPER(void, do_mulshiu, (void))

DEF_HELPER(void, do_macchi, (void))

DEF_HELPER(void, do_macchiu, (void))

DEF_HELPER(void, do_msachi, (void))

DEF_HELPER(void, do_msachiu, (void))

DEF_HELPER(target_ulong, do_muls, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_mulsu, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_macc, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_maccu, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_msac, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_msacu, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_mulhi, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_mulhiu, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_mulshi, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_mulshiu, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_macchi, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_macchiu, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_msachi, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_msachiu, (target_ulong t0, target_ulong t1))



/* CP0 helpers */

#ifndef CONFIG_USER_ONLY

DEF_HELPER(void, do_mfc0_mvpcontrol, (void))

DEF_HELPER(void, do_mfc0_mvpconf0, (void))

DEF_HELPER(void, do_mfc0_mvpconf1, (void))

DEF_HELPER(void, do_mfc0_random, (void))

DEF_HELPER(void, do_mfc0_tcstatus, (void))

DEF_HELPER(void, do_mftc0_tcstatus, (void))

DEF_HELPER(void, do_mfc0_tcbind, (void))

DEF_HELPER(void, do_mftc0_tcbind, (void))

DEF_HELPER(void, do_mfc0_tcrestart, (void))

DEF_HELPER(void, do_mftc0_tcrestart, (void))

DEF_HELPER(void, do_mfc0_tchalt, (void))

DEF_HELPER(void, do_mftc0_tchalt, (void))

DEF_HELPER(void, do_mfc0_tccontext, (void))

DEF_HELPER(void, do_mftc0_tccontext, (void))

DEF_HELPER(void, do_mfc0_tcschedule, (void))

DEF_HELPER(void, do_mftc0_tcschedule, (void))

DEF_HELPER(void, do_mfc0_tcschefback, (void))

DEF_HELPER(void, do_mftc0_tcschefback, (void))

DEF_HELPER(void, do_mfc0_count, (void))

DEF_HELPER(void, do_mftc0_entryhi, (void))

DEF_HELPER(void, do_mftc0_status, (void))

DEF_HELPER(void, do_mfc0_lladdr, (void))

DEF_HELPER(void, do_mfc0_watchlo, (uint32_t sel))

DEF_HELPER(void, do_mfc0_watchhi, (uint32_t sel))

DEF_HELPER(void, do_mfc0_debug, (void))

DEF_HELPER(void, do_mftc0_debug, (void))

DEF_HELPER(target_ulong, do_mfc0_mvpcontrol, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_mvpconf0, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_mvpconf1, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_random, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_tcstatus, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_tcstatus, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_tcbind, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_tcbind, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_tcrestart, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_tcrestart, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_tchalt, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_tchalt, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_tccontext, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_tccontext, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_tcschedule, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_tcschedule, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_tcschefback, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_tcschefback, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_count, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_entryhi, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_status, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_lladdr, (target_ulong t0))

DEF_HELPER(target_ulong, do_mfc0_watchlo, (target_ulong t0, uint32_t sel))

DEF_HELPER(target_ulong, do_mfc0_watchhi, (target_ulong t0, uint32_t sel))

DEF_HELPER(target_ulong, do_mfc0_debug, (target_ulong t0))

DEF_HELPER(target_ulong, do_mftc0_debug, (target_ulong t0))

#ifdef TARGET_MIPS64

DEF_HELPER(void, do_dmfc0_tcrestart, (void))

DEF_HELPER(void, do_dmfc0_tchalt, (void))

DEF_HELPER(void, do_dmfc0_tccontext, (void))

DEF_HELPER(void, do_dmfc0_tcschedule, (void))

DEF_HELPER(void, do_dmfc0_tcschefback, (void))

DEF_HELPER(void, do_dmfc0_lladdr, (void))

DEF_HELPER(void, do_dmfc0_watchlo, (uint32_t sel))

DEF_HELPER(target_ulong, do_dmfc0_tcrestart, (target_ulong t0))

DEF_HELPER(target_ulong, do_dmfc0_tchalt, (target_ulong t0))

DEF_HELPER(target_ulong, do_dmfc0_tccontext, (target_ulong t0))

DEF_HELPER(target_ulong, do_dmfc0_tcschedule, (target_ulong t0))

DEF_HELPER(target_ulong, do_dmfc0_tcschefback, (target_ulong t0))

DEF_HELPER(target_ulong, do_dmfc0_lladdr, (target_ulong t0))

DEF_HELPER(target_ulong, do_dmfc0_watchlo, (target_ulong t0, uint32_t sel))

#endif /* TARGET_MIPS64 */



DEF_HELPER(void, do_mtc0_index, (void))

DEF_HELPER(void, do_mtc0_mvpcontrol, (void))

DEF_HELPER(void, do_mtc0_vpecontrol, (void))

DEF_HELPER(void, do_mtc0_vpeconf0, (void))

DEF_HELPER(void, do_mtc0_vpeconf1, (void))

DEF_HELPER(void, do_mtc0_yqmask, (void))

DEF_HELPER(void, do_mtc0_vpeopt, (void))

DEF_HELPER(void, do_mtc0_entrylo0, (void))

DEF_HELPER(void, do_mtc0_tcstatus, (void))

DEF_HELPER(void, do_mttc0_tcstatus, (void))

DEF_HELPER(void, do_mtc0_tcbind, (void))

DEF_HELPER(void, do_mttc0_tcbind, (void))

DEF_HELPER(void, do_mtc0_tcrestart, (void))

DEF_HELPER(void, do_mttc0_tcrestart, (void))

DEF_HELPER(void, do_mtc0_tchalt, (void))

DEF_HELPER(void, do_mttc0_tchalt, (void))

DEF_HELPER(void, do_mtc0_tccontext, (void))

DEF_HELPER(void, do_mttc0_tccontext, (void))

DEF_HELPER(void, do_mtc0_tcschedule, (void))

DEF_HELPER(void, do_mttc0_tcschedule, (void))

DEF_HELPER(void, do_mtc0_tcschefback, (void))

DEF_HELPER(void, do_mttc0_tcschefback, (void))

DEF_HELPER(void, do_mtc0_entrylo1, (void))

DEF_HELPER(void, do_mtc0_context, (void))

DEF_HELPER(void, do_mtc0_pagemask, (void))

DEF_HELPER(void, do_mtc0_pagegrain, (void))

DEF_HELPER(void, do_mtc0_wired, (void))

DEF_HELPER(void, do_mtc0_srsconf0, (void))

DEF_HELPER(void, do_mtc0_srsconf1, (void))

DEF_HELPER(void, do_mtc0_srsconf2, (void))

DEF_HELPER(void, do_mtc0_srsconf3, (void))

DEF_HELPER(void, do_mtc0_srsconf4, (void))

DEF_HELPER(void, do_mtc0_hwrena, (void))

DEF_HELPER(void, do_mtc0_count, (void))

DEF_HELPER(void, do_mtc0_entryhi, (void))

DEF_HELPER(void, do_mttc0_entryhi, (void))

DEF_HELPER(void, do_mtc0_compare, (void))

DEF_HELPER(void, do_mtc0_status, (void))

DEF_HELPER(void, do_mttc0_status, (void))

DEF_HELPER(void, do_mtc0_intctl, (void))

DEF_HELPER(void, do_mtc0_srsctl, (void))

DEF_HELPER(void, do_mtc0_cause, (void))

DEF_HELPER(void, do_mtc0_ebase, (void))

DEF_HELPER(void, do_mtc0_config0, (void))

DEF_HELPER(void, do_mtc0_config2, (void))

DEF_HELPER(void, do_mtc0_watchlo, (uint32_t sel))

DEF_HELPER(void, do_mtc0_watchhi, (uint32_t sel))

DEF_HELPER(void, do_mtc0_xcontext, (void))

DEF_HELPER(void, do_mtc0_framemask, (void))

DEF_HELPER(void, do_mtc0_debug, (void))

DEF_HELPER(void, do_mttc0_debug, (void))

DEF_HELPER(void, do_mtc0_performance0, (void))

DEF_HELPER(void, do_mtc0_taglo, (void))

DEF_HELPER(void, do_mtc0_datalo, (void))

DEF_HELPER(void, do_mtc0_taghi, (void))

DEF_HELPER(void, do_mtc0_datahi, (void))

DEF_HELPER(void, do_mtc0_index, (target_ulong t0))

DEF_HELPER(void, do_mtc0_mvpcontrol, (target_ulong t0))

DEF_HELPER(void, do_mtc0_vpecontrol, (target_ulong t0))

DEF_HELPER(void, do_mtc0_vpeconf0, (target_ulong t0))

DEF_HELPER(void, do_mtc0_vpeconf1, (target_ulong t0))

DEF_HELPER(void, do_mtc0_yqmask, (target_ulong t0))

DEF_HELPER(void, do_mtc0_vpeopt, (target_ulong t0))

DEF_HELPER(void, do_mtc0_entrylo0, (target_ulong t0))

DEF_HELPER(void, do_mtc0_tcstatus, (target_ulong t0))

DEF_HELPER(void, do_mttc0_tcstatus, (target_ulong t0))

DEF_HELPER(void, do_mtc0_tcbind, (target_ulong t0))

DEF_HELPER(void, do_mttc0_tcbind, (target_ulong t0))

DEF_HELPER(void, do_mtc0_tcrestart, (target_ulong t0))

DEF_HELPER(void, do_mttc0_tcrestart, (target_ulong t0))

DEF_HELPER(void, do_mtc0_tchalt, (target_ulong t0))

DEF_HELPER(void, do_mttc0_tchalt, (target_ulong t0))

DEF_HELPER(void, do_mtc0_tccontext, (target_ulong t0))

DEF_HELPER(void, do_mttc0_tccontext, (target_ulong t0))

DEF_HELPER(void, do_mtc0_tcschedule, (target_ulong t0))

DEF_HELPER(void, do_mttc0_tcschedule, (target_ulong t0))

DEF_HELPER(void, do_mtc0_tcschefback, (target_ulong t0))

DEF_HELPER(void, do_mttc0_tcschefback, (target_ulong t0))

DEF_HELPER(void, do_mtc0_entrylo1, (target_ulong t0))

DEF_HELPER(void, do_mtc0_context, (target_ulong t0))

DEF_HELPER(void, do_mtc0_pagemask, (target_ulong t0))

DEF_HELPER(void, do_mtc0_pagegrain, (target_ulong t0))

DEF_HELPER(void, do_mtc0_wired, (target_ulong t0))

DEF_HELPER(void, do_mtc0_srsconf0, (target_ulong t0))

DEF_HELPER(void, do_mtc0_srsconf1, (target_ulong t0))

DEF_HELPER(void, do_mtc0_srsconf2, (target_ulong t0))

DEF_HELPER(void, do_mtc0_srsconf3, (target_ulong t0))

DEF_HELPER(void, do_mtc0_srsconf4, (target_ulong t0))

DEF_HELPER(void, do_mtc0_hwrena, (target_ulong t0))

DEF_HELPER(void, do_mtc0_count, (target_ulong t0))

DEF_HELPER(void, do_mtc0_entryhi, (target_ulong t0))

DEF_HELPER(void, do_mttc0_entryhi, (target_ulong t0))

DEF_HELPER(void, do_mtc0_compare, (target_ulong t0))

DEF_HELPER(void, do_mtc0_status, (target_ulong t0))

DEF_HELPER(void, do_mttc0_status, (target_ulong t0))

DEF_HELPER(void, do_mtc0_intctl, (target_ulong t0))

DEF_HELPER(void, do_mtc0_srsctl, (target_ulong t0))

DEF_HELPER(void, do_mtc0_cause, (target_ulong t0))

DEF_HELPER(void, do_mtc0_ebase, (target_ulong t0))

DEF_HELPER(void, do_mtc0_config0, (target_ulong t0))

DEF_HELPER(void, do_mtc0_config2, (target_ulong t0))

DEF_HELPER(void, do_mtc0_watchlo, (target_ulong t0, uint32_t sel))

DEF_HELPER(void, do_mtc0_watchhi, (target_ulong t0, uint32_t sel))

DEF_HELPER(void, do_mtc0_xcontext, (target_ulong t0))

DEF_HELPER(void, do_mtc0_framemask, (target_ulong t0))

DEF_HELPER(void, do_mtc0_debug, (target_ulong t0))

DEF_HELPER(void, do_mttc0_debug, (target_ulong t0))

DEF_HELPER(void, do_mtc0_performance0, (target_ulong t0))

DEF_HELPER(void, do_mtc0_taglo, (target_ulong t0))

DEF_HELPER(void, do_mtc0_datalo, (target_ulong t0))

DEF_HELPER(void, do_mtc0_taghi, (target_ulong t0))

DEF_HELPER(void, do_mtc0_datahi, (target_ulong t0))

#endif /* !CONFIG_USER_ONLY */



/* MIPS MT functions */

DEF_HELPER(void, do_mftgpr, (uint32_t sel))

DEF_HELPER(void, do_mftlo, (uint32_t sel))

DEF_HELPER(void, do_mfthi, (uint32_t sel))

DEF_HELPER(void, do_mftacx, (uint32_t sel))

DEF_HELPER(void, do_mftdsp, (void))

DEF_HELPER(void, do_mttgpr, (uint32_t sel))

DEF_HELPER(void, do_mttlo, (uint32_t sel))

DEF_HELPER(void, do_mtthi, (uint32_t sel))

DEF_HELPER(void, do_mttacx, (uint32_t sel))

DEF_HELPER(void, do_mttdsp, (void))

DEF_HELPER(void, do_dmt, (void))

DEF_HELPER(void, do_emt, (void))

DEF_HELPER(void, do_dvpe, (void))

DEF_HELPER(void, do_evpe, (void))

DEF_HELPER(void, do_fork, (void))

DEF_HELPER(void, do_yield, (void))

DEF_HELPER(target_ulong, do_mftgpr, (target_ulong t0, uint32_t sel))

DEF_HELPER(target_ulong, do_mftlo, (target_ulong t0, uint32_t sel))

DEF_HELPER(target_ulong, do_mfthi, (target_ulong t0, uint32_t sel))

DEF_HELPER(target_ulong, do_mftacx, (target_ulong t0, uint32_t sel))

DEF_HELPER(target_ulong, do_mftdsp, (target_ulong t0))

DEF_HELPER(void, do_mttgpr, (target_ulong t0, uint32_t sel))

DEF_HELPER(void, do_mttlo, (target_ulong t0, uint32_t sel))

DEF_HELPER(void, do_mtthi, (target_ulong t0, uint32_t sel))

DEF_HELPER(void, do_mttacx, (target_ulong t0, uint32_t sel))

DEF_HELPER(void, do_mttdsp, (target_ulong t0))

DEF_HELPER(target_ulong, do_dmt, (target_ulong t0))

DEF_HELPER(target_ulong, do_emt, (target_ulong t0))

DEF_HELPER(target_ulong, do_dvpe, (target_ulong t0))

DEF_HELPER(target_ulong, do_evpe, (target_ulong t0))

DEF_HELPER(target_ulong, do_fork, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_yield, (target_ulong t0))



/* CP1 functions */

DEF_HELPER(void, do_cfc1, (uint32_t reg))

DEF_HELPER(void, do_ctc1, (uint32_t reg))

DEF_HELPER(target_ulong, do_cfc1, (target_ulong t0, uint32_t reg))

DEF_HELPER(void, do_ctc1, (target_ulong t0, uint32_t reg))



DEF_HELPER(void, do_float_cvtd_s, (void))

DEF_HELPER(void, do_float_cvtd_w, (void))
@@ -239,24 +239,24 @@ FOP_PROTO(ngt) 
#undef FOP_PROTO



/* Special functions */

DEF_HELPER(void, do_di, (void))

DEF_HELPER(void, do_ei, (void))

DEF_HELPER(void, do_eret, (void))

DEF_HELPER(void, do_deret, (void))

DEF_HELPER(void, do_rdhwr_cpunum, (void))

DEF_HELPER(void, do_rdhwr_synci_step, (void))

DEF_HELPER(void, do_rdhwr_cc, (void))

DEF_HELPER(void, do_rdhwr_ccres, (void))

DEF_HELPER(target_ulong, do_di, (target_ulong t0))

DEF_HELPER(target_ulong, do_ei, (target_ulong t0))

DEF_HELPER(void, do_eret, (target_ulong t0))

DEF_HELPER(void, do_deret, (target_ulong t0))

DEF_HELPER(target_ulong, do_rdhwr_cpunum, (target_ulong t0))

DEF_HELPER(target_ulong, do_rdhwr_synci_step, (target_ulong t0))

DEF_HELPER(target_ulong, do_rdhwr_cc, (target_ulong t0))

DEF_HELPER(target_ulong, do_rdhwr_ccres, (target_ulong t0))

DEF_HELPER(void, do_pmon, (int function))

DEF_HELPER(void, do_wait, (void))



/* Bitfield operations. */

DEF_HELPER(void, do_ext, (uint32_t pos, uint32_t size))

DEF_HELPER(void, do_ins, (uint32_t pos, uint32_t size))

DEF_HELPER(void, do_wsbh, (void))

DEF_HELPER(target_ulong, do_ext, (target_ulong t0, target_ulong t1, uint32_t pos, uint32_t size))

DEF_HELPER(target_ulong, do_ins, (target_ulong t0, target_ulong t1, uint32_t pos, uint32_t size))

DEF_HELPER(target_ulong, do_wsbh, (target_ulong t0, target_ulong t1))

#ifdef TARGET_MIPS64

DEF_HELPER(void, do_dext, (uint32_t pos, uint32_t size))

DEF_HELPER(void, do_dins, (uint32_t pos, uint32_t size))

DEF_HELPER(void, do_dsbh, (void))

DEF_HELPER(void, do_dshd, (void))

DEF_HELPER(target_ulong, do_dext, (target_ulong t0, target_ulong t1, uint32_t pos, uint32_t size))

DEF_HELPER(target_ulong, do_dins, (target_ulong t0, target_ulong t1, uint32_t pos, uint32_t size))

DEF_HELPER(target_ulong, do_dsbh, (target_ulong t0, target_ulong t1))

DEF_HELPER(target_ulong, do_dshd, (target_ulong t0, target_ulong t1))

#endif

target-mips/op_helper.c

+514 −549

File changed.

Preview size limit exceeded, changes collapsed.

target-mips/translate.c

+466 −405

File changed.

Preview size limit exceeded, changes collapsed.