From c5b16925a72c5bcb8cfe36611badc689ad406d5b Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Tue, 24 Sep 2002 22:24:20 +0000 Subject: 2002-09-24 Martin M. Hunt * library/srctextwin.itb (FillMixed): Fix debug statement for 64-bit. (_highlightAsmLine): Fix 64-bit arithmetic. --- gdb/gdbtk/ChangeLog | 6 ++++++ gdb/gdbtk/library/srctextwin.itb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog index cf676fe7828..25ac1ec8446 100644 --- a/gdb/gdbtk/ChangeLog +++ b/gdb/gdbtk/ChangeLog @@ -1,3 +1,9 @@ +2002-09-24 Martin M. Hunt + + * library/srctextwin.itb (FillMixed): Fix debug + statement for 64-bit. + (_highlightAsmLine): Fix 64-bit arithmetic. + 2002-09-19 Martin M. Hunt * library/srctextwin.itb (FillAssembly): Fix debug diff --git a/gdb/gdbtk/library/srctextwin.itb b/gdb/gdbtk/library/srctextwin.itb index d434aa80fb3..8ccf151085a 100644 --- a/gdb/gdbtk/library/srctextwin.itb +++ b/gdb/gdbtk/library/srctextwin.itb @@ -1091,7 +1091,7 @@ body SrcTextWin::FillMixed {w tagname filename funcname line addr pc_addr lib} { set mode_changed 0 set oldpane $pane if {[LoadFromCache $w $funcname M $lib]} { - # debug [format "Disassembling at %x" $addr] + # debug "Disassembling at $addr" if {[catch {gdb_load_disassembly $win source \ [scope _map] $Cname $addr} mess] } { # print some intelligent error message @@ -1134,7 +1134,7 @@ body SrcTextWin::_highlightAsmLine {win addr pc_addr \ if {[info exists _map($Cname,pc=$addr)]} { set current(asm_line) $_map($Cname,pc=$addr) } else { - set x [format "0x%x" [expr $current(addr)-2]] + set x [gdb_incr_addr $current(addr) -2] if {[info exists _map($Cname,pc=$x)]} { set current(asm_line) $_map($Cname,pc=$x) } -- cgit v1.2.1