Changeset 391 for python/trunk/Misc/gdbinit

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Misc/gdbinit (modified) (8 diffs)

python/trunk/Misc/gdbinit

@@ -1 @@
-# -*- ksh -*-
-#
 # If you use the GNU debugger gdb to debug the Python C runtime, you
 # might find some of the following commands useful.  Copy this to your
@@ -12 +10 @@
 #    $1 = void
 #    (gdb)
+#
+# NOTE: If you have gdb 7 or later, it supports debugging of Python directly
+# with embedded macros that you may find superior to what is in here.
+# See Tools/gdb/libpython.py and http://bugs.python.org/issue8032.
 
 # Prints a representation of the object to stderr, along with the
@@ -17 +19 @@
 # object is allocated at.  The argument must be a PyObject*
 define pyo
-print _PyObject_Dump($arg0)
+    # side effect of calling _PyObject_Dump is to dump the object's
+    # info - assigning just prevents gdb from printing the
+    # NULL return value
+    set $_unused_void = _PyObject_Dump($arg0)
 end
 
@@ -24 +29 @@
 # object is allocated at.  The argument must be a PyGC_Head*
 define pyg
-print _PyGC_Dump($arg0)
+    print _PyGC_Dump($arg0)
 end
 
@@ -35 +40 @@
             set $_name = PyString_AsString(PyTuple_GetItem($_names, $_i))
             printf "%s:\n", $_name
-            # side effect of calling _PyObject_Dump is to dump the object's
-            # info - assigning just prevents gdb from printing the
-            # NULL return value
-            set $_val = _PyObject_Dump(f->f_localsplus[$_i])
+            pyo f->f_localsplus[$_i]
         end
         set $_i = $_i + 1
@@ -60 +62 @@
       if ($__ad > $__lasti)
         set $__continue = 0
+      else
+        set $__li = $__li + *$__p
+        set $__p = $__p + 1
       end
-      set $__li = $__li + *$__p
-      set $__p = $__p + 1
     end
     printf "%d", $__li
@@ -116 +119 @@
 # Py_Main <= $pc <= Py_GetArgcArv is true, $pc is in Py_Main(), so the while
 # tests succeeds as long as it's not true.  In a similar fashion the if
-# statement tests to see if we are in PyEval_EvalFrame().
+# statement tests to see if we are in PyEval_EvalFrameEx().
+
+# Note: The name of the main interpreter function and the function which
+# follow it has changed over time.  This version of pystack works with this
+# version of Python.  If you try using it with older or newer versions of
+# the interpreter you may will have to change the functions you compare with
+# $pc.
 
 # print the entire Python call stack
 define pystack
     while $pc < Py_Main || $pc > Py_GetArgcArgv
-        if $pc > PyEval_EvalFrame && $pc < PyEval_EvalCodeEx
+        if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx
             pyframe
         end
@@ -132 +141 @@
 define pystackv
     while $pc < Py_Main || $pc > Py_GetArgcArgv
-        if $pc > PyEval_EvalFrame && $pc < PyEval_EvalCodeEx
+        if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx
             pyframev
         end