gdb: remove TYPE_FIELD_TYPE macro

[binutils.git] / gdb / python / py-infevents.c

diff --git a/gdb/python/py-infevents.c b/gdb/python/py-infevents.c
index beb0598ab94743f680be76defd30897d60ddb49a..291cb274424180bcd9fb804dd8b55fb69d71052c 100644 (file)
--- a/gdb/python/py-infevents.c
+++ b/gdb/python/py-infevents.c
@@ -1,6 +1,6 @@
 /* Python interface to inferior function events.
 
 /* Python interface to inferior function events.
 

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

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


@@ -20,30 +20,14 @@
 #include "defs.h"
 #include "py-event.h"
 
 #include "defs.h"
 #include "py-event.h"
 

-static PyTypeObject inferior_call_pre_event_object_type
-    CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("event_object");
-static PyTypeObject inferior_call_post_event_object_type
-    CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("event_object");
-static PyTypeObject register_changed_event_object_type
-    CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("event_object");
-static PyTypeObject memory_changed_event_object_type
-    CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("event_object");
-

 /* Construct either a gdb.InferiorCallPreEvent or a
    gdb.InferiorCallPostEvent. */
 
 /* Construct either a gdb.InferiorCallPreEvent or a
    gdb.InferiorCallPostEvent. */
 

