aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui/tui-disasm.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/tui/tui-disasm.c')
-rw-r--r--gdb/tui/tui-disasm.c53
1 files changed, 31 insertions, 22 deletions
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 14f0496..7571a9b 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -50,7 +50,7 @@ struct tui_asm_line
Disassemble count lines starting at pc.
Return address of the count'th instruction after pc. */
static CORE_ADDR
-tui_disassemble (struct tui_asm_line *asm_lines,
+tui_disassemble (struct gdbarch *gdbarch, struct tui_asm_line *asm_lines,
CORE_ADDR pc, int count)
{
struct ui_file *gdb_dis_out;
@@ -72,7 +72,7 @@ tui_disassemble (struct tui_asm_line *asm_lines,
ui_file_rewind (gdb_dis_out);
- pc = pc + gdb_print_insn (pc, gdb_dis_out, NULL);
+ pc = pc + gdb_print_insn (gdbarch, pc, gdb_dis_out, NULL);
asm_lines->insn = xstrdup (tui_file_get_strbuf (gdb_dis_out));
@@ -87,7 +87,7 @@ tui_disassemble (struct tui_asm_line *asm_lines,
or below the PC. Variable sized instructions are taken into
account by the algorithm. */
static CORE_ADDR
-tui_find_disassembly_address (CORE_ADDR pc, int from)
+tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from)
{
CORE_ADDR new_low;
int max_lines;
@@ -105,7 +105,7 @@ tui_find_disassembly_address (CORE_ADDR pc, int from)
new_low = pc;
if (from > 0)
{
- tui_disassemble (asm_lines, pc, max_lines);
+ tui_disassemble (gdbarch, asm_lines, pc, max_lines);
new_low = asm_lines[max_lines - 1].addr;
}
else
@@ -127,7 +127,7 @@ tui_find_disassembly_address (CORE_ADDR pc, int from)
else
new_low += 1 * max_lines;
- tui_disassemble (asm_lines, new_low, max_lines);
+ tui_disassemble (gdbarch, asm_lines, new_low, max_lines);
last_addr = asm_lines[pos].addr;
} while (last_addr > pc && msymbol);
@@ -144,7 +144,8 @@ tui_find_disassembly_address (CORE_ADDR pc, int from)
if (pos >= max_lines)
pos = 0;
- next_addr = tui_disassemble (&asm_lines[pos], last_addr, 1);
+ next_addr = tui_disassemble (gdbarch, &asm_lines[pos],
+ last_addr, 1);
/* If there are some problems while disassembling exit. */
if (next_addr <= last_addr)
@@ -166,7 +167,7 @@ tui_find_disassembly_address (CORE_ADDR pc, int from)
/* Function to set the disassembly window's content. */
enum tui_status
-tui_set_disassem_content (CORE_ADDR pc)
+tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc)
{
enum tui_status ret = TUI_FAILURE;
int i;
@@ -187,6 +188,7 @@ tui_set_disassem_content (CORE_ADDR pc)
if (ret != TUI_SUCCESS)
return ret;
+ TUI_DISASM_WIN->detail.source_info.gdbarch = gdbarch;
TUI_DISASM_WIN->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS;
TUI_DISASM_WIN->detail.source_info.start_line_or_addr.u.addr = pc;
cur_pc = (CORE_ADDR)
@@ -202,7 +204,7 @@ tui_set_disassem_content (CORE_ADDR pc)
line_width = TUI_DISASM_WIN->generic.width - 1;
- tui_disassemble (asm_lines, pc, max_lines);
+ tui_disassemble (gdbarch, asm_lines, pc, max_lines);
/* See what is the maximum length of an address and of a line. */
addr_size = 0;
@@ -269,7 +271,7 @@ tui_set_disassem_content (CORE_ADDR pc)
/* Function to display the disassembly window with disassembled code. */
void
-tui_show_disassem (CORE_ADDR start_addr)
+tui_show_disassem (struct gdbarch *gdbarch, CORE_ADDR start_addr)
{
struct symtab *s = find_pc_symtab (start_addr);
struct tui_win_info *win_with_focus = tui_win_with_focus ();
@@ -278,7 +280,7 @@ tui_show_disassem (CORE_ADDR start_addr)
val.loa = LOA_ADDRESS;
val.u.addr = start_addr;
tui_add_win_to_layout (DISASSEM_WIN);
- tui_update_source_window (TUI_DISASM_WIN, s, val, FALSE);
+ tui_update_source_window (TUI_DISASM_WIN, gdbarch, s, val, FALSE);
/* If the focus was in the src win, put it in the asm win, if the
source view isn't split. */
@@ -292,11 +294,12 @@ tui_show_disassem (CORE_ADDR start_addr)
/* Function to display the disassembly window. */
void
-tui_show_disassem_and_update_source (CORE_ADDR start_addr)
+tui_show_disassem_and_update_source (struct gdbarch *gdbarch,
+ CORE_ADDR start_addr)
{
struct symtab_and_line sal;
- tui_show_disassem (start_addr);
+ tui_show_disassem (gdbarch, start_addr);
if (tui_current_layout () == SRC_DISASSEM_COMMAND)
{
struct tui_line_or_address val;
@@ -307,7 +310,7 @@ tui_show_disassem_and_update_source (CORE_ADDR start_addr)
sal = find_pc_line (start_addr, 0);
val.loa = LOA_LINE;
val.u.line_no = sal.line;
- tui_update_source_window (TUI_SRC_WIN, sal.symtab, val, TRUE);
+ tui_update_source_window (TUI_SRC_WIN, gdbarch, sal.symtab, val, TRUE);
if (sal.symtab)
{
set_current_source_symtab_and_line (&sal);
@@ -320,11 +323,12 @@ tui_show_disassem_and_update_source (CORE_ADDR start_addr)
return;
}
-CORE_ADDR
-tui_get_begin_asm_address (void)
+void
+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;
CORE_ADDR addr;
locator = tui_locator_win_info_ptr ();
@@ -347,24 +351,28 @@ tui_get_begin_asm_address (void)
addr = 0;
}
else /* The target is executing. */
- addr = element->addr;
+ {
+ gdbarch = element->gdbarch;
+ addr = element->addr;
+ }
- return addr;
+ *gdbarch_p = gdbarch;
+ *addr_p = addr;
}
/* Determine what the low address will be to display in the TUI's
disassembly window. This may or may not be the same as the low
address input. */
CORE_ADDR
-tui_get_low_disassembly_address (CORE_ADDR low,
- CORE_ADDR pc)
+tui_get_low_disassembly_address (struct gdbarch *gdbarch,
+ CORE_ADDR low, CORE_ADDR pc)
{
int pos;
/* Determine where to start the disassembly so that the pc is about
in the middle of the viewport. */
pos = tui_default_win_viewport_height (DISASSEM_WIN, DISASSEM_COMMAND) / 2;
- pc = tui_find_disassembly_address (pc, -pos);
+ pc = tui_find_disassembly_address (gdbarch, pc, -pos);
if (pc < low)
pc = low;
@@ -378,6 +386,7 @@ tui_vertical_disassem_scroll (enum tui_scroll_direction scroll_direction,
{
if (TUI_DISASM_WIN->generic.content != NULL)
{
+ struct gdbarch *gdbarch = TUI_DISASM_WIN->detail.source_info.gdbarch;
CORE_ADDR pc;
tui_win_content content;
struct tui_line_or_address val;
@@ -390,7 +399,7 @@ tui_vertical_disassem_scroll (enum tui_scroll_direction scroll_direction,
dir = (scroll_direction == FORWARD_SCROLL) ? num_to_scroll : -num_to_scroll;
val.loa = LOA_ADDRESS;
- val.u.addr = tui_find_disassembly_address (pc, dir);
- tui_update_source_window_as_is (TUI_DISASM_WIN, NULL, val, FALSE);
+ val.u.addr = tui_find_disassembly_address (gdbarch, pc, dir);
+ tui_update_source_window_as_is (TUI_DISASM_WIN, gdbarch, NULL, val, FALSE);
}
}
generated by cgit v1.1 at 2024-12-15 00:00:50 +0000