Re-do load/store operations so that they work for both 32 and 64 bit

[deliverable/binutils-gdb.git] / sim / mips / configure.in

diff --git a/sim/mips/configure.in b/sim/mips/configure.in
index cef211d27196be5793f07673305292d48edd4e6d..977255380774f7f68455c2df17eb72b427a72ab5 100644 (file)
--- a/sim/mips/configure.in
+++ b/sim/mips/configure.in
@@ -23,6 +23,7 @@ case "${target}" in
 # start-sanitize-r5900
   mips64r59*-*-*)      SIMCONF="-mips3 --warnings -mcpu=r5900";;
 # end-sanitize-r5900
+  mips64vr4100-*-*) SIMCOMF="-mips0 -mcpu=r4100 -mgp64 --warnings" ;;
   mips64*-*-*)          SIMCONF="-mips0 --warnings";;
   mips16*-*-*)          SIMCONF="-mips0 --warnings";;
   mips*-*-*)            SIMCONF="-mips2 --warnings";;
@@ -65,19 +66,20 @@ SIM_AC_OPTION_ENDIAN($mips_endian,$default_endian)
 #
 # Select the bitsize of the target
 #
+mips_addr_bitsize=
 case "${target}" in
 # start-sanitize-tx19
   mipstx19*-*-*)        mips_bitsize=32 ; mips_msb=31 ;;
 # end-sanitize-tx19
 # start-sanitize-r5900
-  mips64r59*-*-*)      mips_bitsize=64 ; mips_msb=63 ;;
+  mips64r59*-*-*)      mips_bitsize=64 ; mips_msb=63 ; mips_addr_bitsize=32;;
 # end-sanitize-r5900
   mips64*-*-*)          mips_bitsize=64 ; mips_msb=63 ;;
   mips16*-*-*)          mips_bitsize=64 ; mips_msb=63 ;;
   mips*-*-*)            mips_bitsize=32 ; mips_msb=31 ;;
   *)                    mips_bitsize=64 ; mips_msb=63 ;;
 esac
-SIM_AC_OPTION_BITSIZE($mips_bitsize,$mips_msb)
+SIM_AC_OPTION_BITSIZE($mips_bitsize,$mips_msb,$mips_addr_bitsize)
 
 
 
@@ -85,19 +87,23 @@ SIM_AC_OPTION_BITSIZE($mips_bitsize,$mips_msb)
 # Select the floating hardware support of the target
 #
 mips_fpu=HARDWARE_FLOATING_POINT
+mips_fpu_bitsize=
 case "${target}" in
 # start-sanitize-tx19
   mipstx19*-*-*)        mips_fpu=SOFT_FLOATING_POINT ;;
 # end-sanitize-tx19
+  mipstx39*-*-*)       mips_fpu=HARD_FLOATING_POINT
+                       mips_fpu_bitsize=32
+                       ;;
 # start-sanitize-r5900
-  mips64r59*-*-*)       mips_fpu=HARD_FLOATING_POINT ;;
+  mips64r59*-*-*)       mips_fpu=HARD_FLOATING_POINT ; mips_fpu_bitsize=32 ;;
 # end-sanitize-r5900
   mips64*-*-*)          mips_fpu=HARD_FLOATING_POINT ;;
   mips16*-*-*)          mips_fpu=HARD_FLOATING_POINT ;;
   mips*-*-*)            mips_fpu=HARD_FLOATING_POINT ;;
   *)                    mips_fpu=HARD_FLOATING_POINT ;;
 esac
-SIM_AC_OPTION_FLOAT($mips_fpu)
+SIM_AC_OPTION_FLOAT($mips_fpu,$mips_fpu_bitsize)
 
 
 
@@ -117,7 +123,7 @@ SIM_AC_OPTION_SMP($mips_smp)
 #
 # Select the IGEN architecture
 #
-sim_use_gen=NO
+sim_use_gen=IGEN
 sim_igen_machine="-M mipsIV"
 sim_m16_machine="-M mips16"
 sim_igen_filter="32,64,f"
@@ -125,18 +131,38 @@ sim_m16_filter="16"
 case "${target}" in
 # start-sanitize-tx19
   mipstx19*-*-*)       sim_default_gen=M16
