* tui/tui-disasm.c (tui_get_begin_asm_address): Default to

	get_current_arch.
	* tui/tui-layout.c (extract_display_start_addr): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3155ce81f9342980f6dcfe01fe0f88527a02b66e..6507b66274ff4f1b95d61c81f4a24eddf35b0b50 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-20  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * tui/tui-disasm.c (tui_get_begin_asm_address): Default to
+       get_current_arch.
+       * tui/tui-layout.c (extract_display_start_addr): Likewise.
+
 2010-03-19  Stan Shebs  <stan@codesourcery.com>
 
        * ax-gdb.c (gen_fetch): Handle bool.

diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index c7b684ac04a18d9b35c8f7c7f904aa7b41f6c668..cb8358eb1430ad40d9967a2eb171f9d376c5b2db 100644 (file)
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -21,6 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "arch-utils.h"
 #include "symtab.h"
 #include "breakpoint.h"
 #include "frame.h"
@@ -330,7 +331,7 @@ tui_get_begin_asm_address (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p)
 {
   struct tui_gen_win_info *locator;
   struct tui_locator_element *element;
-  struct gdbarch *gdbarch = NULL;
+  struct gdbarch *gdbarch = get_current_arch ();
   CORE_ADDR addr;
 
   locator = tui_locator_win_info_ptr ();

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index e9ff1e686895b5cff521a19b0a3dbf117b48c4d7..0c622b97b2bb70258b9653e166a8e6858d1883fa 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -21,6 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include "arch-utils.h"
 #include "command.h"
 #include "symtab.h"
 #include "frame.h"
@@ -522,7 +523,7 @@ static void
 extract_display_start_addr (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p)
 {
   enum tui_layout_type cur_layout = tui_current_layout ();
-  struct gdbarch *gdbarch = NULL;
+  struct gdbarch *gdbarch = get_current_arch ();
   CORE_ADDR addr;
   CORE_ADDR pc;
   struct symtab_and_line cursal = get_current_source_symtab_and_line ();