gdb.rb 0.1.3 → 0.1.5

data/README

@@ -17,6 +17,12 @@ gdb7 hooks for MRI
   Attaching to program: /usr/bin/ruby, process 13074
   0x00007fa8b9cb3c93 in select () from /lib/libc.so.6
 
+  (gdb) ruby eval 1+2
+  2
+
+  (gdb) ruby eval Thread.list.count
+  17
+
   (gdb) ruby threads list
   0x1589000 main      thread  THREAD_STOPPED   WAIT_JOIN(0x19ef400)           4417 bytes
   0x19ef400           thread  THREAD_STOPPED   WAIT_TIME(57.10)               6267 bytes
@@ -34,7 +40,7 @@ gdb7 hooks for MRI
   0x19dc800           thread  THREAD_STOPPED   WAIT_NONE                     14237 bytes
   0x19dcc00           thread  THREAD_STOPPED   WAIT_NONE                     14237 bytes
   0x2266800           thread  THREAD_STOPPED   WAIT_NONE                     14237 bytes
-  0x1d63000      curr thread  THREAD_RUNNABLE  WAIT_NONE                 
+  0x1d63000      curr thread  THREAD_RUNNABLE  WAIT_NONE
 
   (gdb) ruby threads
   0x1589000 main      thread  THREAD_STOPPED   WAIT_JOIN(0x19ef400)           4417 bytes

data/bin/gdb.rb

@@ -13,15 +13,16 @@ else
   exit(1)
 end
 
-dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+dir = File.expand_path('../../', __FILE__)
+binary = "#{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']}"
 
 args = []
 args << "#{dir}/ext/dst/bin/gdb"
-args << "-ex 'py execfile(\"#{dir}/scripts/ruby-gdb.py\")'"
 if pid
   args << "-ex 'attach #{pid}'"
 else
-  args << "#{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']}"
+  args << binary
 end
+args << %{-ex 'py execfile("#{dir}/scripts/ruby-gdb.py")'}
 
 exec(args.join(' '))

data/ext/extconf.rb

@@ -36,7 +36,7 @@ unless have_header('python2.5/Python.h') or have_header('python2.6/Python.h') or
   exit(1)
 end
 
-gdb = File.basename('gdb-7.0.tar.bz2')
+gdb = File.basename('gdb-7.2.tar.bz2')
 dir = File.basename(gdb, '.tar.bz2')
 
 puts "(I'm about to compile gdb7.. this will definitely take a while)"
@@ -53,8 +53,6 @@ Dir.chdir('src') do
     end
 
     %w[
-      gdb-eval
-      gdb-breakpoints
       gdb-leak
       gdb-strings
     ].each do |patch|

data/gdb.rb.gemspec

@@ -1,10 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = 'gdb.rb'
-  s.version = '0.1.3'
-  s.date = '2009-12-22'
+  s.version = '0.1.5'
+  s.date = '2010-11-04'
   s.rubyforge_project = 'gdb-rb'
-  s.summary = 'gdb hooks for MRI'
-  s.description = 'A set of gdb7 extensions for the MRI interpreter'
+  s.summary = 'gdb hooks for MRI and REE'
+  s.description = 'A set of gdb7 extensions for the MRI/REE 1.8.x interpreter'
 
   s.homepage = "http://github.com/tmm1/gdb.rb"
 
@@ -16,18 +16,5 @@ spec = Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'gdb.rb'
 
-  # ruby -rpp -e' pp `git ls-files`.split("\n").sort '
-  s.files = %w[
-    README
-    bin/gdb.rb
-    ext/Makefile
-    ext/extconf.rb
-    ext/src/gdb-7.0.tar.bz2
-    gdb.rb.gemspec
-    patches/gdb-breakpoints.patch
-    patches/gdb-eval.patch
-    patches/gdb-leak.patch
-    patches/gdb-strings.patch
-    scripts/ruby-gdb.py
-  ]
+  s.files = `git ls-files`.split("\n").sort
 end

data/patches/gdb-leak.patch

@@ -1,8 +1,8 @@
 diff --git a/python/py-value.c b/python/py-value.c
-index 8f8c610..c3a6cbf 100644
+index 4445655..f3c6309 100644
 --- a/python/py-value.c
 +++ b/python/py-value.c