-static PyObject *
+static gdbpy_ref<>

 create_inferior_call_event_object (inferior_call_kind flag, ptid_t ptid,
                                   CORE_ADDR addr)
 {
 create_inferior_call_event_object (inferior_call_kind flag, ptid_t ptid,
                                   CORE_ADDR addr)
 {

-  int pid;
-  long tid, lwp;
-  PyObject *event;
-  PyObject *ptid_obj = NULL;
-  PyObject *addr_obj = NULL;
-  int failed;
-  struct cleanup *cleanups;
-  struct cleanup *member_cleanups;
+  gdbpy_ref<> event;

 
   switch (flag)
     {
 
   switch (flag)
     {


@@ -54,129 +38,80 @@ create_inferior_call_event_object (inferior_call_kind flag, ptid_t ptid,
       event = create_event_object (&inferior_call_post_event_object_type);
       break;
     default:
       event = create_event_object (&inferior_call_post_event_object_type);
       break;
     default:

-      return NULL;
+      gdb_assert_not_reached ("invalid inferior_call_kind");

     }
 
     }
 

-  cleanups = make_cleanup_py_decref (event);
-
-  ptid_obj = gdbpy_create_ptid_object (ptid);
+  gdbpy_ref<> ptid_obj (gdbpy_create_ptid_object (ptid));

   if (ptid_obj == NULL)
   if (ptid_obj == NULL)

-    goto fail;
-  member_cleanups = make_cleanup_py_decref (ptid_obj);
+    return NULL;

 
 

-  failed = evpy_add_attribute (event, "ptid", ptid_obj) < 0;
-  if (failed)
-    goto fail;
+  if (evpy_add_attribute (event.get (), "ptid", ptid_obj.get ()) < 0)
+    return NULL;

 
 

-  addr_obj = PyLong_FromLongLong (addr);
+  gdbpy_ref<> addr_obj (PyLong_FromLongLong (addr));

   if (addr_obj == NULL)
   if (addr_obj == NULL)

-    goto fail;
-  make_cleanup_py_decref (addr_obj);
+    return NULL;

 
 

-  failed = evpy_add_attribute (event, "address", addr_obj) < 0;
-  if (failed)
-    goto fail;
+  if (evpy_add_attribute (event.get (), "address", addr_obj.get ()) < 0)
+    return NULL;

 
 

-  do_cleanups (member_cleanups);
-  discard_cleanups (cleanups);

   return event;
   return event;

-
- fail:
-  do_cleanups (cleanups);
-  return NULL;

 }
 
 /* Construct a gdb.RegisterChangedEvent containing the affected
    register number. */
 
 }
 
 /* Construct a gdb.RegisterChangedEvent containing the affected
    register number. */
 

-static PyObject *
+static gdbpy_ref<>

 create_register_changed_event_object (struct frame_info *frame, 
                                      int regnum)
 {
 create_register_changed_event_object (struct frame_info *frame, 
                                      int regnum)
 {

-  PyObject *event;
-  PyObject *frame_obj = NULL;
-  PyObject *regnum_obj = NULL;
-  int failed;
-  struct cleanup *cleanups;
-  struct cleanup *member_cleanups;
-
-  event = create_event_object (&register_changed_event_object_type);
+  gdbpy_ref<> event = create_event_object (&register_changed_event_object_type);

   if (event == NULL)
     return NULL;
 
   if (event == NULL)
     return NULL;
 

-  cleanups = make_cleanup_py_decref (event);
-
-  frame_obj = frame_info_to_frame_object (frame);
+  gdbpy_ref<> frame_obj (frame_info_to_frame_object (frame));

   if (frame_obj == NULL)
   if (frame_obj == NULL)

-    goto fail;
-  member_cleanups = make_cleanup_py_decref (frame_obj);
+    return NULL;

 
 

-  failed = evpy_add_attribute (event, "frame", frame_obj) < 0;
-  if (failed)
-    goto fail;
+  if (evpy_add_attribute (event.get (), "frame", frame_obj.get ()) < 0)
+    return NULL;

 
 

-  regnum_obj = PyLong_FromLongLong (regnum);
+  gdbpy_ref<> regnum_obj (PyLong_FromLongLong (regnum));

   if (regnum_obj == NULL)
   if (regnum_obj == NULL)

-    goto fail;
-  make_cleanup_py_decref (regnum_obj);
+    return NULL;

 
 

-  failed = evpy_add_attribute (event, "regnum", regnum_obj) < 0;
-  if (failed)
-    goto fail;
+  if (evpy_add_attribute (event.get (), "regnum", regnum_obj.get ()) < 0)
+    return NULL;

 
 

-  do_cleanups (member_cleanups);
-  discard_cleanups (cleanups);

   return event;
   return event;

-
- fail:
-  do_cleanups (cleanups);
-  return NULL;

 }
 
 /* Construct a gdb.MemoryChangedEvent describing the extent of the
    affected memory. */
 
 }
 
 /* Construct a gdb.MemoryChangedEvent describing the extent of the
    affected memory. */
 

-static PyObject *
+static gdbpy_ref<>

 create_memory_changed_event_object (CORE_ADDR addr, ssize_t len)
 {
 create_memory_changed_event_object (CORE_ADDR addr, ssize_t len)
 {

-  PyObject *event;
-  PyObject *addr_obj = NULL;
-  PyObject *len_obj = NULL;
-  int failed;
-  struct cleanup *cleanups;
-  struct cleanup *member_cleanups;
-
-  event = create_event_object (&memory_changed_event_object_type);
+  gdbpy_ref<> event = create_event_object (&memory_changed_event_object_type);

 
   if (event == NULL)
     return NULL;
 
   if (event == NULL)
     return NULL;

-  cleanups = make_cleanup_py_decref (event);

 
 

-  addr_obj = PyLong_FromLongLong (addr);
+  gdbpy_ref<> addr_obj (PyLong_FromLongLong (addr));

   if (addr_obj == NULL)
   if (addr_obj == NULL)

-    goto fail;
-  member_cleanups = make_cleanup_py_decref (addr_obj);
+    return NULL;

 
 

-  failed = evpy_add_attribute (event, "address", addr_obj) < 0;
-  if (failed)
-    goto fail;
+  if (evpy_add_attribute (event.get (), "address", addr_obj.get ()) < 0)
+    return NULL;

 
 

-  len_obj = PyLong_FromLong (len);
+  gdbpy_ref<> len_obj (PyLong_FromLong (len));

   if (len_obj == NULL)
   if (len_obj == NULL)

-    goto fail;
-  make_cleanup_py_decref (len_obj);
+    return NULL;

 
 

-  failed = evpy_add_attribute (event, "length", len_obj) < 0;
-  if (failed)
-    goto fail;
+  if (evpy_add_attribute (event.get (), "length", len_obj.get ()) < 0)
+    return NULL;

 
 

-  do_cleanups (member_cleanups);
-  discard_cleanups (cleanups);

   return event;
   return event;

-
- fail:
-  do_cleanups (cleanups);
-  return NULL;

 }
 
 /* Callback function which notifies observers when an event occurs which
 }
 
 /* Callback function which notifies observers when an event occurs which


@@ -188,14 +123,12 @@ int
 emit_inferior_call_event (inferior_call_kind flag, ptid_t thread,
                          CORE_ADDR addr)
 {
 emit_inferior_call_event (inferior_call_kind flag, ptid_t thread,
                          CORE_ADDR addr)
 {

-  PyObject *event;
-

   if (evregpy_no_listeners_p (gdb_py_events.inferior_call))
     return 0;
 
   if (evregpy_no_listeners_p (gdb_py_events.inferior_call))
     return 0;
 

-  event = create_inferior_call_event_object (flag, thread, addr);
+  gdbpy_ref<> event = create_inferior_call_event_object (flag, thread, addr);

   if (event != NULL)
   if (event != NULL)

-    return evpy_emit_event (event, gdb_py_events.inferior_call);
+    return evpy_emit_event (event.get (), gdb_py_events.inferior_call);

   return -1;
 }
 
   return -1;
 }
 


@@ -205,14 +138,12 @@ emit_inferior_call_event (inferior_call_kind flag, ptid_t thread,
 int
 emit_memory_changed_event (CORE_ADDR addr, ssize_t len)
 {
 int
 emit_memory_changed_event (CORE_ADDR addr, ssize_t len)
 {

-  PyObject *event;
-

   if (evregpy_no_listeners_p (gdb_py_events.memory_changed))
     return 0;
 
   if (evregpy_no_listeners_p (gdb_py_events.memory_changed))
     return 0;
 

-  event = create_memory_changed_event_object (addr, len);
+  gdbpy_ref<> event = create_memory_changed_event_object (addr, len);

   if (event != NULL)
   if (event != NULL)

-    return evpy_emit_event (event, gdb_py_events.memory_changed);
+    return evpy_emit_event (event.get (), gdb_py_events.memory_changed);

   return -1;
 }
 
   return -1;
 }
 


@@ -222,42 +153,11 @@ emit_memory_changed_event (CORE_ADDR addr, ssize_t len)
 int
 emit_register_changed_event (struct frame_info* frame, int regnum)
 {
 int
 emit_register_changed_event (struct frame_info* frame, int regnum)
 {

-  PyObject *event;
-

   if (evregpy_no_listeners_p (gdb_py_events.register_changed))
     return 0;
 
   if (evregpy_no_listeners_p (gdb_py_events.register_changed))
     return 0;
 

-  event = create_register_changed_event_object (frame, regnum);
+  gdbpy_ref<> event = create_register_changed_event_object (frame, regnum);

   if (event != NULL)
   if (event != NULL)

-    return evpy_emit_event (event, gdb_py_events.register_changed);
+    return evpy_emit_event (event.get (), gdb_py_events.register_changed);

   return -1;
 }
   return -1;
 }

-
-
-GDBPY_NEW_EVENT_TYPE (inferior_call_pre,
-                     "gdb.InferiorCallPreEvent",
-                     "InferiorCallPreEvent",
-                     "GDB inferior function pre-call event object",
-                     event_object_type,
-                     static);
-
-GDBPY_NEW_EVENT_TYPE (inferior_call_post,
-                     "gdb.InferiorCallPostEvent",
-                     "InferiorCallPostEvent",
-                     "GDB inferior function post-call event object",
-                     event_object_type,
-                     static);
-
-GDBPY_NEW_EVENT_TYPE (register_changed,
-                     "gdb.RegisterChangedEvent",
-                     "RegisterChangedEvent",
-                     "GDB register change event object",
-                     event_object_type,
-                     static);
-
-GDBPY_NEW_EVENT_TYPE (memory_changed,
-                     "gdb.MemoryChangedEvent",
-                     "MemoryChangedEvent",
-                     "GDB memory change event object",
-                     event_object_type,
-                     static);