2003-04-30 Andrew Cagney <cagney@redhat.com>carlton_dictionary-20030430-merge

	* gdbarch.sh (deprecated_tm_print_insn_info): Rename
	"tm_print_insn_info".
	(TARGET_PRINT_INSN_INFO): Delete macro.
	(dis_asm_read_memory): Delete function declaration.
	(dis_asm_memory_error, dis_asm_print_address): Ditto.
	(tm_print_insn_info): Delete variable definition.
	(_initialize_gdbarch): Do not initialize "tm_print_insn_info".
	* gdbarch.h, gdbarch.c: Re-generate.
	* d10v-tdep.c (display_trace): Replace "tm_print_insn_info" with
	"deprecated_tm_print_insn_info".
	* mcore-tdep.c (mcore_dump_insn): Ditto.
	* mips-tdep.c (mips_gdbarch_init): Ditto.
	* sparc-tdep.c (_initialize_sparc_tdep): Ditto.
	* v850-tdep.c (v850_scan_prologue, v850_gdbarch_init): Ditto.
	* ia64-tdep.c (_initialize_ia64_tdep): Ditto.
	* printcmd.c (print_insn): Use "deprecated_tm_print_insn_info"
	instead of TARGET_PRINT_INSN_INFO, add comment.
	* s390-tdep.c (s390_get_frame_info): Instead of
	"dis_asm_read_memory", use "deprecated_tm_print_insn_info".
	(s390_check_function_end, s390_is_sigreturn): Ditto.
	* corefile.c (dis_asm_read_memory): Move to "disasm.c".
	(dis_asm_memory_error, dis_asm_print_address): Ditto.
	* disasm.c: Include "gdbcore.h".
	(_initialize_disasm): New function, initialize
	"deprecated_tm_print_insn_info".
	(deprecated_tm_print_insn_info): New variable.
	(dis_asm_read_memory): Moved from "corefile.c", made static.
	(dis_asm_print_address, dis_asm_memory_error): Ditto.
	* Makefile.in (disasm.o): Update dependencies.

2003-04-28  Andrew Cagney  <cagney@redhat.com>

	* gdbint.texinfo (Target Architecture Definition): Replace
	read_fp, TARGET_READ_FP and FP_REGNUM, with deprecated_read_fp,
	DEPRECATED_TARGET_READ_FP and DEPRECATED_REGNUM.

19 files changed, 134 insertions, 100 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index efeced4515c..6af65d130cc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,37 @@
 2003-04-30  Andrew Cagney  <cagney@redhat.com>
 
+	* gdbarch.sh (deprecated_tm_print_insn_info): Rename
+	"tm_print_insn_info".
+	(TARGET_PRINT_INSN_INFO): Delete macro.
+	(dis_asm_read_memory): Delete function declaration.
+	(dis_asm_memory_error, dis_asm_print_address): Ditto.
+	(tm_print_insn_info): Delete variable definition.
+	(_initialize_gdbarch): Do not initialize "tm_print_insn_info".
+	* gdbarch.h, gdbarch.c: Re-generate.
+	* d10v-tdep.c (display_trace): Replace "tm_print_insn_info" with
+	"deprecated_tm_print_insn_info".
+	* mcore-tdep.c (mcore_dump_insn): Ditto.
+	* mips-tdep.c (mips_gdbarch_init): Ditto.
+	* sparc-tdep.c (_initialize_sparc_tdep): Ditto.
+	* v850-tdep.c (v850_scan_prologue, v850_gdbarch_init): Ditto.
+	* ia64-tdep.c (_initialize_ia64_tdep): Ditto.
+	* printcmd.c (print_insn): Use "deprecated_tm_print_insn_info"
+	instead of TARGET_PRINT_INSN_INFO, add comment.
+	* s390-tdep.c (s390_get_frame_info): Instead of
+	"dis_asm_read_memory", use "deprecated_tm_print_insn_info".
+	(s390_check_function_end, s390_is_sigreturn): Ditto.
+	* corefile.c (dis_asm_read_memory): Move to "disasm.c".
+	(dis_asm_memory_error, dis_asm_print_address): Ditto.
+	* disasm.c: Include "gdbcore.h".
+	(_initialize_disasm): New function, initialize
+	"deprecated_tm_print_insn_info".
+	(deprecated_tm_print_insn_info): New variable.
+	(dis_asm_read_memory): Moved from "corefile.c", made static.
+	(dis_asm_print_address, dis_asm_memory_error): Ditto.
+	* Makefile.in (disasm.o): Update dependencies.
+
+2003-04-30  Andrew Cagney  <cagney@redhat.com>
+
 	* sparc-tdep.c (SPARC_HAS_FPU): When multi-arch, define as 1.
 
 2003-04-29  Adam Fedor  <fedor@gnu.org>
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 46c25e6ab4a..6cce6542cec 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1656,7 +1656,7 @@ demangle.o: demangle.c $(defs_h) $(command_h) $(gdbcmd_h) $(demangle_h) \
 dink32-rom.o: dink32-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \
 	$(serial_h) $(symfile_h) $(inferior_h) $(regcache_h)
 disasm.o: disasm.c $(defs_h) $(gdb_string_h) $(target_h) $(value_h) \
