From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7922 invoked by alias); 18 Sep 2009 22:39:07 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 7897 invoked by uid 306); 18 Sep 2009 22:39:07 -0000 Date: Fri, 18 Sep 2009 22:39:00 -0000 Message-ID: <20090918223907.7882.qmail@sourceware.org> From: tromey@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-tromey-python: Merge branch 'archer-tromey-python' of ssh://sourceware.org/git/archer into archer-tromey-python X-Git-Refname: refs/heads/archer-tromey-python X-Git-Reftype: branch X-Git-Oldrev: 1e582cf2df11843bf1f98d53aac3cb92012c6310 X-Git-Newrev: f471c6694511a867e0bec72ca658c614d20b98f6 X-SW-Source: 2009-q3/txt/msg00221.txt.bz2 List-Id: The branch, archer-tromey-python has been updated via f471c6694511a867e0bec72ca658c614d20b98f6 (commit) via 23c708ccadb968d1c410bc17b204731134b0f65e (commit) from 1e582cf2df11843bf1f98d53aac3cb92012c6310 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f471c6694511a867e0bec72ca658c614d20b98f6 Merge: 23c708ccadb968d1c410bc17b204731134b0f65e 1e582cf2df11843bf1f98d53aac3cb92012c6310 Author: Tom Tromey Date: Fri Sep 18 16:38:17 2009 -0600 Merge branch 'archer-tromey-python' of ssh://sourceware.org/git/archer into archer-tromey-python commit 23c708ccadb968d1c410bc17b204731134b0f65e Author: Tom Tromey Date: Fri Sep 18 16:26:49 2009 -0600 * python/lib/gdb/FrameWrapper.py: Don't directly reference self.frame. ----------------------------------------------------------------------- Summary of changes: gdb/python/lib/gdb/FrameWrapper.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) First 500 lines of diff: diff --git a/gdb/python/lib/gdb/FrameWrapper.py b/gdb/python/lib/gdb/FrameWrapper.py index 39f8246..b790a54 100644 --- a/gdb/python/lib/gdb/FrameWrapper.py +++ b/gdb/python/lib/gdb/FrameWrapper.py @@ -30,7 +30,7 @@ class FrameWrapper: stream.write (sym.print_name + "=") try: - val = self.frame.read_var (sym) + val = self.read_var (sym) if val != None: val = str (val) # FIXME: would be nice to have a more precise exception here. @@ -75,21 +75,21 @@ class FrameWrapper: # FIXME: this should probably just be a method on gdb.Frame. # But then we need stream wrappers. def describe (self, stream, full): - if self.frame.type () == gdb.DUMMY_FRAME: + if self.type () == gdb.DUMMY_FRAME: stream.write (" \n") - elif self.frame.type () == gdb.SIGTRAMP_FRAME: + elif self.type () == gdb.SIGTRAMP_FRAME: stream.write (" \n") else: - sal = self.frame.find_sal () - pc = self.frame.pc () - name = self.frame.name () + sal = self.find_sal () + pc = self.pc () + name = self.name () if not name: name = "??" if pc != sal.pc or not sal.symtab: stream.write (" 0x%08x in" % pc) stream.write (" " + name + " (") - func = self.frame.function () + func = self.function () self.print_frame_args (stream, func) stream.write (")") @@ -98,7 +98,7 @@ class FrameWrapper: stream.write (" at " + sal.symtab.filename) stream.write (":" + str (sal.line)) - if not self.frame.name () or (not sal.symtab or not sal.symtab.filename): + if not self.name () or (not sal.symtab or not sal.symtab.filename): lib = gdb.solib_address (pc) if lib: stream.write (" from " + lib) hooks/post-receive -- Repository for Project Archer.