diff options
| author | Stephane Carrez <stcarrez@nerim.fr> | 2002-08-28 20:33:27 +0000 |
|---|---|---|
| committer | Stephane Carrez <stcarrez@nerim.fr> | 2002-08-28 20:33:27 +0000 |
| commit | 77cad3ba61341dfd6323c8f6e0067071ba6e599b (patch) | |
| tree | 3e3d7cec588e36f1ab9392621ffb313e1442c2dc | |
| parent | bfb3754e3d662ed801fe51563ef872f376130560 (diff) | |
| download | gdb-77cad3ba61341dfd6323c8f6e0067071ba6e599b.zip gdb-77cad3ba61341dfd6323c8f6e0067071ba6e599b.tar.gz gdb-77cad3ba61341dfd6323c8f6e0067071ba6e599b.tar.bz2 | |
* tui.c (tuiGetLowDisassemblyAddress): Moved from here.
* tuiDisassem.c (tuiGetLowDisassemblyAddress): To here, and use
tui_find_disassembly_address to find the starting address of
disassemble window.
| -rw-r--r-- | gdb/tui/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/tui/tui.c | 25 | ||||
| -rw-r--r-- | gdb/tui/tuiDisassem.c | 18 |
3 files changed, 25 insertions, 25 deletions
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index be156d2..0e19a12 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,3 +1,10 @@ +2002-08-29 Stephane Carrez <stcarrez@nerim.fr> + + * tui.c (tuiGetLowDisassemblyAddress): Moved from here. + * tuiDisassem.c (tuiGetLowDisassemblyAddress): To here, and use + tui_find_disassembly_address to find the starting address of + disassemble window. + 2002-08-28 Stephane Carrez <stcarrez@nerim.fr> * tuiDisassem.c (tui_disassemble): New function to disassemble diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 2b9ccae..ab2c201 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -311,31 +311,6 @@ tuiFree (char *ptr) } } -/* 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 -tuiGetLowDisassemblyAddress (CORE_ADDR low, CORE_ADDR pc) -{ - int line; - CORE_ADDR newLow; - - /* Determine where to start the disassembly so that the pc is about in the - middle of the viewport. */ - for (line = 0, newLow = pc; - (newLow > low && - line < (tuiDefaultWinViewportHeight (DISASSEM_WIN, - DISASSEM_COMMAND) / 2));) - { - bfd_byte buffer[4]; - - newLow -= sizeof (bfd_getb32 (buffer)); - line++; - } - - return newLow; -} - void strcat_to_buf (char *buf, int buflen, const char *itemToAdd) { diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c index 719a26b..50a6d0e 100644 --- a/gdb/tui/tuiDisassem.c +++ b/gdb/tui/tuiDisassem.c @@ -382,6 +382,24 @@ tuiGetBeginAsmAddress (void) return addr; } /* tuiGetBeginAsmAddress */ +/* 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 +tuiGetLowDisassemblyAddress (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 = tuiDefaultWinViewportHeight (DISASSEM_WIN, DISASSEM_COMMAND) / 2; + pc = tui_find_disassembly_address (pc, -pos); + + if (pc < low) + pc = low; + return pc; +} + /* ** tuiVerticalDisassemScroll(). ** Scroll the disassembly forward or backward vertically |