-	$(disasm_h) $(ui_out_h)
+	$(disasm_h) $(ui_out_h) $(gdbcore_h)
 doublest.o: doublest.c $(defs_h) $(doublest_h) $(floatformat_h) \
 	$(gdb_assert_h) $(gdb_string_h) $(gdbtypes_h)
 dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) $(gdb_string_h)
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 8a0073a83df..094a3eff0c1 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -238,28 +238,6 @@ read_memory (CORE_ADDR memaddr, char *myaddr, int len)
     memory_error (status, memaddr);
 }
 
-/* Like target_read_memory, but slightly different parameters.  */
-int
-dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len,
-		     disassemble_info *info)
-{
-  return target_read_memory (memaddr, (char *) myaddr, len);
-}
-
-/* Like memory_error with slightly different parameters.  */
-void
-dis_asm_memory_error (int status, bfd_vma memaddr, disassemble_info *info)
-{
-  memory_error (status, memaddr);
-}
-
-/* Like print_address with slightly different parameters.  */
-void
-dis_asm_print_address (bfd_vma addr, struct disassemble_info *info)
-{
-  print_address (addr, info->stream);
-}
-
 /* Argument / return result struct for use with
    do_captured_read_memory_integer().  MEMADDR and LEN are filled in
    by gdb_read_memory_integer().  RESULT is the contents that were
diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c
index 93236a350fe..69d8f3bba93 100644
--- a/gdb/d10v-tdep.c
+++ b/gdb/d10v-tdep.c
@@ -1360,7 +1360,7 @@ display_trace (int low, int high)
 	  printf_filtered ("\t");
 	  wrap_here ("    ");
 	  next_address += TARGET_PRINT_INSN (next_address,
-					     &tm_print_insn_info);
+					     &deprecated_tm_print_insn_info);
 	  printf_filtered ("\n");
 	  gdb_flush (gdb_stdout);
 	}
diff --git a/gdb/disasm.c b/gdb/disasm.c
index 511855b5901..e46025573b4 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -24,8 +24,8 @@
 #include "value.h"
 #include "ui-out.h"
 #include "gdb_string.h"
-
 #include "disasm.h"
+#include "gdbcore.h"
 
 /* Disassemble functions.
    FIXME: We should get rid of all the duplicate code in gdb that does
@@ -43,6 +43,28 @@ struct dis_line_entry
   CORE_ADDR end_pc;
 };
 
+/* Like target_read_memory, but slightly different parameters.  */
+static int
+dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len,
+		     disassemble_info *info)
+{
+  return target_read_memory (memaddr, (char *) myaddr, len);
+}
+
+/* Like memory_error with slightly different parameters.  */
+static void
+dis_asm_memory_error (int status, bfd_vma memaddr, disassemble_info *info)
+{
+  memory_error (status, memaddr);
+}
+
+/* Like print_address with slightly different parameters.  */
+static void
+dis_asm_print_address (bfd_vma addr, struct disassemble_info *info)
+{
+  print_address (addr, info->stream);
+}
+
 /* This variable determines where memory used for disassembly is read from. */
 int gdb_disassemble_from_exec = -1;
 
@@ -391,3 +413,21 @@ gdb_disassembly (struct ui_out *uiout,
 
   gdb_flush (gdb_stdout);
 }