-@@ -139,7 +139,7 @@ valpy_new (PyTypeObject *subtype, PyObject *args, PyObject *keywords)
+@@ -150,7 +150,7 @@ valpy_new (PyTypeObject *subtype, PyObject *args, PyObject *keywords)
      }
  
    value_obj->value = value;
@@ -10,16 +10,8 @@ index 8f8c610..c3a6cbf 100644
 +  release_value_or_incref (value);
    value_obj->address = NULL;
    value_obj->type = NULL;
-   note_value (value_obj);
-@@ -263,6 +263,7 @@ valpy_cast (PyObject *self, PyObject *args)
- {
-   PyObject *type_obj;
-   struct type *type;
-+  PyObject *res_obj = NULL;
-   struct value *res_val = NULL;	  /* Initialize to appease gcc warning.  */
-   volatile struct gdb_exception except;
- 
-@@ -301,8 +302,10 @@ valpy_getitem (PyObject *self, PyObject *key)
+   value_obj->dynamic_type = NULL;
+@@ -445,8 +445,10 @@ valpy_getitem (PyObject *self, PyObject *key)
  {
    value_object *self_value = (value_object *) self;
    char *field = NULL;
@@ -30,23 +22,24 @@ index 8f8c610..c3a6cbf 100644
  
    if (gdbpy_is_string (key))
      {  
-@@ -340,9 +343,13 @@ valpy_getitem (PyObject *self, PyObject *key)
+@@ -486,9 +488,15 @@ valpy_getitem (PyObject *self, PyObject *key)
      }
  
    xfree (field);
--  GDB_PY_HANDLE_EXCEPTION (except);
-+  GDB_PY_HANDLE_EXCEPTION_AND_CLEANUP (except, mark);
-+
-+  if (res_val)
-+    res_obj = value_to_value_object (res_val);
++  if (except.reason < 0)
++    value_free_to_mark (mark);
+   GDB_PY_HANDLE_EXCEPTION (except);
  
 -  return res_val ? value_to_value_object (res_val) : NULL;
++  if (res_val)
++    res_obj = value_to_value_object (res_val);
++
 +  value_free_to_mark (mark);
 +  return res_obj;
  }
  
  static int
-@@ -423,8 +430,10 @@ enum valpy_opcode
+@@ -625,8 +633,10 @@ enum valpy_opcode
  static PyObject *
  valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
  {
@@ -57,23 +50,25 @@ index 8f8c610..c3a6cbf 100644
  
    TRY_CATCH (except, RETURN_MASK_ALL)
      {
-@@ -515,9 +524,13 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
+@@ -717,9 +727,16 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other)
  	  break;
  	}
      }
--  GDB_PY_HANDLE_EXCEPTION (except);
-+  GDB_PY_HANDLE_EXCEPTION_AND_CLEANUP (except, mark);
 +
-+  if (res_val)
-+    res_obj = value_to_value_object (res_val);
++  if (except.reason < 0)
++    value_free_to_mark (mark);
+   GDB_PY_HANDLE_EXCEPTION (except);
  
 -  return res_val ? value_to_value_object (res_val) : NULL;
++  if (res_val)
++    res_obj = value_to_value_object (res_val);
++
 +  value_free_to_mark (mark);
 +  return res_obj;
  }
  
  static PyObject *
-@@ -680,6 +693,7 @@ valpy_richcompare (PyObject *self, PyObject *other, int op)
+@@ -881,6 +898,7 @@ valpy_richcompare (PyObject *self, PyObject *other, int op)
    int result = 0;
    struct value *value_other;
    volatile struct gdb_exception except;
@@ -81,7 +76,7 @@ index 8f8c610..c3a6cbf 100644
  
    if (other == Py_None)
      /* Comparing with None is special.  From what I can tell, in Python
-@@ -738,6 +752,7 @@ valpy_richcompare (PyObject *self, PyObject *other, int op)
+@@ -939,6 +957,7 @@ valpy_richcompare (PyObject *self, PyObject *other, int op)
  	  break;
        }
      }
@@ -89,7 +84,7 @@ index 8f8c610..c3a6cbf 100644
    GDB_PY_HANDLE_EXCEPTION (except);
  
    /* In this case, the Python exception has already been set.  */
