bb51b65d68
* Makefile.in (SIM_OBJS): Add sim-reg.o, cgen-run.o, sim-stop.o.
(SIM_EXTRA_DEPS): Add include/opcode/cgen.h.
(INCLUDE_DEPS): Delete cpu-sim.h, include/opcode/cgen.h.
(mloop.c): Build pseudo-basic-block version. Depend on stamp-cpu.
(stamp-decode): Delete, build decode files with other cpu files.
* arch.c,arch.h,cpuall.h: Regenerate.
* cpu.c,cpu.h,decode.c,decode.h,extract.c,model.c: Regenerate.
* sem-switch.c,sem.c: Regenerate.
* m32r-sim.h (M32R_MISC_PROFILE): New members load_regs,
load_regs_pending.
* m32r.c (m32rbf_fetch_register): Renamed from m32rb_fetch_register.
(m32rbf_store_register,m32rbf_h_cr_get,m32rbf_h_cr_set,
m32rbf_h_psw_get,m32rbf_h_psw_set,m32rbf_h_accum_get,
m32rbf_h_accum_set): Likewise.
(m32r_model_{init,update}_insn_cycles): Delete.
(m32rbf_model_insn_{before,after}): New fns.
(m32r_model_record_cti,m32r_model_record_cycles): Delete.
(m32rb_model_mark_get_h_gr,m32rb_model_mark_set_h_gr): Delete.
(m32rb_model_mark_busy_reg,m32rb_model_mark_unbusy_reg): Delete.
(check_load_stall): New fn.
(m32rbf_model_m32r_d_u_{exec,cmp,mac,cti,load,store}): New fns.
(m32rbf_model_test_u_exec): New fn.
* mloop.in: Rewrite, use pbb support.
* sim-if.c (sim_stop,sim_sync_stop,sim_resume): Delete.
(sim_fetch_register,sim_store_register): Delete.
* sim-main.h (CIA_GET,CIA_SET): Fix.
(SIM_ENGINE_HALT_HOOK,SIM_ENGINE_RESTART_HOOK): Delete.
* tconfig.in (WITH_SCACHE_PBB): Define.
(WITH_SCACHE_PBB_M32RBF): Define.
* traps.c (sim_engine_invalid_insn): Renamed from ..._illegal_....
(m32r_trap): Pass pc to sim_engine_halt.
* configure.in (SIM_AC_OPTION_SCACHE): Change 1024 to 16384.
* configure: Regenerate.
start-sanitize-m32rx
* Makefile.in (M32RX_OBJS): Delete semx.o, add extract.o.
(mloopx.c): Build pseudo-basic-block version. Depend on stamp-xcpu.
(semx.o): Delete.
(extractx.o): Add.
(stamp-xdecode): Delete, build decode files with other cpu files.
* cpux.c,cpux.h,decodex.c,decodex.h,modelx.c: Regenerate.
* readx.c: Delete.
* semx.c: Delete.
* extractx.c: New file.
* semx-switch.c: New file.
* m32r-sim.h (BRANCH_NEW_PC): Delete.
(SEM_SKIP_INSN): New macro.
* m32rx.c (m32rxf_fetch_register): Renamed from m32rx_fetch_register.
(m32rxf_store_register,m32rxf_h_cr_get,m32rxf_h_cr_set,
m32rxf_h_psw_get,m32rxf_h_psw_set,m32rxf_h_accum_get,
m32rxf_h_accum_set,m32rxf_h_accums_get,m32rxf_h_accums_set): Likewise.
(m32rxf_model_insn_{before,after}): New fns.
(m32rx_model_mark_get_h_gr,m32rx_model_mark_set_h_gr): Delete.
(m32rx_model_mark_busy_reg,m32rx_model_mark_unbusy_reg): Delete.
(check_load_stall): New fn.
(m32rxf_model_m32rx_u_{exec,cmp,mac,cti,load,store}): New fns.
* mloopx.in: Rewrite, use pbb support.
* tconfig.in (WITH_SCACHE_PBB_M32RXF): Define.
(WITH_SEM_SWITCH_FULL): Change from 0 to 1.
end-sanitize-m32rx
50 lines
1.5 KiB
Text
50 lines
1.5 KiB
Text
dnl Process this file with autoconf to produce a configure script.
|
|
sinclude(../common/aclocal.m4)
|
|
AC_PREREQ(2.5)dnl
|
|
AC_INIT(Makefile.in)
|
|
|
|
SIM_AC_COMMON
|
|
|
|
sim_link_files="${sim_link_files} m32r-sim.h ../../opcodes/m32r-opc.h"
|
|
sim_link_links="${sim_link_links} cpu-sim.h cpu-opc.h"
|
|
|
|
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
|
|
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
|
|
SIM_AC_OPTION_HOSTENDIAN
|
|
SIM_AC_OPTION_SCACHE(16384)
|
|
SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
|
|
SIM_AC_OPTION_ENVIRONMENT
|
|
|
|
cgen_maint=no
|
|
# Default is to use one in build tree.
|
|
cgen=../../cgen/cgen
|
|
cgendir='$(srcdir)/../../cgen'
|
|
# Having --enable-maintainer-mode take arguments is another way to go.
|
|
# ??? One can argue --with is more appropriate if one wants to specify
|
|
# a directory name, but what we're doing here is an enable/disable kind
|
|
# of thing and specifying both --enable and --with is klunky.
|
|
# If you reeely want this to be --with, go ahead and change it.
|
|
AC_ARG_ENABLE(cgen-maint,
|
|
[ --enable-cgen-maint[=dir] build cgen generated files],
|
|
[case "${enableval}" in
|
|
yes) cgen_maint=yes ;;
|
|
no) cgen_maint=no ;;
|
|
*)
|
|
# argument is cgen install directory (not implemented yet).
|
|
# Having a `share' directory might be more appropriate for the .scm,
|
|
# .cpu, etc. files.
|
|
cgendir=${cgen_maint}/lib/cgen
|
|
cgen=${cgendir}/bin/cgen
|
|
;;
|
|
esac])dnl
|
|
dnl AM_CONDITIONAL(CGEN_MAINT, test x${cgen_maint} != xno)
|
|
if test x${cgen_maint} != xno ; then
|
|
CGEN_MAINT=''
|
|
else
|
|
CGEN_MAINT='#'
|
|
fi
|
|
AC_SUBST(CGEN_MAINT)
|
|
AC_SUBST(cgendir)
|
|
AC_SUBST(cgen)
|
|
|
|
SIM_AC_OUTPUT
|