* python/py-arch.c (gdbpy_initialize_arch): Use

[binutils.git] / gdb / python / py-lazy-string.c

diff --git a/gdb/python/py-lazy-string.c b/gdb/python/py-lazy-string.c
index ebe0a99a3b02c15873368edeafc9c1976a7c5f52..ea193a97f6e67433ecc02f559b03341d06ca061f 100644 (file)
--- a/gdb/python/py-lazy-string.c
+++ b/gdb/python/py-lazy-string.c
@@ -1,6 +1,6 @@
 /* Python interface to lazy strings.
 
 /* Python interface to lazy strings.
 

-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2013 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -24,6 +24,7 @@
 #include "exceptions.h"
 #include "valprint.h"
 #include "language.h"
 #include "exceptions.h"
 #include "valprint.h"
 #include "language.h"

+#include "gdb_assert.h"

 
 typedef struct {
   PyObject_HEAD
 
 typedef struct {
   PyObject_HEAD


@@ -46,13 +47,15 @@ typedef struct {
   struct type *type;
 } lazy_string_object;
 
   struct type *type;
 } lazy_string_object;
 

-static PyTypeObject lazy_string_object_type;
+static PyTypeObject lazy_string_object_type
+    CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("lazy_string_object");

 
 static PyObject *
 stpy_get_address (PyObject *self, void *closure)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;
 
 static PyObject *
 stpy_get_address (PyObject *self, void *closure)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;

-  return PyLong_FromUnsignedLongLong (self_string->address);
+
+  return gdb_py_long_from_ulongest (self_string->address);

 }
 
 static PyObject *
 }
 
 static PyObject *


@@ -78,13 +81,15 @@ static PyObject *
 stpy_get_length (PyObject *self, void *closure)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;
 stpy_get_length (PyObject *self, void *closure)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;

+

   return PyLong_FromLong (self_string->length);
 }
 
   return PyLong_FromLong (self_string->length);
 }
 

-PyObject *
+static PyObject *

 stpy_get_type (PyObject *self, void *closure)
 {
   lazy_string_object *str_obj = (lazy_string_object *) self;
 stpy_get_type (PyObject *self, void *closure)
 {
   lazy_string_object *str_obj = (lazy_string_object *) self;

+

   return type_to_type_object (str_obj->type);
 }
 
   return type_to_type_object (str_obj->type);
 }
 


@@ -92,16 +97,22 @@ static PyObject *
 stpy_convert_to_value  (PyObject *self, PyObject *args)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;
 stpy_convert_to_value  (PyObject *self, PyObject *args)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;

-  struct value *val;
+  struct value *val = NULL;
+  volatile struct gdb_exception except;

 
   if (self_string->address == 0)
     {
       PyErr_SetString (PyExc_MemoryError,
 
   if (self_string->address == 0)
     {
       PyErr_SetString (PyExc_MemoryError,

-                      _("Cannot create a value from NULL"));
+                      _("Cannot create a value from NULL."));

       return NULL;
     }
 
       return NULL;
     }
 

-  val = value_at_lazy (self_string->type, self_string->address);
+  TRY_CATCH (except, RETURN_MASK_ALL)
+    {
+      val = value_at_lazy (self_string->type, self_string->address);
+    }
+  GDB_PY_HANDLE_EXCEPTION (except);
+

   return value_to_value_object (val);
 }
 
   return value_to_value_object (val);
 }
 


@@ -109,6 +120,7 @@ static void
 stpy_dealloc (PyObject *self)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;
 stpy_dealloc (PyObject *self)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;

+

   xfree (self_string->encoding);
 }
 
   xfree (self_string->encoding);
 }
 


@@ -129,7 +141,7 @@ gdbpy_create_lazy_string_object (CORE_ADDR address, long length,
   if (!type)
     {
       PyErr_SetString (PyExc_RuntimeError,
   if (!type)
     {
       PyErr_SetString (PyExc_RuntimeError,

-                      "A lazy string's type cannot be NULL.");
+                      _("A lazy string's type cannot be NULL."));

       return NULL;
     }
 
       return NULL;
     }
 


@@ -148,13 +160,14 @@ gdbpy_create_lazy_string_object (CORE_ADDR address, long length,
   return (PyObject *) str_obj;
 }
 
   return (PyObject *) str_obj;
 }
 

-void
+int

 gdbpy_initialize_lazy_string (void)
 {
   if (PyType_Ready (&lazy_string_object_type) < 0)
 gdbpy_initialize_lazy_string (void)
 {
   if (PyType_Ready (&lazy_string_object_type) < 0)

-    return;
+    return -1;

 
   Py_INCREF (&lazy_string_object_type);
 
   Py_INCREF (&lazy_string_object_type);

+  return 0;

 }
 
 /* Determine whether the printer object pointed to by OBJ is a
 }
 
 /* Determine whether the printer object pointed to by OBJ is a


@@ -165,86 +178,26 @@ gdbpy_is_lazy_string (PyObject *result)
   return PyObject_TypeCheck (result, &lazy_string_object_type);
 }
 
   return PyObject_TypeCheck (result, &lazy_string_object_type);
 }
 

-/* Extract and return the actual string from the lazy string object
-   STRING.  Addtionally, the string type is written to *STR_TYPE, the
-   string length is written to *LENGTH, and the string encoding is
-   written to *ENCODING.  On error, NULL is returned.  The caller is
-   responsible for freeing the returned buffer.  */
-gdb_byte *
-gdbpy_extract_lazy_string (PyObject *string, struct type **str_type,
-                    long *length, char **encoding)
-{
-  int width;
-  int bytes_read;
-  gdb_byte *buffer = NULL;
-  int errcode = 0;
-  CORE_ADDR addr;
-  struct gdbarch *gdbarch;
-  enum bfd_endian byte_order;
-  PyObject *py_len = NULL, *py_encoding = NULL; 
-  PyObject *py_addr = NULL, *py_type = NULL;
-  volatile struct gdb_exception except;
-
-  py_len = PyObject_GetAttrString (string, "length");
-  py_encoding = PyObject_GetAttrString (string, "encoding");
-  py_addr = PyObject_GetAttrString (string, "address");
-  py_type = PyObject_GetAttrString (string, "type");
-
-  /* A NULL encoding, length, address or type is not ok.  */
-  if (!py_len || !py_encoding || !py_addr || !py_type)
-    goto error;
-
-  *length = PyLong_AsLong (py_len);
-  addr = PyLong_AsUnsignedLongLong (py_addr);
+/* Extract the parameters from the lazy string object STRING.
+   ENCODING will either be set to NULL, or will be allocated with
+   xmalloc, in which case the callers is responsible for freeing
+   it.  */

 
 

-  /* If the user supplies Py_None an encoding, set encoding to NULL.
-     This will trigger the resulting LA_PRINT_CALL to automatically
-     select an encoding.  */
-  if (py_encoding == Py_None)
-    *encoding = NULL;
-  else
-    *encoding = xstrdup (PyString_AsString (py_encoding));
-
-  *str_type = type_object_to_type (py_type);
-  gdbarch = get_type_arch (*str_type);
-  byte_order = gdbarch_byte_order (gdbarch);
-  width = TYPE_LENGTH (*str_type);
+void
+gdbpy_extract_lazy_string (PyObject *string, CORE_ADDR *addr,
+                          struct type **str_type,
+                          long *length, char **encoding)
+{
+  lazy_string_object *lazy;

 
 

-  TRY_CATCH (except, RETURN_MASK_ALL)
-    {
-      errcode = read_string (addr, *length, width,
-                            *length, byte_order, &buffer,
-                            &bytes_read);
-    }
-  if (except.reason < 0)
-    {
-      PyErr_Format (except.reason == RETURN_QUIT                       \
-                   ? PyExc_KeyboardInterrupt : PyExc_RuntimeError,     \
-                   "%s", except.message);                              \
-      goto error;
+  gdb_assert (gdbpy_is_lazy_string (string));

 
 

-    }
+  lazy = (lazy_string_object *) string;

 
 

-  if (errcode)
-    goto error;
-
-  *length = bytes_read / width;
-
-  Py_DECREF (py_encoding);
-  Py_DECREF (py_len);
-  Py_DECREF (py_addr);
-  Py_DECREF (py_type);
-  return buffer;
-
- error:
-  Py_XDECREF (py_encoding);
-  Py_XDECREF (py_len);
-  Py_XDECREF (py_addr);
-  Py_XDECREF (py_type);
-  xfree (buffer);
-  *length = 0;
-  *str_type = NULL;
-  return NULL;
+  *addr = lazy->address;
+  *str_type = lazy->type;
+  *length = lazy->length;
+  *encoding = lazy->encoding ? xstrdup (lazy->encoding) : NULL;

 }
 
 \f
 }
 
 \f


@@ -265,8 +218,7 @@ static PyGetSetDef lazy_string_object_getset[] = {
 };
 
 static PyTypeObject lazy_string_object_type = {
 };
 
 static PyTypeObject lazy_string_object_type = {

-  PyObject_HEAD_INIT (NULL)
-  0,                             /*ob_size*/
+  PyVarObject_HEAD_INIT (NULL, 0)

   "gdb.LazyString",              /*tp_name*/
   sizeof (lazy_string_object),   /*tp_basicsize*/
   0,                             /*tp_itemsize*/
   "gdb.LazyString",              /*tp_name*/
   sizeof (lazy_string_object),   /*tp_basicsize*/
   0,                             /*tp_itemsize*/