gdb.rb 0.1.5 → 0.1.6

data/ext/extconf.rb

@@ -11,27 +11,27 @@ end
 require 'mkmf'
 require 'fileutils'
 
-if RUBY_VERSION >= "1.9"
+if RUBY_PLATFORM !~ /(i686|x86_64)-linux/
   STDERR.puts "\n\n"
   STDERR.puts "***************************************************************************************"
-  STDERR.puts "************************** ruby 1.9 is not supported (yet) =( *************************"
+  STDERR.puts "*********************** Only x86 linux is supported (for now) =( **********************"
   STDERR.puts "***************************************************************************************"
   exit(1)
 end
 
-if RUBY_PLATFORM !~ /(i686|x86_64)-linux/
+dir_config('python')
+unless have_header('python2.5/Python.h') or have_header('python2.6/Python.h') or have_header('python2.4/Python.h')
   STDERR.puts "\n\n"
   STDERR.puts "***************************************************************************************"
-  STDERR.puts "*********************** Only x86 linux is supported (for now) =( **********************"
+  STDERR.puts "***************** Python required (apt-get install python2.5-dev) =( ******************"
   STDERR.puts "***************************************************************************************"
   exit(1)
 end
 
-dir_config('python')
-unless have_header('python2.5/Python.h') or have_header('python2.6/Python.h') or have_header('python2.4/Python.h')
+unless have_header('ncurses.h') or have_header('ncurses/ncurses.h')
   STDERR.puts "\n\n"
   STDERR.puts "***************************************************************************************"
-  STDERR.puts "***************** Python required (apt-get install python2.5-dev) =( ******************"
+  STDERR.puts "**************** ncurses required (apt-get install libncurses5-dev) =( ****************"
   STDERR.puts "***************************************************************************************"
   exit(1)
 end

data/gdb.rb.gemspec

@@ -1,10 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = 'gdb.rb'
-  s.version = '0.1.5'
-  s.date = '2010-11-04'
+  s.version = '0.1.6'
+  s.date = '2010-11-16'
   s.rubyforge_project = 'gdb-rb'
-  s.summary = 'gdb hooks for MRI and REE'
-  s.description = 'A set of gdb7 extensions for the MRI/REE 1.8.x interpreter'
+  s.summary = 'gdb hooks for MRI/REE and YARV'
+  s.description = 'A set of gdb7 extensions for the MRI/REE 1.8.x interpreter (and basic support for YARV 1.9.2)'
 
   s.homepage = "http://github.com/tmm1/gdb.rb"
 

data/scripts/ruby-gdb.py

@@ -234,9 +234,9 @@ class RubyObjects (gdb.Command):
       self.print_nodes()
     elif arg == 'strings':
       self.print_strings()
-    elif arg == 'hashes':
+    elif Ruby.is_18 and arg == 'hashes':
       self.print_hashes()
-    elif arg == 'arrays':
+    elif Ruby.is_18 and arg == 'arrays':
       self.print_arrays()
     else:
       self.print_stats()
@@ -244,24 +244,33 @@ class RubyObjects (gdb.Command):
   def complete (self, text, word):
     if text == word:
       if word == '':
-        return ['classes', 'strings', 'nodes', 'hashes', 'arrays']
+        if Ruby.is_18:
+          return ['classes', 'nodes', 'strings', 'hashes', 'arrays']
+        else:
+          return ['classes', 'nodes', 'strings']
       elif word[0] == 'c':
         return ['classes']
       elif word[0] == 'n':
         return ['nodes']
       elif word[0] == 's':
         return ['strings']
-      elif word[0] == 'h':
+      elif Ruby.is_18 and word[0] == 'h':
         return ['hashes']
-      elif word[0] == 'a':
+      elif Ruby.is_18 and word[0] == 'a':
         return ['arrays']
 
   def print_nodes (self):
     nodes = ZeroDict()
 
     for (obj, type) in self.live_objects():
