diff options
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/Makefile.in | 2 | ||||
| -rwxr-xr-x | sim/configure | 10 | ||||
| -rw-r--r-- | sim/mips/Makefile.in | 151 | ||||
| -rw-r--r-- | sim/mips/acinclude.m4 | 4 |
4 files changed, 2 insertions, 165 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index 889dd34..6a6487e 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1115,8 +1115,6 @@ SIM_MIPS_FPU_BITSIZE = @SIM_MIPS_FPU_BITSIZE@ SIM_MIPS_GEN = @SIM_MIPS_GEN@ SIM_MIPS_IGEN_FLAGS = @SIM_MIPS_IGEN_FLAGS@ SIM_MIPS_M16_FLAGS = @SIM_MIPS_M16_FLAGS@ -SIM_MIPS_MICROMIPS16_FLAGS = @SIM_MIPS_MICROMIPS16_FLAGS@ -SIM_MIPS_MICROMIPS_FLAGS = @SIM_MIPS_MICROMIPS_FLAGS@ SIM_MIPS_MULTI_FLAGS = @SIM_MIPS_MULTI_FLAGS@ SIM_MIPS_MULTI_IGEN_CONFIGS = @SIM_MIPS_MULTI_IGEN_CONFIGS@ SIM_MIPS_MULTI_OBJ = @SIM_MIPS_MULTI_OBJ@ diff --git a/sim/configure b/sim/configure index 34a8d59..5149c3d 100755 --- a/sim/configure +++ b/sim/configure @@ -646,8 +646,6 @@ SIM_MIPS_MULTI_SRC SIM_MIPS_MULTI_IGEN_CONFIGS SIM_MIPS_MULTI_FLAGS SIM_MIPS_GEN -SIM_MIPS_MICROMIPS16_FLAGS -SIM_MIPS_MICROMIPS_FLAGS SIM_MIPS_M16_FLAGS SIM_MIPS_IGEN_FLAGS SIM_MIPS_FPU_BITSIZE @@ -12446,7 +12444,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12449 "configure" +#line 12447 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12552,7 +12550,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12555 "configure" +#line 12553 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16607,10 +16605,6 @@ else fi SIM_MIPS_IGEN_FLAGS="-F ${sim_mips_igen_filter} ${sim_mips_igen_machine}" SIM_MIPS_M16_FLAGS="-F ${sim_mips_m16_filter} ${sim_mips_m16_machine}" -SIM_MIPS_MICROMIPS16_FLAGS="-F ${sim_mips_micromips16_filter} ${sim_mips_micromips16_machine}" -SIM_MIPS_MICROMIPS_FLAGS="-F ${sim_mips_micromips_filter} ${sim_mips_micromips_machine}" - - diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index fbf1351..3a2594b 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -5,8 +5,6 @@ SIM_MIPS_IGEN_FLAGS = @SIM_MIPS_IGEN_FLAGS@ SIM_MIPS_M16_FLAGS = @SIM_MIPS_M16_FLAGS@ -SIM_MIPS_MICROMIPS_FLAGS = @SIM_MIPS_MICROMIPS_FLAGS@ -SIM_MIPS_MICROMIPS16_FLAGS = @SIM_MIPS_MICROMIPS16_FLAGS@ SIM_MIPS_GEN = @SIM_MIPS_GEN@ SIM_MIPS_MULTI_FLAGS = @SIM_MIPS_MULTI_FLAGS@ SIM_MIPS_MULTI_IGEN_CONFIGS = @SIM_MIPS_MULTI_IGEN_CONFIGS@ @@ -42,26 +40,6 @@ SIM_M16_OBJ = \ itable.o \ m16run.o \ -SIM_MICROMIPS_OBJ = \ - micromips16_support.o \ - micromips16_semantics.o \ - micromips16_idecode.o \ - micromips16_icache.o \ - \ - micromips32_support.o \ - micromips32_semantics.o \ - micromips32_idecode.o \ - micromips32_icache.o \ - \ - micromips_m32_support.o \ - micromips_m32_semantics.o \ - micromips_m32_idecode.o \ - micromips_m32_icache.o \ - \ - itable.o \ - micromipsrun.o \ - - SIM_MULTI_OBJ = $(SIM_MIPS_MULTI_OBJ) \ itable.o \ multi-run.o \ @@ -120,7 +98,6 @@ BUILT_SRC_FROM_GEN = \ SIM_IGEN_ALL = tmp-igen SIM_M16_ALL = tmp-m16 -SIM_MICROMIPS_ALL = tmp-micromips SIM_MULTI_ALL = tmp-multi $(BUILT_SRC_FROM_GEN): $(SIM_$(SIM_MIPS_GEN)_ALL) @@ -266,133 +243,6 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) # $(SILENCE) touch $@ -BUILT_SRC_FROM_MICROMIPS = \ - micromips16_icache.h \ - micromips16_icache.c \ - micromips16_idecode.h \ - micromips16_idecode.c \ - micromips16_semantics.h \ - micromips16_semantics.c \ - micromips16_model.h \ - micromips16_model.c \ - micromips16_support.h \ - micromips16_support.c \ - \ - micromips32_icache.h \ - micromips32_icache.c \ - micromips32_idecode.h \ - micromips32_idecode.c \ - micromips32_semantics.h \ - micromips32_semantics.c \ - micromips32_model.h \ - micromips32_model.c \ - micromips32_support.h \ - micromips32_support.c \ - \ - micromips_m32_icache.h \ - micromips_m32_icache.c \ - micromips_m32_idecode.h \ - micromips_m32_idecode.c \ - micromips_m32_semantics.h \ - micromips_m32_semantics.c \ - micromips_m32_model.h \ - micromips_m32_model.c \ - micromips_m32_support.h \ - micromips_m32_support.c \ - -$(BUILT_SRC_FROM_MICROMIPS): tmp-micromips - -tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) - $(ECHO_IGEN) $(IGEN_RUN) \ - $(IGEN_TRACE) \ - -I $(srcdir) \ - -Werror \ - -Wnodiscard \ - $(SIM_MIPS_MICROMIPS16_FLAGS) \ - -G gen-direct-access \ - -G gen-zero-r0 \ - -B 16 \ - -H 15 \ - -i $(IGEN_INSN) \ - -o $(MICROMIPS16_DC) \ - -P micromips16_ \ - -x \ - -n micromips16_icache.h -hc micromips16_icache.h \ - -n micromips16_icache.c -c micromips16_icache.c \ - -n micromips16_semantics.h -hs micromips16_semantics.h \ - -n micromips16_semantics.c -s micromips16_semantics.c \ - -n micromips16_idecode.h -hd micromips16_idecode.h \ - -n micromips16_idecode.c -d micromips16_idecode.c \ - -n micromips16_model.h -hm micromips16_model.h \ - -n micromips16_model.c -m micromips16_model.c \ - -n micromips16_support.h -hf micromips16_support.h \ - -n micromips16_support.c -f micromips16_support.c \ - # - $(ECHO_IGEN) $(IGEN_RUN) \ - $(IGEN_TRACE) \ - -I $(srcdir) \ - -Werror \ - -Wnodiscard \ - $(SIM_MIPS_MICROMIPS_FLAGS) \ - -G gen-direct-access \ - -G gen-zero-r0 \ - -B 32 \ - -H 31 \ - -i $(IGEN_INSN) \ - -o $(MICROMIPS32_DC) \ - -P micromips32_ \ - -x \ - -n micromips32_icache.h -hc micromips32_icache.h \ - -n micromips32_icache.c -c micromips32_icache.c \ - -n micromips32_semantics.h -hs micromips32_semantics.h \ - -n micromips32_semantics.c -s micromips32_semantics.c \ - -n micromips32_idecode.h -hd micromips32_idecode.h \ - -n micromips32_idecode.c -d micromips32_idecode.c \ - -n micromips32_model.h -hm micromips32_model.h \ - -n micromips32_model.c -m micromips32_model.c \ - -n micromips32_support.h -hf micromips32_support.h \ - -n micromips32_support.c -f micromips32_support.c \ - # - $(ECHO_IGEN) $(IGEN_RUN) \ - $(IGEN_TRACE) \ - -I $(srcdir) \ - -Werror \ - -Wnodiscard \ - $(SIM_MIPS_IGEN_FLAGS) \ - -G gen-direct-access \ - -G gen-zero-r0 \ - -B 32 \ - -H 31 \ - -i $(IGEN_INSN) \ - -o $(IGEN_DC) \ - -P micromips_m32_ \ - -x \ - -n micromips_m32_icache.h -hc micromips_m32_icache.h \ - -n micromips_m32_icache.c -c micromips_m32_icache.c \ - -n micromips_m32_semantics.h -hs micromips_m32_semantics.h \ - -n micromips_m32_semantics.c -s micromips_m32_semantics.c \ - -n micromips_m32_idecode.h -hd micromips_m32_idecode.h \ - -n micromips_m32_idecode.c -d micromips_m32_idecode.c \ - -n micromips_m32_model.h -hm micromips_m32_model.h \ - -n micromips_m32_model.c -m micromips_m32_model.c \ - -n micromips_m32_support.h -hf micromips_m32_support.h \ - -n micromips_m32_support.c -f micromips_m32_support.c \ - # - $(ECHO_IGEN) $(IGEN_RUN) \ - $(IGEN_TRACE) \ - -I $(srcdir) \ - -Werror \ - -Wnodiscard \ - -Wnowidth \ - $(SIM_MIPS_IGEN_FLAGS) $(SIM_MIPS_MICROMIPS_FLAGS) $(SIM_MIPS_MICROMIPS16_FLAGS) \ - -G gen-direct-access \ - -G gen-zero-r0 \ - -i $(IGEN_INSN) \ - -n itable.h -ht itable.h \ - -n itable.c -t itable.c \ - # - $(SILENCE) touch $@ - BUILT_SRC_FROM_MULTI = $(SIM_MIPS_MULTI_SRC) $(BUILT_SRC_FROM_MULTI): tmp-multi @@ -500,7 +350,6 @@ clean-extra: rm -f $(BUILT_SRC_FROM_GEN) rm -f $(BUILT_SRC_FROM_IGEN) rm -f $(BUILT_SRC_FROM_M16) - rm -f $(BUILT_SRC_FROM_MICROMIPS) rm -f $(BUILT_SRC_FROM_MULTI) rm -f tmp-* rm -f micromips16*.o micromips32*.o m16*.o m32*.o itable*.o diff --git a/sim/mips/acinclude.m4 b/sim/mips/acinclude.m4 index ae5cc29..0775b32 100644 --- a/sim/mips/acinclude.m4 +++ b/sim/mips/acinclude.m4 @@ -324,12 +324,8 @@ __EOF__ ]) SIM_MIPS_IGEN_FLAGS="-F ${sim_mips_igen_filter} ${sim_mips_igen_machine}" SIM_MIPS_M16_FLAGS="-F ${sim_mips_m16_filter} ${sim_mips_m16_machine}" -SIM_MIPS_MICROMIPS16_FLAGS="-F ${sim_mips_micromips16_filter} ${sim_mips_micromips16_machine}" -SIM_MIPS_MICROMIPS_FLAGS="-F ${sim_mips_micromips_filter} ${sim_mips_micromips_machine}" AC_SUBST(SIM_MIPS_IGEN_FLAGS) AC_SUBST(SIM_MIPS_M16_FLAGS) -AC_SUBST(SIM_MIPS_MICROMIPS_FLAGS) -AC_SUBST(SIM_MIPS_MICROMIPS16_FLAGS) AC_SUBST(SIM_MIPS_GEN) AC_SUBST(SIM_MIPS_MULTI_FLAGS) AC_SUBST(SIM_MIPS_MULTI_IGEN_CONFIGS) |