-@@ -858,7 +873,7 @@ value_to_value_object (struct value *val)
+@@ -1062,7 +1081,7 @@ value_to_value_object (struct value *val)
    if (val_obj != NULL)
      {
        val_obj->value = val;
@@ -97,37 +92,18 @@ index 8f8c610..c3a6cbf 100644
 +      release_value_or_incref (val);
        val_obj->address = NULL;
        val_obj->type = NULL;
-       note_value (val_obj);
-diff --git a/python/python-internal.h b/python/python-internal.h
-index fa4a62b..bc9c8c0 100644
---- a/python/python-internal.h
-+++ b/python/python-internal.h
-@@ -103,11 +103,17 @@ extern const struct language_defn *python_language;
- /* Use this after a TRY_EXCEPT to throw the appropriate Python
-    exception.  */
- #define GDB_PY_HANDLE_EXCEPTION(Exception)				\
-+    GDB_PY_HANDLE_EXCEPTION_AND_CLEANUP(Exception, NULL)
-+
-+#define GDB_PY_HANDLE_EXCEPTION_AND_CLEANUP(Exception, mark)				\
-     do {								\
--      if (Exception.reason < 0)						\
-+      if (Exception.reason < 0) {					\
-+        if (mark)						\
-+          value_free_to_mark (mark);						\
- 	return PyErr_Format (Exception.reason == RETURN_QUIT		\
- 			     ? PyExc_KeyboardInterrupt : PyExc_RuntimeError, \
- 			     "%s", Exception.message);			\
-+      }						\
-     } while (0)
- 
- 
+       val_obj->dynamic_type = NULL;
 diff --git a/value.c b/value.c
-index 589e03b..59a0196 100644
+index 381318b..805dcf0 100644
 --- a/value.c
 +++ b/value.c
-@@ -675,7 +675,7 @@ free_all_values (void)
+@@ -737,9 +737,10 @@ free_value_chain (struct value *v)
+ }
+ 
  /* Remove VAL from the chain all_values
-    so it will not be freed automatically.  */
+-   so it will not be freed automatically.  */
++   so it will not be freed automatically.
++   Result of 0 indicates the value was found and released. */
  
 -void
 +int
@@ -139,7 +115,7 @@ index 589e03b..59a0196 100644
      {
        all_values = val->next;
 -      return;
-+      return 1;
++      return 0;
      }
  
    for (v = all_values; v; v = v->next)
@@ -148,11 +124,11 @@ index 589e03b..59a0196 100644
  	{
  	  v->next = val->next;
 -	  break;
-+	  return 1;
++	  return 0;
  	}
      }
 +
-+  return 0;
++  return -1;
 +}
 +
 +/* Release VAL or increment its reference count if
@@ -161,18 +137,22 @@ index 589e03b..59a0196 100644
 +void
 +release_value_or_incref (struct value *val)
 +{
-+  if (release_value (val) == 0)
++  if (release_value (val) != 0)
 +    value_incref (val);
  }
  
  /* Release all values up to mark  */