+
+
+/* FIXME: cagney/2003-04-28: This global deprecated_tm_print_insn_info
+   is going away.  */
+disassemble_info deprecated_tm_print_insn_info;
+
+extern void _initialize_disasm (void);
+
+void
+_initialize_disasm (void)
+{
+  INIT_DISASSEMBLE_INFO_NO_ARCH (deprecated_tm_print_insn_info, gdb_stdout,
+				 (fprintf_ftype)fprintf_filtered);
+  deprecated_tm_print_insn_info.flavour = bfd_target_unknown_flavour;
+  deprecated_tm_print_insn_info.read_memory_func = dis_asm_read_memory;
+  deprecated_tm_print_insn_info.memory_error_func = dis_asm_memory_error;
+  deprecated_tm_print_insn_info.print_address_func = dis_asm_print_address;
+}
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index f773a0933c4..bda28c7d37b 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -6219,8 +6219,6 @@ gdbarch_update_p (struct gdbarch_info info)
 
 /* Pointer to the target-dependent disassembly function.  */
 int (*deprecated_tm_print_insn) (bfd_vma, disassemble_info *);
-disassemble_info tm_print_insn_info;
-
 
 extern void _initialize_gdbarch (void);
 
@@ -6229,12 +6227,6 @@ _initialize_gdbarch (void)
 {
   struct cmd_list_element *c;
 
-  INIT_DISASSEMBLE_INFO_NO_ARCH (tm_print_insn_info, gdb_stdout, (fprintf_ftype)fprintf_filtered);
-  tm_print_insn_info.flavour = bfd_target_unknown_flavour;
-  tm_print_insn_info.read_memory_func = dis_asm_read_memory;
-  tm_print_insn_info.memory_error_func = dis_asm_memory_error;
-  tm_print_insn_info.print_address_func = dis_asm_print_address;
-
   add_show_from_set (add_set_cmd ("arch",
 				  class_maintenance,
 				  var_zinteger,
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 2f02b4ff3ed..f95e70936bb 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -3381,23 +3381,11 @@ extern const struct bfd_arch_info *target_architecture;
 
 /* The target-system-dependent disassembler is semi-dynamic */
 
-extern int dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
-				unsigned int len, disassemble_info *info);
-
-extern void dis_asm_memory_error (int status, bfd_vma memaddr,
-				  disassemble_info *info);
-
-extern void dis_asm_print_address (bfd_vma addr,
-				   disassemble_info *info);
-
-/* Use set_gdbarch_print_insn instead.  */
+/* Use gdb_disassemble, and gdbarch_print_insn instead.  */
 extern int (*deprecated_tm_print_insn) (bfd_vma, disassemble_info*);
-extern disassemble_info tm_print_insn_info;
-#ifndef TARGET_PRINT_INSN_INFO
-#define TARGET_PRINT_INSN_INFO (&tm_print_insn_info)
-#endif
-
 
+/* Use set_gdbarch_print_insn instead.  */
+extern disassemble_info deprecated_tm_print_insn_info;
 
 /* Set the dynamic target-system-dependent parameters (architecture,
    byte-order, ...) using information found in the BFD */
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index f62687a29d7..9b059d2f54d 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1213,23 +1213,11 @@ extern const struct bfd_arch_info *target_architecture;
 
 /* The target-system-dependent disassembler is semi-dynamic */
 
-extern int dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
-				unsigned int len, disassemble_info *info);
-
-extern void dis_asm_memory_error (int status, bfd_vma memaddr,
-				  disassemble_info *info);
-
-extern void dis_asm_print_address (bfd_vma addr,
-				   disassemble_info *info);
-
-/* Use set_gdbarch_print_insn instead.  */
+/* Use gdb_disassemble, and gdbarch_print_insn instead.  */
 extern int (*deprecated_tm_print_insn) (bfd_vma, disassemble_info*);
-extern disassemble_info tm_print_insn_info;
-#ifndef TARGET_PRINT_INSN_INFO
-#define TARGET_PRINT_INSN_INFO (&tm_print_insn_info)
-#endif
-
 
+/* Use set_gdbarch_print_insn instead.  */
+extern disassemble_info deprecated_tm_print_insn_info;
 
 /* Set the dynamic target-system-dependent parameters (architecture,
    byte-order, ...) using information found in the BFD */
@@ -2383,8 +2371,6 @@ gdbarch_update_p (struct gdbarch_info info)
 
 /* Pointer to the target-dependent disassembly function.  */
 int (*deprecated_tm_print_insn) (bfd_vma, disassemble_info *);
-disassemble_info tm_print_insn_info;
-
 
 extern void _initialize_gdbarch (void);
 
@@ -2393,12 +2379,6 @@ _initialize_gdbarch (void)
 {
   struct cmd_list_element *c;
 
-  INIT_DISASSEMBLE_INFO_NO_ARCH (tm_print_insn_info, gdb_stdout, (fprintf_ftype)fprintf_filtered);
-  tm_print_insn_info.flavour = bfd_target_unknown_flavour;
-  tm_print_insn_info.read_memory_func = dis_asm_read_memory;
-  tm_print_insn_info.memory_error_func = dis_asm_memory_error;
-  tm_print_insn_info.print_address_func = dis_asm_print_address;
-
   add_show_from_set (add_set_cmd ("arch",
 				  class_maintenance,
 				  var_zinteger,
diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index eb39b08dd98..d2e4c682fd7 100644
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-30  Andrew Cagney  <cagney@redhat.com>
+
+	* generic/gdbtk-cmds.c (gdb_disassemble_driver): Instead of
+	TARGET_PRINT_INSN_INFO, "dis_asm_memory_error",
+	"dis_asm_read_memory", and "dis_asm_print_address", use
+	"deprecated_tm_print_insn_info"
+
 2003-04-11  Andrew Cagney  <cagney@redhat.com>
 
 	* generic/gdbtk-stack.c (get_frame_name): Use get_frame_pc and
diff --git a/gdb/gdbtk/generic/gdbtk-cmds.c b/gdb/gdbtk/generic/gdbtk-cmds.c
index 2e16c11ad21..ab3e1cc982b 100644
--- a/gdb/gdbtk/generic/gdbtk-cmds.c
+++ b/gdb/gdbtk/generic/gdbtk-cmds.c
@@ -1928,12 +1928,15 @@ gdb_disassemble_driver (CORE_ADDR low, CORE_ADDR high,
       INIT_DISASSEMBLE_INFO_NO_ARCH (di, gdb_stdout,
                                      (fprintf_ftype) fprintf_unfiltered);
       di.flavour = bfd_target_unknown_flavour;
-      di.memory_error_func = dis_asm_memory_error;
-      di.print_address_func = dis_asm_print_address;
+      /* NOTE: cagney/2003-04: This all goes away, along with this
+         function, when insight starts using the "disasm.h"
+         disassembler.  */
+      di.memory_error_func = deprecated_tm_print_insn_info.memory_error_func;
+      di.print_address_func = deprecated_tm_print_insn_info.print_address_func;
       di_initialized = 1;
     }
 
-  di.mach = TARGET_PRINT_INSN_INFO->mach;
+  di.mach = deprecated_tm_print_insn_info.mach;
   if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
     di.endian = BFD_ENDIAN_BIG;
   else
@@ -1977,7 +1980,7 @@ gdb_disassemble_driver (CORE_ADDR low, CORE_ADDR high,
   if (disassemble_from_exec)
     di.read_memory_func = gdbtk_dis_asm_read_memory;
   else
-    di.read_memory_func = dis_asm_read_memory;
+    di.read_memory_func = deprecated_tm_print_insn_info.read_memory_func;
 
   /* If just doing straight assembly, all we need to do is disassemble
      everything between low and high.  If doing mixed source/assembly, we've
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 2c5a0c07a26..7aff5b95171 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -2252,5 +2252,5 @@ _initialize_ia64_tdep (void)
   register_gdbarch_init (bfd_arch_ia64, ia64_gdbarch_init);
 
   deprecated_tm_print_insn = print_insn_ia64;
-  tm_print_insn_info.bytes_per_line = SLOT_MULTIPLIER;
+  deprecated_tm_print_insn_info.bytes_per_line = SLOT_MULTIPLIER;
 }
diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c
index d0f4189b78a..b80152b09f8 100644
--- a/gdb/mcore-tdep.c
+++ b/gdb/mcore-tdep.c
@@ -163,7 +163,7 @@ mcore_dump_insn (char *commnt, CORE_ADDR pc, int insn)
     {
       printf_filtered ("MCORE:  %s %08x %08x ",
 		       commnt, (unsigned int) pc, (unsigned int) insn);
-      TARGET_PRINT_INSN (pc, &tm_print_insn_info);
+      TARGET_PRINT_INSN (pc, &deprecated_tm_print_insn_info);
       printf_filtered ("\n");
     }
 }
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 74b72193a16..e04283cf4d2 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5543,9 +5543,9 @@ mips_gdbarch_init (struct gdbarch_info info,
 
   /* Reset the disassembly info, in case it was set to something
      non-default.  */
-  tm_print_insn_info.flavour = bfd_target_unknown_flavour;
-  tm_print_insn_info.arch = bfd_arch_unknown;
-  tm_print_insn_info.mach = 0;
+  deprecated_tm_print_insn_info.flavour = bfd_target_unknown_flavour;
+  deprecated_tm_print_insn_info.arch = bfd_arch_unknown;
+  deprecated_tm_print_insn_info.mach = 0;
 
   elf_flags = 0;
 
@@ -5626,7 +5626,7 @@ mips_gdbarch_init (struct gdbarch_info info,
   if (wanted_abi != MIPS_ABI_UNKNOWN)
     mips_abi = wanted_abi;
 
-  /* We have to set tm_print_insn_info before looking for a
+  /* We have to set deprecated_tm_print_insn_info before looking for a
      pre-existing architecture, otherwise we may return before we get
      a chance to set it up.  */
   if (mips_abi == MIPS_ABI_N32 || mips_abi == MIPS_ABI_N64)
@@ -5634,17 +5634,17 @@ mips_gdbarch_init (struct gdbarch_info info,
       /* Set up the disassembler info, so that we get the right
 	 register names from libopcodes.  */
       if (mips_abi == MIPS_ABI_N32)
-	tm_print_insn_info.disassembler_options = "gpr-names=n32";
+	deprecated_tm_print_insn_info.disassembler_options = "gpr-names=n32";
       else
-	tm_print_insn_info.disassembler_options = "gpr-names=64";
-      tm_print_insn_info.flavour = bfd_target_elf_flavour;
-      tm_print_insn_info.arch = bfd_arch_mips;
+	deprecated_tm_print_insn_info.disassembler_options = "gpr-names=64";
+      deprecated_tm_print_insn_info.flavour = bfd_target_elf_flavour;
+      deprecated_tm_print_insn_info.arch = bfd_arch_mips;
       if (info.bfd_arch_info != NULL
 	  && info.bfd_arch_info->arch == bfd_arch_mips
 	  && info.bfd_arch_info->mach)
-	tm_print_insn_info.mach = info.bfd_arch_info->mach;
+	deprecated_tm_print_insn_info.mach = info.bfd_arch_info->mach;
       else
-	tm_print_insn_info.mach = bfd_mach_mips8000;
+	deprecated_tm_print_insn_info.mach = bfd_mach_mips8000;
     }
   else
     /* This string is not recognized explicitly by the disassembler,
@@ -5652,7 +5652,7 @@ mips_gdbarch_init (struct gdbarch_info info,
        the bfd elf headers, such that, if the user overrides the ABI
        of a program linked as NewABI, the disassembly will follow the
        register naming conventions specified by the user.  */
-    tm_print_insn_info.disassembler_options = "gpr-names=32";
+    deprecated_tm_print_insn_info.disassembler_options = "gpr-names=32";
 
   if (gdbarch_debug)
     {
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index ae87bd7fd43..4f3202677bd 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -2243,21 +2243,25 @@ printf_command (char *arg, int from_tty)
 /* Print the instruction at address MEMADDR in debugged memory,
    on STREAM.  Returns length of the instruction, in bytes.  */
 
+/* FIXME: cagney/2003-04-28: Should instead be using the generic
+   disassembler but first need to clean that up and stop it trying to
+   access the exec file.  */
+
 static int
 print_insn (CORE_ADDR memaddr, struct ui_file *stream)
 {
   if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
-    TARGET_PRINT_INSN_INFO->endian = BFD_ENDIAN_BIG;
+    deprecated_tm_print_insn_info.endian = BFD_ENDIAN_BIG;
   else
-    TARGET_PRINT_INSN_INFO->endian = BFD_ENDIAN_LITTLE;
+    deprecated_tm_print_insn_info.endian = BFD_ENDIAN_LITTLE;
 
   if (TARGET_ARCHITECTURE != NULL)
-    TARGET_PRINT_INSN_INFO->mach = TARGET_ARCHITECTURE->mach;
+    deprecated_tm_print_insn_info.mach = TARGET_ARCHITECTURE->mach;
   /* else: should set .mach=0 but some disassemblers don't grok this */
 
-  TARGET_PRINT_INSN_INFO->stream = stream;
+  deprecated_tm_print_insn_info.stream = stream;
 
-  return TARGET_PRINT_INSN (memaddr, TARGET_PRINT_INSN_INFO);
+  return TARGET_PRINT_INSN (memaddr, &deprecated_tm_print_insn_info);
 }
 
 
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index b16674f09a9..f5a424de397 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -280,7 +280,7 @@ s390_get_frame_info (CORE_ADDR pc, struct frame_extra_info *fextra_info,
 
   memset (gprs_saved, 0, sizeof (gprs_saved));
   memset (fprs_saved, 0, sizeof (fprs_saved));
-  info.read_memory_func = dis_asm_read_memory;
+  info.read_memory_func = deprecated_tm_print_insn_info.read_memory_func;
 
   save_link_regidx = subtract_sp_regidx = 0;
   if (fextra_info)
@@ -682,7 +682,7 @@ s390_check_function_end (CORE_ADDR pc)
   disassemble_info info;
   int regidx, instrlen;
 
-  info.read_memory_func = dis_asm_read_memory;
+  info.read_memory_func = deprecated_tm_print_insn_info.read_memory_func;
   instrlen = s390_readinstruction (instr, pc, &info);
   if (instrlen < 0)
     return -1;
@@ -819,7 +819,7 @@ s390_is_sigreturn (CORE_ADDR pc, struct frame_info *sighandler_fi,
 
   scontext = temp_sregs = 0;
 
-  info.read_memory_func = dis_asm_read_memory;
+  info.read_memory_func = deprecated_tm_print_insn_info.read_memory_func;
   instrlen = s390_readinstruction (instr, pc, &info);
   if (sigcaller_pc)
     *sigcaller_pc = 0;
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 005b5c59db0..07c12692a3e 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -2464,7 +2464,7 @@ _initialize_sparc_tdep (void)
   gdbarch_register (bfd_arch_sparc, sparc_gdbarch_init, sparc_dump_tdep);
 
   deprecated_tm_print_insn = gdb_print_insn_sparc;
-  tm_print_insn_info.mach = TM_PRINT_INSN_MACH;		/* Selects sparc/sparclite */
+  deprecated_tm_print_insn_info.mach = TM_PRINT_INSN_MACH;		/* Selects sparc/sparclite */
   /* OBSOLETE target_architecture_hook = sparc_target_architecture_hook; */
 }
 
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 7069f965796..3de89738665 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-30  Andrew Cagney  <cagney@redhat.com>
+
+	* tuiDisassem.c (tui_disassemble): Use
+	"deprecated_tm_print_insn_info" instead of TARGET_PRINT_INSN_INFO,
+	add comment.
+
 2003-03-14  Andrew Cagney  <cagney@redhat.com>
 
 	* tuiRegs.c (_tuiGetRegisterRawValue): Use frame_read_register,
diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c
index 93d2df42dc9..eaf75df0c91 100644
--- a/gdb/tui/tuiDisassem.c
+++ b/gdb/tui/tuiDisassem.c
@@ -73,7 +73,11 @@ tui_disassemble (struct tui_asm_line* lines, CORE_ADDR pc, int count)
   /* now init the ui_file structure */
   gdb_dis_out = tui_sfileopen (256);
 
-  memcpy (&asm_info, TARGET_PRINT_INSN_INFO, sizeof (asm_info));
+  /* FIXME: cagney/2003-04-28: Should instead be using the generic
+     disassembler but first need to clean that up and stop it trying
+     to access the exec file.  */
+
+  memcpy (&asm_info, &deprecated_tm_print_insn_info, sizeof (asm_info));
   asm_info.stream = gdb_dis_out;
 
   if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index 6b9d751cf3c..a5b5fc6bf4f 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -614,7 +614,7 @@ v850_scan_prologue (CORE_ADDR pc, struct prologue_info *pi)
 
 #ifdef DEBUG
       printf_filtered ("0x%.8lx ", (long) current_pc);
-      TARGET_PRINT_INSN (current_pc, &tm_print_insn_info);
+      TARGET_PRINT_INSN (current_pc, &deprecated_tm_print_insn_info);
 #endif
 
       insn = read_memory_unsigned_integer (current_pc, 2);
@@ -1215,7 +1215,7 @@ v850_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
       if (v850_processor_type_table[i].mach == info.bfd_arch_info->mach)
 	{
 	  v850_register_names = v850_processor_type_table[i].regnames;
-	  tm_print_insn_info.mach = info.bfd_arch_info->mach;
+	  deprecated_tm_print_insn_info.mach = info.bfd_arch_info->mach;
 	  break;
 	}
     }