Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use positional parameters in calls to .format in gdb python scripts (#9292) #9311

Merged
merged 1 commit into from Jun 26, 2018
Merged

Use positional parameters in calls to .format in gdb python scripts (#9292) #9311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions data/gdb-pre7.0/mono-gdb.py
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ def stringify_class_name(ns, name):
if ns == "":
return name
else:
return "{}.{}".format (ns, name)
return "{0}.{1}".format (ns, name)

class ArrayPrinter:
"Print a C# array"
Expand All @@ -66,7 +66,7 @@ def __init__(self, val, class_ns, class_name):
def to_string(self):
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
length = obj ['max_length']
return "{} [{}]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
return "{0} [{1}]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))

class ObjectPrinter:
"Print a C# object"
Expand Down Expand Up @@ -96,7 +96,7 @@ def next(self):
return (field.name, self.obj [field.name])
except:
# Superclass
return (field.name, self.obj.cast (gdb.lookup_type ("{}".format (field.name))))
return (field.name, self.obj.cast (gdb.lookup_type ("{0}".format (field.name))))

def children(self):
# FIXME: It would be easier if gdb.Value would support iteration itself
Expand All @@ -109,7 +109,7 @@ def children(self):
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
if class_name [-2:len(class_name)] == "[]":
return {}.__iter__ ()
gdb_type = gdb.lookup_type ("struct {}_{}".format (class_ns.replace (".", "_"), class_name))
gdb_type = gdb.lookup_type ("struct {0}_{1}".format (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
print (sys.exc_info ()[0])
Expand All @@ -129,12 +129,12 @@ def to_string(self):
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
if class_ns != "":
try:
gdb_type = gdb.lookup_type ("struct {}.{}".format (class_ns, class_name))
gdb_type = gdb.lookup_type ("struct {0}.{1}".format (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "{}.{}".format (class_ns, class_name)
return "{0}.{1}".format (class_ns, class_name)
#return obj.cast (gdb_type)
return "{}.{}".format (class_ns, class_name)
return "{0}.{1}".format (class_ns, class_name)
return class_name
except:
print (sys.exc_info ()[0])
Expand All @@ -154,9 +154,9 @@ def to_string(self):
val = self.val.dereference ()
klass = val ["klass"].dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"{}:{} ()\"".format (class_name, val ["name"].string ())
return "\"{0}:{1} ()\"".format (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"{}\"".format (gdb.parse_and_eval ("mono_method_full_name ({}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_method_full_name ({0}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())

class MonoClassPrinter:
"Print a MonoClass structure"
Expand All @@ -169,9 +169,9 @@ def to_string(self):
return "0x0"
klass = self.val.dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"{}\"".format (class_name)
return "\"{0}\"".format (class_name)
# This returns more info but requires calling into the inferior
#return "\"{}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){0})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))

def lookup_pretty_printer(val):
t = str (val.type)
Expand Down Expand Up @@ -245,4 +245,4 @@ def invoke(self, arg, from_tty):
if os.stat (exec_file).st_size != os.lstat (exec_file).st_size:
exec_file = os.readlink (exec_file)
exec_dir = os.path.dirname (exec_file)
gdb.execute ("source {}/{}-gdbinit".format (exec_dir, os.path.basename (exec_file)))
gdb.execute ("source {0}/{1}-gdbinit".format (exec_dir, os.path.basename (exec_file)))
32 changes: 16 additions & 16 deletions data/gdb/mono-gdb.py
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@ def stringify_class_name(ns, name):
if ns == "":
return name
else:
return "{}.{}".format (ns, name)
return "{0}.{1}".format (ns, name)

class ArrayPrinter:
"Print a C# array"
Expand All @@ -61,7 +61,7 @@ def __init__(self, val, class_ns, class_name):
def to_string(self):
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
length = obj ['max_length']
return "{} [{}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
return "{0} [{1}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))

class ObjectPrinter:
"Print a C# object"
Expand Down Expand Up @@ -91,7 +91,7 @@ def next(self):
return (field.name, self.obj [field.name])
except:
# Superclass
return (field.name, self.obj.cast (gdb.lookup_type ("{}".format (field.name))))
return (field.name, self.obj.cast (gdb.lookup_type ("{0}".format (field.name))))

def children(self):
# FIXME: It would be easier if gdb.Value would support iteration itself
Expand All @@ -105,7 +105,7 @@ def children(self):
if class_name [-2:len(class_name)] == "[]":
return {}.__iter__ ()
try:
gdb_type = gdb.lookup_type ("struct {}_{}".format (class_ns.replace (".", "_"), class_name))
gdb_type = gdb.lookup_type ("struct {0}_{1}".format (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
return {}.__iter__ ()
Expand All @@ -127,12 +127,12 @@ def to_string(self):
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
if class_ns != "":
try:
gdb_type = gdb.lookup_type ("struct {}.{}".format (class_ns, class_name))
gdb_type = gdb.lookup_type ("struct {0}.{1}".format (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "{}.{}".format (class_ns, class_name)
return "{0}.{1}".format (class_ns, class_name)
#return obj.cast (gdb_type)
return "{}.{}".format (class_ns, class_name)
return "{0}.{1}".format (class_ns, class_name)
return class_name
except:
print (sys.exc_info ()[0])
Expand All @@ -152,9 +152,9 @@ def to_string(self):
val = self.val.dereference ()
klass = val ["klass"].dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"{}:{} ()\"".format (class_name, val ["name"].string ())
return "\"{0}:{1} ()\"".format (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"{}\"".format (gdb.parse_and_eval ("mono_method_full_name ({}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_method_full_name ({0}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())

class MonoClassPrinter:
"Print a MonoClass structure"
Expand All @@ -168,11 +168,11 @@ def to_string_inner(self, add_quotes):
klass = self.val.dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
if add_quotes:
return "\"{}\"".format (class_name)
return "\"{0}\"".format (class_name)
else:
return class_name
# This returns more info but requires calling into the inferior
#return "\"{}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){0})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))

def to_string(self):
try:
Expand Down Expand Up @@ -220,7 +220,7 @@ def to_string_inner(self):
method_inst_str = ""
if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
method_inst_str = str(method_inst)
return "{}, [{}], [{}]>".format (container_str, class_inst_str, method_inst_str)
return "{0}, [{1}], [{2}]>".format (container_str, class_inst_str, method_inst_str)

def to_string(self):
try:
Expand Down Expand Up @@ -250,9 +250,9 @@ def to_string_inner(self, csharp):
info = str(t ["data"]["generic_class"])

if info != "":
return "{{{}, {}}}".format (kind, info)
return "{{{0}, {1}}}".format (kind, info)
else:
return "{{{}}}".format (kind)
return "{{{0}}}".format (kind)
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
Expand Down Expand Up @@ -281,7 +281,7 @@ def to_string(self):
if i > 0:
inst_str = inst_str + ", "
inst_str = inst_str + type_printer.to_string ()
return "MRGCTX[{}, [{}]]".format (klass_printer.to_string(), inst_str)
return "MRGCTX[{0}, [{1}]]".format (klass_printer.to_string(), inst_str)

class MonoVTablePrinter:
"Print a MonoVTable structure"
Expand All @@ -296,7 +296,7 @@ def to_string(self):
klass = vtable ["klass"]
klass_printer = MonoClassPrinter (klass)

return "vtable({})".format (klass_printer.to_string ())
return "vtable({0})".format (klass_printer.to_string ())

def lookup_pretty_printer(val):
t = str (val.type)
Expand Down