-      if type == 0x3f:
-        nodes[ (int(obj['as']['node']['flags']) >> 12) & 0xff ] += 1
+      if type == RubyObjects.ITYPES['node']:
+        if Ruby.is_18:
+          # for performance only, the 1.9 path below will work as well
+          # but requires a call to gdb.parse_and_eval
+          type = (int(obj['as']['node']['flags']) >> 12) & 0xff
+        else:
+          type = int(gdb.parse_and_eval('nd_type(%s)' % obj))
+        nodes[ type ] += 1
 
     for (node, num) in sorted(nodes.items(), key=lambda(k,v):(v,k)):
       print "% 8d %s" % (num, gdb.parse_and_eval('(enum node_type) (%d)' % node))
@@ -295,11 +304,11 @@ class RubyObjects (gdb.Command):
     bytes = 0
 
     for (obj, type) in self.live_objects():
-      if type == 0x7:
+      if type == RubyObjects.ITYPES['string']:
         s = obj['as']['string']
-        ptr = s['ptr']
-        if ptr:
-          bytes += s['len']
+        ptr = Ruby.is_18 and s['ptr'] or gdb.parse_and_eval('RSTRING_PTR(%s)' % obj)
+        if ptr != None:
+          bytes += (Ruby.is_18 and s['len'] or int(gdb.parse_and_eval('RSTRING_LEN(%s)' % obj)))
           try:
             strings[ ptr.string() ] += 1
           except:
@@ -310,7 +319,7 @@ class RubyObjects (gdb.Command):
 
     print
     print "% 9d" % len(strings), "unique strings"
-    print "% 9d" % bytes, "bytes"
+    print "% 9d" % bytes, "bytes (this double counts shared strings)"
     print
 
   def print_hashes (self):
@@ -367,7 +376,7 @@ class RubyObjects (gdb.Command):
     for (obj, flags) in self.all_objects():
       if flags:
         live += 1
-        types[ int(flags & 0x3f) ] += 1
+        types[ int(flags & RubyObjects.T_MASK) ] += 1
       else:
         free += 1
 
@@ -399,7 +408,7 @@ class RubyObjects (gdb.Command):
   def live_objects (self):
     for (obj, flags) in self.all_objects():
       if flags:
-        yield obj, int(flags & 0x3f)
+        yield obj, int(flags & RubyObjects.T_MASK)
 
   def obj_type (self, type):
     return RubyObjects.TYPES.get(type, 'unknown')
@@ -450,104 +459,187 @@ class RubyEval (gdb.Command):
 
   def invoke (self, arg, from_tty):
     self.dont_repeat()
+    # check if rb_during_gc
     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()
+    print gdb.parse_and_eval("RSTRING_PTR(rb_eval_string_protect(\"begin; (%s).inspect; rescue Exception => e; e.inspect; end\", 0))" % arg).string()
 
 
 ##
-# Create GDB commands
+# Create common GDB commands
 
 Ruby()
-RubyThreads()
-RubyTrace()
-RubyObjects()
-RubyMethodCache()
-RubyPrint()
 RubyEval()
+RubyObjects()
 
 ##
-# Detect MRI vs REE
+# Detect ruby version
 
 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