+                       #sim_use_gen=M16
+                       sim_use_gen=NO
                        sim_igen_machine="-M tx19"
                        sim_m16_machine="-M tx19"
                        sim_igen_filter="32"
                        sim_m16_filter="16"
                        ;;
 # end-sanitize-tx19
+  mipstx39*-*-*)       sim_default_gen=IGEN
+                       sim_use_gen=IGEN
+                       sim_igen_filter="32,f"
+                       sim_igen_machine="-M r3900"
+                       ;;
 # start-sanitize-r5900
   mips64r59*-*-*)      sim_default_gen=IGEN
                        sim_use_gen=IGEN
                        sim_igen_machine="-M r5900"
                        ;;
 # end-sanitize-r5900
+# start-sanitize-vr4320
+  mips64vr4320-*-*)    sim_default_gen=IGEN
+                       sim_use_gen=IGEN
+                       sim_igen_machine="-M mipsIV,vr4320 -G gen-multi-sim=vr4320"
+                       ;;
+# end-sanitize-vr4320
+  mips64vr43*-*-*)     sim_default_gen=IGEN
+                       sim_use_gen=IGEN
+                       sim_igen_machine="-M mipsIV"
+# start-sanitize-vr4320
+                       sim_igen_machine="-M mipsIV,vr4320 -G gen-multi-sim=mipsIV"
+# end-sanitize-vr4320
+                       ;;
 # start-sanitize-vr5400
   mips64vr54*-*-*)     sim_default_gen=IGEN
                        sim_use_gen=IGEN
@@ -150,6 +176,15 @@ case "${target}" in
                        sim_igen_machine="-M vr5000,vr5400 -G gen-multi-sim=vr5000"
 # end-sanitize-vr5400
                        ;;
+mips64vr4100-*-*)       echo "NOTE: mips64vr4100 still uses gencode"
+                       sim_default_gen=M16
+                        sim_igen_machine="-M tx19"
+                        sim_m16_machine="-M tx19"
+                        sim_igen_filter = "32,64,f"
+                        sim_m16_filter = "16"
+                         sim_use_gen=NO
+                        ;;
+         
   mips64*-*-*)         sim_default_gen=IGEN
                        sim_igen_filter="32,64,f"
                        sim_use_gen=IGEN
@@ -157,6 +192,7 @@ case "${target}" in
   mips16*-*-*)         sim_default_gen=M16
                        sim_igen_filter="32,64,f"
                        sim_m16_filter="16"
+                       sim_use_igen=NO
                        ;;
   mips*-*-*)           sim_default_gen=IGEN
                        sim_igen_filter="32,f"
@@ -179,7 +215,7 @@ AC_ARG_ENABLE(sim-igen,
   yes) sim_gen="${sim_default_gen}";;
   no)  sim_gen=NO;;
   16)  sim_gen=M16;;
-  *)   AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-stdio"); sim_gen="";;
+  *)   AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-igen"); sim_gen="";;
 esac
 if test x"$silent" != x"yes" && test x"$sim_gen" != x""; then
   echo "Setting sim_igen = $sim_gen" 6>&1
@@ -187,6 +223,32 @@ fi],[sim_gen="${sim_use_gen}"])dnl
 AC_SUBST(sim_gen)
 
 
+case "${target}" in
+# start-sanitize-sky
+  mips64r59*-sky-*)  mips_extra_objs='$(SIM_SKY_OBJS)' ;
+                    SIM_SUBTARGET="-DTARGET_SKY -DWITH_DEVICES=1 -DDEVICE_INIT=1";;
+
+# end-sanitize-sky
+  *)                 mips_extra_objs="" ;;
+esac
+AC_SUBST(mips_extra_objs)
+
+
+AC_PATH_X
+mips_extra_libs=""
+# start-sanitize-sky
+# Enable GPU2 library
+AC_ARG_WITH(sim-gpu2,
+[  --with-sim-gpu2=path                        Use GPU2 library under given directory],
+[if test -d "${withval}"
+then
+  SIM_SUBTARGET="${SIM_SUBTARGET} -DSKY_GPU2 -I${withval}/include"
+  mips_extra_libs="-L${withval}/lib -lgpu2 -L${x_libraries} -lX11"
+else
+  AC_MSG_ERROR("Directory ${withval} does not exist.");
+fi])dnl
+# end-sanitize-sky
+AC_SUBST(mips_extra_libs)
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h stdlib.h)
 AC_CHECK_LIB(m, fabs)