* disasm.h (gdb_disassembly): Add GDBARCH parameter.

	(gdb_print_insn): Likewise.
	* disasm.c (dump_insns): Add GDBARCH parameter.  Use it instead
	of current_gdbarch.
	(do_mixed_source_and_assembly): Add GDBARCH parameter.  Pass to
	dump_insns.
	(do_assembly_only): Likewise.
	(gdb_disassembly): Add GDBARCH parameter.  Use it instead of
	current_gdbarch.  Pass to subroutines.
	(gdb_print_insn): Add GDBARCH parameter.  Use it instead of
	current_gdbarch.

	* stack.c (struct gdb_disassembly_stub_args): Add GDBARCH member.
	(gdb_disassembly_stub): Pass architecture to gdb_disassembly.
	(do_gdb_disassembly): Add GDBARCH argument.  Store into args.
	(print_frame_info): Pass architecture to do_gdb_disassembly.

	* printcmd.c (print_formatted): Pass architecture to gdb_print_insn.

	* mi/mi-cmd-disas.c: Include "arch-utils.h"
	(mi_cmd_disassemble): Pass architecture to gdb_disassembly.

	* cli/cli-cmds.c: Include "arch-utils.h".
	(print_disassembly): Add GDBARCH parameter.  Pass to gdb_disassembly
	and tui_show_assembly.
	(disassemble_current_function): Pass architecture to
	tui_get_low_disassembly_address and print_disassembly.
	(disassemble_command): Pass architecture to
	tui_get_low_disassembly_address and print_disassembly.

	* tui/tui.c (tui_show_assembly): Add GDBARCH parameter.  Pass to
	tui_update_source_windows_with_addr.

	* tui/tui-data.h (struct tui_locator_element): Add GDBARCH member.
	(struct tui_source_info): Likewise.
	* tui/tui-data.c (tui_clear_win_detail): Clear source_info.gdbarch.

	* tui/tui-disasm.c (tui_disassemble): Add GDBARCH parameter.
	Pass to gdb_print_insn.
	(tui_find_disassembly_address): Add GDBARCH parameter.  Pass to
	tui_disassemble.
	(tui_set_disassem_content): Add GDBARCH parameter.  Install into
	source_info.gdbarch.  Pass to tui_disassemble.
	(tui_show_disassem): Add GDBARCH parameter.  Pass to
	tui_update_source_window.
	(tui_show_disassem_and_update_source): Add GDBARCH parameter.  Pass to
	tui_show_disassem and tui_update_source_window.

	(tui_get_begin_asm_address): Return locator architecture in addition
	to locator PC value.

	(tui_get_low_disassembly_address): Add GDBARCH parameter.   Pass to
	tui_get_low_disassembly_address.

	(tui_vertical_disassem_scroll): Pass architecture to subroutines.

	* tui/tui-disasm.h (tui_set_disassem_content): Add GDBARCH parameter.
	(tui_show_disassem): Likewise.
	(tui_show_disassem_and_update_source): Likewise.
	(tui_get_begin_asm_address): Return architecture and PC value.

	* tui/tui.h (tui_get_low_disassembly_address): Add GDBARCH parameter.
	(tui_show_assembly): Add GDBARCH parameter.

	* tui/tui-layout.c (extract_display_start_addr): Return current window
	architecture in addition to current PC value.

	(tui_set_layout): Update calls to tui_get_low_disassembly_address and
	extract_display_start_addr.  Pass architecture to
	tui_update_source_windows_with_addr.

	* tui/tui-source.c: Include "objfiles.h".
	(tui_set_source_content): Initialize window architecture.
	(tui_show_symtab_source): Add GDBARCH parameter.  Pass to
	tui_update_source_window_as_is

	* tui/tui-source.h (tui_show_symtab_source): Add GDBARCH parameter.

	* tui/tui-stack.c (tui_set_locator_info): Add GDBARCH parameter.
	Install locator architecture.
	(tui_set_locator_filename): Update call.
	(tui_show_frame_info): Pass architecture to tui_set_locator_info
	and subroutines.

	* tui/tui-win.c (make_visible_with_new_height): Pass architecture
	to tui_update_source_window.

	* tui/tui-winsource.c: Include "objfiles.h".
	(tui_display_main): Update call to tui_get_begin_asm_address.
	Pass architecture to tui_update_source_windows_with_addr.
	(tui_update_source_window): Add GDBARCH parameter.  Pass to
	tui_update_source_window_as_is.
	(tui_update_source_window_as_is): Add GDBARCH parameter.
	Pass to tui_set_disassem_content.
	(tui_update_source_windows_with_addr): Add GDBARCH parameter.
	Pass to subroutines.
	(tui_update_source_windows_with_line): Pass objfile architecture
	to subroutines.
	(tui_horizontal_source_scroll): Pass architecture to
	tui_update_source_window_as_is.

	* tui/tui-winsource.h (tui_update_source_window): Add GDBARCH
	parameter.
	(tui_update_source_window_as_is): Likewise.
	(tui_update_source_windows_with_addr): Likewise.