+# Common macros for 1.8 and 1.9
 
 macros = """
-  macro define R_CAST(st)   (struct st*)
-  macro define RNODE(obj)  (R_CAST(RNode)(obj))
-  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)
-  macro define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
-  macro define nd_type(n) ((int)(((RNODE(n))->flags>>FL_USHIFT)&0xff))
-
-  macro define T_MASK   0x3f
-  macro define BUILTIN_TYPE(x) (((struct RBasic*)(x))->flags & T_MASK)
-
-  macro define WAIT_FD (1<<0)
-  macro define WAIT_SELECT (1<<1)
-  macro define WAIT_TIME (1<<2)
-  macro define WAIT_JOIN (1<<3)
-  macro define WAIT_PID (1<<4)
-
-  macro define RUBY_EVENT_CALL     0x08
-  macro define RUBY_EVENT_C_CALL   0x20
-""".split("\n")
+  #define R_CAST(st)   (struct st*)
+  #define RBASIC(obj)  (R_CAST(RBasic)(obj))
+  #define RSTRING(obj) (R_CAST(RString)(obj))
+  #define RNODE(obj)  (R_CAST(RNode)(obj))
+
+  #define FL_USER0     (((VALUE)1)<<(FL_USHIFT+0))
+  #define FL_USER1     (((VALUE)1)<<(FL_USHIFT+1))
+  #define FL_USER2     (((VALUE)1)<<(FL_USHIFT+2))
+  #define FL_USER3     (((VALUE)1)<<(FL_USHIFT+3))
+  #define FL_USER4     (((VALUE)1)<<(FL_USHIFT+4))
+  #define FL_USER5     (((VALUE)1)<<(FL_USHIFT+5))
+  #define FL_USER6     (((VALUE)1)<<(FL_USHIFT+6))
+  #define FL_USER7     (((VALUE)1)<<(FL_USHIFT+7))
+  #define FL_USER8     (((VALUE)1)<<(FL_USHIFT+8))
+"""
+
+##
+# Constants
+
+Ruby.is_18  = False
+Ruby.is_19  = False
+Ruby.is_ree = False
+
+##
+# Version specific macros and commands
+
+if re.search('1\.9\.\d', ruby):
+  Ruby.is_19 = True
+  RubyObjects.T_MASK = 0x1f
+
+  ##
+  # Common 1.9 macros
+  macros += """
+    #define NODE_TYPESHIFT 8
+    #define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
+    #define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
 