++
+ struct value *
+ value_release_to_mark (struct value *mark)
+ {
 diff --git a/value.h b/value.h
-index 51e6960..4760c4a 100644
+index 543290a..e7e00d2 100644
 --- a/value.h
 +++ b/value.h
-@@ -594,7 +594,9 @@ extern void value_free (struct value *val);
+@@ -641,7 +641,9 @@ extern void free_all_values (void);
  
- extern void free_all_values (void);
+ extern void free_value_chain (struct value *v);
  
 -extern void release_value (struct value *val);
 +extern int release_value (struct value *val);

data/scripts/ruby-gdb.py

@@ -1,6 +1,7 @@
 import re
 import gdb
 import time
+import os
 
 class ZeroDict(dict):
   def __getitem__(self, i):
@@ -40,7 +41,7 @@ class RubyThreads (gdb.Command):
   def trace (self):
     self.type = 'list'
     self.curr = None
-    self.main = gdb.eval('rb_main_thread')
+    self.main = gdb.parse_and_eval('rb_main_thread')
 
     self.unwind = gdb.parameter('unwindonsignal')
     gdb.execute('set unwindonsignal on')
@@ -53,7 +54,7 @@ class RubyThreads (gdb.Command):
       prev = None
       while True:
         gdb.execute('continue')
-        curr = gdb.eval('rb_curr_thread')
+        curr = gdb.parse_and_eval('rb_curr_thread')
         if curr == prev: break
         self.print_thread(curr)
         prev = curr
@@ -64,12 +65,12 @@ class RubyThreads (gdb.Command):
     gdb.execute('set unwindonsignal %s' % (self.unwind and 'on' or 'off'))
 
   def show (self):
-    self.main = gdb.eval('rb_main_thread')
-    self.curr = gdb.eval('rb_curr_thread')
+    self.main = gdb.parse_and_eval('rb_main_thread')
+    self.curr = gdb.parse_and_eval('rb_curr_thread')
     self.now = time.time()
 
     try:
-      gdb.eval('rb_thread_start_2')
+      gdb.parse_and_eval('rb_thread_start_2')
     except RuntimeError:
       self.is_heap_stack = False
     else:
@@ -100,8 +101,8 @@ class RubyThreads (gdb.Command):
     if self.type == 'list': return
 
     if th == self.curr:
-      frame = gdb.eval('ruby_frame')
-      node = gdb.eval('ruby_current_node')
+      frame = gdb.parse_and_eval('ruby_frame')
+      node = gdb.parse_and_eval('ruby_current_node')
     else:
       frame = th['frame']
       node = frame['node']
@@ -127,20 +128,20 @@ class RubyThreads (gdb.Command):
       stk_pos = th['stk_pos']
       stk_ptr = th['stk_ptr']
       stk_len = th['stk_len']
-      addr = gdb.eval('(VALUE*)%s' % frame)
+      addr = gdb.parse_and_eval('(VALUE*)%s' % frame)
 
       if not self.is_heap_stack and th != self.curr and stk_pos < addr and addr < (stk_pos+stk_len):
         frame = (addr-stk_pos) + stk_ptr
-        frame = gdb.eval('(struct FRAME *)%s' % frame)
+        frame = gdb.parse_and_eval('(struct FRAME *)%s' % frame)
         node = frame['node']
 
       file = node['nd_file'].string()
-      line = gdb.eval('nd_line(%s)' % node)
-      type = gdb.eval('(enum node_type) nd_type(%s)' % node)
+      line = gdb.parse_and_eval('nd_line(%s)' % node)
+      type = gdb.parse_and_eval('(enum node_type) nd_type(%s)' % node)
 
       if frame['last_func']:
         try:
-          method = gdb.eval('rb_id2name(%s)' % frame['last_func']).string()
+          method = gdb.parse_and_eval('rb_id2name(%s)' % frame['last_func']).string()
         except:
           method = '(unknown)'
       else:
@@ -171,7 +172,7 @@ class RubyTrace (gdb.Command):
       gdb.execute(c)
 
     gdb.breakpoints()[-1].silent = True
-    self.func = gdb.eval('$func')
+    self.func = gdb.parse_and_eval('$func')
 
     self.unwind = gdb.parameter('unwindonsignal')
     gdb.execute('set unwindonsignal on')
@@ -205,10 +206,10 @@ class RubyTrace (gdb.Command):
         if frame.pc() != self.func:
           raise KeyboardInterrupt
 
-        node = gdb.eval('(NODE*) $rsi')
+        node = gdb.parse_and_eval('(NODE*) $rsi')
         file = node['nd_file'].string()
-        line = gdb.eval('nd_line(%s)' % node)
-        method = gdb.eval('rb_id2name($rcx)')
+        line = gdb.parse_and_eval('nd_line(%s)' % node)
+        method = gdb.parse_and_eval('rb_id2name($rcx)')
         method = method > 0 and method.string() or '(unknown)'
 
         print "%s in %s:%d" % (method,file,line)
@@ -263,7 +264,7 @@ class RubyObjects (gdb.Command):
         nodes[ (int(obj['as']['node']['flags']) >> 12) & 0xff ] += 1
 
     for (node, num) in sorted(nodes.items(), key=lambda(k,v):(v,k)):
-      print "% 8d %s" % (num, gdb.eval('(enum node_type) (%d)' % node))
+      print "% 8d %s" % (num, gdb.parse_and_eval('(enum node_type) (%d)' % node))
 
   def print_classes (self):
     classes = ZeroDict()
@@ -287,7 +288,7 @@ class RubyObjects (gdb.Command):
           classes[ int(klass) ] += 1
 
     for (klass, num) in sorted(classes.items(), key=lambda(k,v):(v,k)):
-      print "% 8d %s" % (num, gdb.eval('rb_class2name(%d)' % klass).string())
+      print "% 8d %s" % (num, gdb.parse_and_eval('rb_class2name(%d)' % klass).string())
 
   def print_strings (self):
     strings = ZeroDict()
@@ -385,11 +386,11 @@ class RubyObjects (gdb.Command):
     print
 
   def all_objects (self):
-    self.heaps_used = gdb.eval('heaps_used')
+    self.heaps_used = gdb.parse_and_eval('heaps_used')
 
     for i in xrange(self.heaps_used):
-      p = gdb.eval("(RVALUE*) heaps[%i].slot" % i)
-      pend = p + gdb.eval("heaps[%i].limit" % i)
+      p = gdb.parse_and_eval("(RVALUE*) heaps[%i].slot" % i)
+      pend = p + gdb.parse_and_eval("heaps[%i].limit" % i)
 
       while p < pend:
         yield p, p['as']['basic']['flags']
@@ -409,15 +410,15 @@ class RubyMethodCache (gdb.Command):
 
   def invoke (self, arg, from_tty):
     self.dont_repeat()
-    cache = gdb.eval('cache')
+    cache = gdb.parse_and_eval('cache')
     size = 0x800
     empty = 0
 
     for i in xrange(size):
       entry = cache[i]
       if entry['mid'] != 0:
-        klass = gdb.eval('rb_class2name(%d)' % entry['klass'])
-        method = gdb.eval('rb_id2name(%d)' % entry['mid'])
+        klass = gdb.parse_and_eval('rb_class2name(%d)' % entry['klass'])
+        method = gdb.parse_and_eval('rb_id2name(%d)' % entry['mid'])
         print " %s#%s" % (klass and klass.string() or '(unknown)',  method and method.string() or '(unknown)')
       else:
         empty += 1
@@ -433,7 +434,7 @@ class RubyPrint (gdb.Command):
   def invoke (self, arg, from_tty):
     self.dont_repeat()
 
-    type = int(gdb.eval("((struct RBasic *)(%d))->flags & 0x3f" % int(arg,0)))
+    type = int(gdb.parse_and_eval("((struct RBasic *)(%d))->flags & 0x3f" % int(arg,0)))
     rtype = RubyObjects.TYPES.get(type, 'unknown')
 
     if rtype == 'array':
@@ -449,7 +450,12 @@ class RubyEval (gdb.Command):
 
   def invoke (self, arg, from_tty):
     self.dont_repeat()
-    print gdb.eval("((struct RString*)rb_eval_string_protect(\"begin; (%s).inspect; rescue Exception => e; e.inspect; end\", 0))->ptr" % arg).string()
+    arg = arg.replace('\\', '\\\\').replace('"', '\\\"')
+    print gdb.parse_and_eval("((struct RString*)rb_eval_string_protect(\"begin; (%s).inspect; rescue Exception => e; e.inspect; end\", 0))->ptr" % arg).string()
+
+
+##
+# Create GDB commands
 
 Ruby()
 RubyThreads()
@@ -459,10 +465,25 @@ RubyMethodCache()
 RubyPrint()
 RubyEval()
 
+##
+# Detect MRI vs REE
+
+ruby = gdb.execute("info files", to_string=True).split("\n")[0]
+ruby = re.search('"(.+)"\.?$', ruby)
+ruby = ruby.group(1)
+ruby = os.popen("%s -v" % ruby).read()
+
+if re.search('Enterprise', ruby):
+	gdb.execute("macro define FL_USHIFT    12")
+else:
+	gdb.execute("macro define FL_USHIFT    11")
+
+##
+# Define common macros
+
 macros = """
   macro define R_CAST(st)   (struct st*)
   macro define RNODE(obj)  (R_CAST(RNode)(obj))
-  macro define FL_USHIFT    12
   macro define CHAR_BIT 8
   macro define NODE_LSHIFT (FL_USHIFT+8)
   macro define NODE_LMASK  (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1)
@@ -486,6 +507,9 @@ for m in macros:
   if len(m.strip()) > 0:
     gdb.execute(m)
 
+##
+# Define types
+
 types = """
   T_NONE   0x00
 
@@ -525,6 +549,9 @@ for t in types:
     gdb.execute("macro define %s %s" % (name, val))
     RubyObjects.TYPES[int(val,16)] = name[2:].lower()
 
+##
+# Set GDB options
+
 settings = """
   set height 0
   set width 0