1 files changed, 15 insertions, 8 deletions

diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index ccc9b9f..00e091d 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -48,7 +48,8 @@ static char *tui_get_function_from_frame (struct frame_info *fi);
 static void tui_set_locator_filename (const char *filename);
 
 /* Update the locator, with the provided arguments.  */
-static void tui_set_locator_info (const char *filename,
+static void tui_set_locator_info (struct gdbarch *gdbarch,
+				  const char *filename,
 				  const char *procname,
                                   int lineno, CORE_ADDR addr);
 
@@ -274,7 +275,7 @@ tui_set_locator_filename (const char *filename)
 
   if (locator->content[0] == NULL)
     {
-      tui_set_locator_info (filename, NULL, 0, 0);
+      tui_set_locator_info (NULL, filename, NULL, 0, 0);
       return;
     }
 
@@ -285,7 +286,8 @@ tui_set_locator_filename (const char *filename)
 
 /* Update the locator, with the provided arguments.  */
 static void
-tui_set_locator_info (const char *filename, 
+tui_set_locator_info (struct gdbarch *gdbarch,
+		      const char *filename,
 		      const char *procname, 
 		      int lineno,
                       CORE_ADDR addr)
@@ -305,6 +307,7 @@ tui_set_locator_info (const char *filename,
   strcat_to_buf (element->proc_name, MAX_LOCATOR_ELEMENT_LEN, procname);
   element->line_no = lineno;
   element->addr = addr;
+  element->gdbarch = gdbarch;
   tui_set_locator_filename (filename);
 }
 
@@ -335,7 +338,8 @@ tui_show_frame_info (struct frame_info *fi)
 
       source_already_displayed = sal.symtab != 0
         && tui_source_is_displayed (sal.symtab->filename);
-      tui_set_locator_info (sal.symtab == 0 ? "??" : sal.symtab->filename,
+      tui_set_locator_info (get_frame_arch (fi),
+			    sal.symtab == 0 ? "??" : sal.symtab->filename,
                             tui_get_function_from_frame (fi),
                             sal.line,
                             get_frame_pc (fi));
@@ -360,7 +364,8 @@ tui_show_frame_info (struct frame_info *fi)
 					    &low, (CORE_ADDR) 0) == 0)
 		error (_("No function contains program counter for selected frame."));
 	      else
-		low = tui_get_low_disassembly_address (low, get_frame_pc (fi));
+		low = tui_get_low_disassembly_address (get_frame_arch (fi),
+						       low, get_frame_pc (fi));
 	    }
 
 	  if (win_info == TUI_SRC_WIN)
@@ -370,7 +375,8 @@ tui_show_frame_info (struct frame_info *fi)
 	      l.u.line_no = start_line;
 	      if (!(source_already_displayed
 		    && tui_line_is_displayed (item->locator.line_no, win_info, TRUE)))
-		tui_update_source_window (win_info, sal.symtab, l, TRUE);
+		tui_update_source_window (win_info, get_frame_arch (fi),
+					  sal.symtab, l, TRUE);
 	      else
 		{
 		  l.u.line_no = item->locator.line_no;
@@ -385,7 +391,8 @@ tui_show_frame_info (struct frame_info *fi)
 		  a.loa = LOA_ADDRESS;
 		  a.u.addr = low;
 		  if (!tui_addr_is_displayed (item->locator.addr, win_info, TRUE))
-		    tui_update_source_window (win_info, sal.symtab, a, TRUE);
+		    tui_update_source_window (win_info, get_frame_arch (fi),
+					      sal.symtab, a, TRUE);
 		  else
 		    {
 		      a.u.addr = item->locator.addr;
@@ -398,7 +405,7 @@ tui_show_frame_info (struct frame_info *fi)
     }
   else
     {
-      tui_set_locator_info (NULL, NULL, 0, (CORE_ADDR) 0);
+      tui_set_locator_info (NULL, NULL, NULL, 0, (CORE_ADDR) 0);
       tui_show_locator_content ();
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{