-for m in macros:
+    #define RSTRING_NOEMBED FL_USER1
+    #define RSTRING_PTR(str) (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? RSTRING(str)->as.ary : RSTRING(str)->as.heap.ptr)
+    #define RSTRING_EMBED_LEN_MASK (FL_USER2|FL_USER3|FL_USER4|FL_USER5|FL_USER6)
+    #define RSTRING_EMBED_LEN_SHIFT (FL_USHIFT+2)
+    #define RSTRING_LEN(str) (!(RBASIC(str)->flags & RSTRING_NOEMBED) ?  (long)((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT)) : RSTRING(str)->as.heap.len)
+
+    #define FL_USHIFT    12
+
+    #define GET_VM() ruby_current_vm
+    #define rb_objspace (*GET_VM()->objspace)
+    #define objspace rb_objspace
+
+    #define heaps     objspace->heap.ptr
+    #define heaps_length    objspace->heap.length
+    #define heaps_used    objspace->heap.used
+  """
+
+else:
+  Ruby.is_18 = True
+  RubyObjects.T_MASK = 0x3f
+
+  ##
+  # 1.8 specific ruby commands
+  RubyThreads()
+  RubyTrace()
+  RubyMethodCache()
+  RubyPrint()
+
+  ##
+  # Detect REE vs MRI
+  if re.search('Enterprise', ruby):
+    Ruby.is_ree = True
+    macros += """
+      #define FL_USHIFT   12
+    """
+  else:
+    macros += """
+      #define FL_USHIFT   11
+    """
+
+  ##
+  # Common 1.8 macros
+  macros += """
+    #define RSTRING_PTR(obj) (RSTRING(obj)->ptr)
+    #define CHAR_BIT 8
+    #define NODE_LSHIFT (FL_USHIFT+8)
+    #define NODE_LMASK  (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1)
+    #define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
+    #define nd_type(n) ((int)(((RNODE(n))->flags>>FL_USHIFT)&0xff))
+
+    #define T_MASK   0x3f
+    #define BUILTIN_TYPE(x) (((struct RBasic*)(x))->flags & T_MASK)
+
+    #define WAIT_FD (1<<0)
+    #define WAIT_SELECT (1<<1)
+    #define WAIT_TIME (1<<2)
+    #define WAIT_JOIN (1<<3)
+    #define WAIT_PID (1<<4)
+
+    #define RUBY_EVENT_CALL     0x08
+    #define RUBY_EVENT_C_CALL   0x20
+  """
+
+##
+# Execute macro definitions
+
+for m in macros.split("\n"):
   if len(m.strip()) > 0:
-    gdb.execute(m)
+    gdb.execute(m.replace('#', 'macro ', 1))
 
 ##
 # Define types
 
-types = """
-  T_NONE   0x00
-
-  T_NIL    0x01
-  T_OBJECT 0x02
-  T_CLASS  0x03
-  T_ICLASS 0x04
-  T_MODULE 0x05
-  T_FLOAT  0x06
-  T_STRING 0x07
-  T_REGEXP 0x08
-  T_ARRAY  0x09
-  T_FIXNUM 0x0a
-  T_HASH   0x0b
-  T_STRUCT 0x0c
-  T_BIGNUM 0x0d
-  T_FILE   0x0e
-
-  T_TRUE   0x20
-  T_FALSE  0x21
-  T_DATA   0x22
-  T_MATCH  0x23
-  T_SYMBOL 0x24
-
-  T_BLKTAG 0x3b
-  T_UNDEF  0x3c
-  T_VARMAP 0x3d
-  T_SCOPE  0x3e
-  T_NODE   0x3f
-""".split("\n")
-
 RubyObjects.TYPES = {}
 
-for t in types:
-  if len(t.strip()) > 0:
-    name, val = t.split()
-    gdb.execute("macro define %s %s" % (name, val))
-    RubyObjects.TYPES[int(val,16)] = name[2:].lower()
+if Ruby.is_19:
+  for t in gdb.lookup_type('enum ruby_value_type').fields():
+    name = t.name
+    val  = int(gdb.parse_and_eval(name))
+    gdb.execute("macro define %s %s" % (name[5:], val))
+    RubyObjects.TYPES[val] = name[7:].lower()
+else:
+  types = """
+    T_NONE   0x00
+
+    T_NIL    0x01
+    T_OBJECT 0x02
+    T_CLASS  0x03
+    T_ICLASS 0x04
+    T_MODULE 0x05
+    T_FLOAT  0x06
+    T_STRING 0x07
+    T_REGEXP 0x08
+    T_ARRAY  0x09
+    T_FIXNUM 0x0a
+    T_HASH   0x0b
+    T_STRUCT 0x0c
+    T_BIGNUM 0x0d
+    T_FILE   0x0e
+
+    T_TRUE   0x20
+    T_FALSE  0x21
+    T_DATA   0x22
+    T_MATCH  0x23
+    T_SYMBOL 0x24
+
+    T_BLKTAG 0x3b
+    T_UNDEF  0x3c
+    T_VARMAP 0x3d
+    T_SCOPE  0x3e
+    T_NODE   0x3f
+  """.split("\n")
+
+  for t in types:
+    if len(t.strip()) > 0:
+      name, val = t.split()
+      gdb.execute("macro define %s %s" % (name, val))
+      RubyObjects.TYPES[int(val,16)] = name[2:].lower()
+
+RubyObjects.ITYPES = dict([[v,k] for k,v in RubyObjects.TYPES.items()])
 
 ##
 # Set GDB options

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gdb.rb
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2010-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: A set of gdb7 extensions for the MRI/REE 1.8.x interpreter
+description: A set of gdb7 extensions for the MRI/REE 1.8.x interpreter (and basic support for YARV 1.9.2)
 email: gdb@tmm1.net
 executables: 
 - gdb.rb
@@ -47,29 +46,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: gdb-rb
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: gdb hooks for MRI and REE
+summary: gdb hooks for MRI/REE and YARV
 test_files: []