Merge GDB 7.5.1

gdb/python/py-utils.c

 /* General utility routines for GDB/Python.
 
    Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 121 matching lines @@
 unicode_to_target_string (PyObject *unicode_str)
 {
   return unicode_to_encoded_string (unicode_str,
                                     target_charset (python_gdbarch));
 }
 
 /* Returns a PyObject with the contents of the given unicode string
    object converted to the target's charset.  If an error occurs
    during the conversion, NULL will be returned and a python exception
    will be set.  */
-PyObject *
+static PyObject *
 unicode_to_target_python_string (PyObject *unicode_str)
 {
   return unicode_to_encoded_python_string (unicode_str,
                                            target_charset (python_gdbarch));
 }
 
 /* Converts a python string (8-bit or unicode) to a target string in
    the target's charset.  Returns NULL on error, with a python exception set.
 
    The caller is responsible for xfree'ing the string.  */
@@ skipping 213 matching lines @@
 
 /* Like PyInt_AsLong, but returns 0 on failure, 1 on success, and puts
    the value into an out parameter.  */
 
 int
 gdb_py_int_as_long (PyObject *obj, long *result)
 {
   *result = PyInt_AsLong (obj);
   return ! (*result == -1 && PyErr_Occurred ());
 }
+
+
+
+/* Generic implementation of the __dict__ attribute for objects that
+   have a dictionary.  The CLOSURE argument should be the type object.
+   This only handles positive values for tp_dictoffset.  */
+
+PyObject *
+gdb_py_generic_dict (PyObject *self, void *closure)
+{
+  PyObject *result;
+  PyTypeObject *type_obj = closure;
+  char *raw_ptr;
+
+  raw_ptr = (char *) self + type_obj->tp_dictoffset;
+  result = * (PyObject **) raw_ptr;
+
+  Py_INCREF (result);
+  return result;
+}