mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-05-25 03:06:11 +08:00

2009-02-04 Tom Tromey <tromey@redhat.com> Thiago Jung Bauermann <bauerman@br.ibm.com> Phil Muldoon <pmuldoon@redhat.com> * python/python-internal.h (gdbpy_get_value_from_history): Rename prototype to gdbpy_history. (gdbpy_is_string): Declare. (python_string_to_host_string): Declare. * python/python-utils.c (gdbpy_is_string): New function. (unicode_to_encoded_string): New function. (unicode_to_target_string): Use it. (python_string_to_host_string): New function. * python/python-value.c (valpy_address): New function. (convert_value_from_python): Use gdbpy_is_string. Change to throw Python exception instead of a GDB exception on error. Properly check Python booleans. (valpy_getitem): Convert field name to host string. Handle array accesses. Adapt to new behaviour of convert_value_from_python. (valpy_new): Adapt to new behaviour of convert_value_from_python. (enum valpy_opcode) <VALPY_LSH, VALPY_RSH, VALPY_BITAND, VALPY_BITXOR, VALPY_BITOR>: New constants. (valpy_binop): Update. Adapt to new behaviour of convert_value_from_python. (valpy_invert): New function. (valpy_lsh): Likewise. (valpy_rsh): Likewise. (valpy_and): Likewise. (valpy_or): Likewise. (valpy_xor): Likewise. (valpy_richcompare): Call convert_value_from_python instead of doing conversions itself. (is_intlike, valpy_int, valpy_long, valpy_float): New functions. (gdbpy_get_value_from_history): Rename function to gdbpy_history. (gdbpy_initialize_values): Don't set tp_new. (value_object_type): Add valpy_new. (value_object_methods): Add `address' entry. (value_object_as_number): Update for new methods. * python/python.c (GdbMethods): Rename entry from `get_value_from_history' to `history'. gdb/doc/ 2009-02-04 Tom Tromey <tromey@redhat.com> * gdb.texinfo (Basic Python): Document gdb.history. gdb/testsuite/ 2009-02-04 Tom Tromey <tromey@redhat.com> Thiago Jung Bauermann <bauerman@br.ibm.com> * gdb.python/python-value.exp: Use `gdb.history' instead of `gdb.value_from_history'. (test_value_numeric_ops): Add test for conversion of enum constant. * gdb.python/python-value.c (enum e): New type. (evalue): New global. (main): Use argv.
171 lines
4.6 KiB
C
171 lines
4.6 KiB
C
/* General utility routines for GDB/Python.
|
|
|
|
Copyright (C) 2008, 2009 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.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "charset.h"
|
|
#include "python-internal.h"
|
|
|
|
|
|
/* This is a cleanup function which decrements the refcount on a
|
|
Python object. */
|
|
|
|
static void
|
|
py_decref (void *p)
|
|
{
|
|
PyObject *py = p;
|
|
/* Note that we need the extra braces in this 'if' to avoid a
|
|
warning from gcc. */
|
|
if (py)
|
|
{
|
|
Py_DECREF (py);
|
|
}
|
|
}
|
|
|
|
/* Return a new cleanup which will decrement the Python object's
|
|
refcount when run. */
|
|
|
|
struct cleanup *
|
|
make_cleanup_py_decref (PyObject *py)
|
|
{
|
|
return make_cleanup (py_decref, (void *) py);
|
|
}
|
|
|
|
/* A cleanup function to restore the thread state. */
|
|
|
|
static void
|
|
py_gil_restore (void *p)
|
|
{
|
|
PyGILState_STATE *state = p;
|
|
PyGILState_Release (*state);
|
|
}
|
|
|
|
/* Return a new cleanup which will restore the Python GIL state. */
|
|
|
|
struct cleanup *
|
|
make_cleanup_py_restore_gil (PyGILState_STATE *state)
|
|
{
|
|
return make_cleanup (py_gil_restore, state);
|
|
}
|
|
|
|
/* Converts a Python 8-bit string to a unicode string object. Assumes the
|
|
8-bit string is in the host charset. If an error occurs during conversion,
|
|
returns NULL with a python exception set.
|
|
|
|
As an added bonus, the functions accepts a unicode string and returns it
|
|
right away, so callers don't need to check which kind of string they've
|
|
got.
|
|
|
|
If the given object is not one of the mentioned string types, NULL is
|
|
returned, with the TypeError python exception set. */
|
|
PyObject *
|
|
python_string_to_unicode (PyObject *obj)
|
|
{
|
|
PyObject *unicode_str;
|
|
|
|
/* If obj is already a unicode string, just return it.
|
|
I wish life was always that simple... */
|
|
if (PyUnicode_Check (obj))
|
|
unicode_str = obj;
|
|
else if (PyString_Check (obj))
|
|
unicode_str = PyUnicode_FromEncodedObject (obj, host_charset (), NULL);
|
|
else
|
|
{
|
|
PyErr_SetString (PyExc_TypeError,
|
|
_("Expected a string or unicode object."));
|
|
unicode_str = NULL;
|
|
}
|
|
|
|
return unicode_str;
|
|
}
|
|
|
|
/* Returns a newly allocated string with the contents of the given unicode
|
|
string object converted to CHARSET. If an error occurs during the
|
|
conversion, NULL will be returned and a python exception will be set.
|
|
|
|
The caller is responsible for xfree'ing the string. */
|
|
static char *
|
|
unicode_to_encoded_string (PyObject *unicode_str, const char *charset)
|
|
{
|
|
char *result;
|
|
PyObject *string;
|
|
|
|
/* Translate string to named charset. */
|
|
string = PyUnicode_AsEncodedString (unicode_str, charset, NULL);
|
|
if (string == NULL)
|
|
return NULL;
|
|
|
|
result = xstrdup (PyString_AsString (string));
|
|
|
|
Py_DECREF (string);
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Returns a newly allocated string 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.
|
|
|
|
The caller is responsible for xfree'ing the string. */
|
|
char *
|
|
unicode_to_target_string (PyObject *unicode_str)
|
|
{
|
|
return unicode_to_encoded_string (unicode_str, target_charset ());
|
|
}
|
|
|
|
/* 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. */
|
|
char *
|
|
python_string_to_target_string (PyObject *obj)
|
|
{
|
|
PyObject *str;
|
|
|
|
str = python_string_to_unicode (obj);
|
|
if (str == NULL)
|
|
return NULL;
|
|
|
|
return unicode_to_target_string (str);
|
|
}
|
|
|
|
/* Converts a python string (8-bit or unicode) to a target string in
|
|
the host's charset. Returns NULL on error, with a python exception set.
|
|
|
|
The caller is responsible for xfree'ing the string. */
|
|
char *
|
|
python_string_to_host_string (PyObject *obj)
|
|
{
|
|
PyObject *str;
|
|
|
|
str = python_string_to_unicode (obj);
|
|
if (str == NULL)
|
|
return NULL;
|
|
|
|
return unicode_to_encoded_string (str, host_charset ());
|
|
}
|
|
|
|
/* Return true if OBJ is a Python string or unicode object, false
|
|
otherwise. */
|
|
|
|
int
|
|
gdbpy_is_string (PyObject *obj)
|
|
{
|
|
return PyString_Check (obj) || PyUnicode_Check (obj);
|
|
}
|