From 80c396f6cd52a7bd3524f85e333c8679dc7cf9fb Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Mon, 22 Dec 1997 17:22:11 +0000 Subject: [PATCH] * configure.in: Add txvu support. * configure: Regenerate. * disassemble.c: Add txvu support. --- opcodes/.Sanitize | 28 ++++++++++++++++ opcodes/ChangeLog | 8 +++++ opcodes/configure | 93 ++++++++++++++++++--------------------------------- opcodes/configure.in | 24 ++++++++----- opcodes/disassemble.c | 40 ++++++---------------- 5 files changed, 94 insertions(+), 99 deletions(-) diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize index 730aaea..d6b7ed8 100644 --- a/opcodes/.Sanitize +++ b/opcodes/.Sanitize @@ -365,6 +365,34 @@ else done fi +sky_files="ChangeLog Makefile.in Makefile.am configure.in configure disassemble.c" +if ( echo $* | grep keep\-sky > /dev/null ) ; then + for i in $sky_files ; do + if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Keeping sky stuff in $i + fi + fi + done +else + for i in $sky_files ; do + if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Removing traces of \"sky\" from $i... + fi + cp $i new + sed '/start\-sanitize\-sky/,/end-\sanitize\-sky/d' < $i > new + if [ -n "${safe}" -a ! -f .Recover/$i ] ; then + if [ -n "${verbose}" ] ; then + echo Caching $i in .Recover... + fi + mv $i .Recover + fi + mv new $i + fi + done +fi + for i in * ; do if test ! -d $i && (grep sanitize $i > /dev/null) ; then echo '***' Some mentions of Sanitize are still left in $i! 1>&2 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index e41b060..c5c4aad 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +start-sanitize-sky +Mon Dec 22 17:17:03 1997 Doug Evans + + * configure.in: Add txvu support. + * configure: Regenerate. + * disassemble.c: Add txvu support. + +end-sanitize-sky Mon Dec 22 12:37:06 1997 Ian Lance Taylor * mips-opc.c: Add FP_D to s.d instruction flags. diff --git a/opcodes/configure b/opcodes/configure index 811a944..82abeb7 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -1186,7 +1186,10 @@ if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$LD" in - "") + /*) + ac_cv_path_LD="$LD" # Let the user override the test with a path. + ;; + *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -1204,9 +1207,6 @@ else done IFS="$ac_save_ifs" ;; - *) - ac_cv_path_LD="$LD" # Let the user override the test with a path. - ;; esac fi @@ -1268,12 +1268,11 @@ LIBTOOL='$(top_builddir)/libtool' # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" - case "$enableval" in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *opcodes*) enable_shared=yes ;; - *) shared=no ;; -esac + if test "$enableval" = no; then + enable_shared=no +else + enable_shared=yes +fi fi libtool_shared= @@ -1401,7 +1400,7 @@ else #include "confdefs.h" int main() { -return __CYGWIN32__; +int main () { return __CYGWIN32__; } ; return 0; } EOF if { (eval echo configure:1407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then @@ -1420,44 +1419,13 @@ fi echo "$ac_t""$am_cv_cygwin32" 1>&6 CYGWIN32= test "$am_cv_cygwin32" = yes && CYGWIN32=yes -echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 -echo "configure:1424: checking for Mingw32 environment" >&5 -if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - am_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$am_cv_mingw32" 1>&6 -MINGW32= -test "$am_cv_mingw32" = yes && MINGW32=yes - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1455: checking for executable suffix" >&5 +echo "configure:1425: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - -if test "$CYGWIN32" = yes -o "$MINGW32" = yes; then + if test "$CYGWIN32" = yes; then am_cv_exeext=.exe else cat > am_c_test.c << 'EOF' @@ -1482,7 +1450,7 @@ echo "$ac_t""${am_cv_exeext}" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1485: checking for $ac_word" >&5 +echo "configure:1454: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1511,7 +1479,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1514: checking for $ac_word" >&5 +echo "configure:1483: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1559,7 +1527,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1562: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1531: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1569,11 +1537,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1593,12 +1561,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1565: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1601: checking whether we are using GNU C" >&5 +echo "configure:1570: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1607,7 +1575,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1622,7 +1590,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1625: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1594: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1658,7 +1626,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1661: checking how to run the C preprocessor" >&5 +echo "configure:1630: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1673,13 +1641,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1690,13 +1658,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1722,17 +1690,17 @@ for ac_hdr in string.h strings.h stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1725: checking for $ac_hdr" >&5 +echo "configure:1694: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1836,6 +1804,9 @@ if test x${all_targets} = xfalse ; then # start-sanitize-tic80 bfd_tic80_arch) ta="$ta tic80-dis.lo tic80-opc.lo" ;; # end-sanitize-tic80 +# start-sanitize-sky + bfd_txvu_arch) ta="$ta" ;; +# end-sanitize-sky bfd_v850_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; # start-sanitize-v850e bfd_v850e_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; diff --git a/opcodes/configure.in b/opcodes/configure.in index 424705f..8cb9df0 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -1,6 +1,13 @@ dnl Process this file with autoconf to produce a configure script. dnl +dnl Default to a non shared library. This may be overridden by the +dnl configure option --enable-shared. The divert stuff is a hack +dnl to set the variable before argument parsing is done. +divert(AC_DIVERSION_INIT) +enable_shared=no +divert(-1) + AC_PREREQ(2.5) AC_INIT(z8k-dis.c) @@ -8,9 +15,11 @@ AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(opcodes, 2.8.2) -dnl Default to a non shared library. This may be overridden by the -dnl configure option --enable-shared. -enable_shared=no +dnl These must be called before AM_PROG_LIBTOOL, because it may want +dnl to call AC_CHECK_PROG. +AC_CHECK_TOOL(AR, ar) +AC_CHECK_TOOL(RANLIB, ranlib, :) + AM_PROG_LIBTOOL AC_ARG_ENABLE(targets, @@ -47,8 +56,6 @@ AC_PROG_CC . ${srcdir}/../bfd/configure.host AC_SUBST(HDEFINES) -AC_CHECK_TOOL(AR, ar) -AC_CHECK_TOOL(RANLIB, ranlib, :) AM_PROG_INSTALL AC_CHECK_HEADERS(string.h strings.h stdlib.h) @@ -130,13 +137,14 @@ if test x${all_targets} = xfalse ; then # start-sanitize-tic80 bfd_tic80_arch) ta="$ta tic80-dis.lo tic80-opc.lo" ;; # end-sanitize-tic80 +# start-sanitize-sky + bfd_txvu_arch) ta="$ta" ;; +# end-sanitize-sky bfd_v850_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; # start-sanitize-v850e bfd_v850e_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; + bfd_v850ea_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; # end-sanitize-v850e -# start-sanitize-v850eq - bfd_v850eq_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; -# end-sanitize-v850eq bfd_vax_arch) ;; bfd_w65_arch) ta="$ta w65-dis.lo" ;; bfd_we32k_arch) ;; diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index 8bf16c6..a366264 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -46,6 +46,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* start-sanitize-tic80 */ #define ARCH_tic80 /* end-sanitize-tic80 */ +/* start-sanitize-sky */ +#define ARCH_txvu +/* end-sanitize-sky */ #define ARCH_v850 #define ARCH_w65 #define ARCH_z8k @@ -202,6 +205,13 @@ disassembler (abfd) break; #endif /* end-sanitize-tic80 */ +/* start-sanitize-sky */ +#ifdef ARCH_txvu_foo + case bfd_arch_txvu: + disassemble = print_insn_txvu; + break; +#endif +/* end-sanitize-sky */ #ifdef ARCH_v850 case bfd_arch_v850: disassemble = print_insn_v850; @@ -226,33 +236,3 @@ disassembler (abfd) return disassemble; } -/* Notify the disassembler of the address associated with the - instruction being decoded: */ - -void -disasm_symaddr (sym, info) - asymbol *sym; - disassemble_info *info; -{ -#ifdef ARCH_arm - /* decide if symbol is thumb or not */ - if (info->flavour == bfd_target_coff_flavour) - { -/* This is not ideal including these here, since we may not be - building a COFF targetted world at all... so coffsymbol() may not - be available. (TO BE SORTED OUT) */ -#include "coff/internal.h" -#include "libcoff.h" - coff_symbol_type *cs = coffsymbol (sym); - if ( cs->native->u.syment.n_sclass == C_THUMBEXT - || cs->native->u.syment.n_sclass == C_THUMBSTAT - || cs->native->u.syment.n_sclass == C_THUMBLABEL - || cs->native->u.syment.n_sclass == C_THUMBEXTFUNC - || cs->native->u.syment.n_sclass == C_THUMBSTATFUNC) - info->flags |= 0x1; - else - info->flags &= ~0x1; - } -#endif - /* Do nothing for other architectures at the moment */ -} -- 2.7.4