[PATCH v4 08/14] introduce call_function_by_hand_dummy

Jan Kratochvil
2014-11-23T19:28:24Z

This provides a variant of call_function_by_hand that allows the dummy
frame destructor to be set. This is used by the compiler code to
manage some resources when calling the gdb-generated inferior
function.

2014-10-07 Jan Kratochvil <jan.kratochvil@redhat.com>

* infcall.h (call_function_by_hand_dummy): Declare.
* infcall.c (call_function_by_hand): Use
call_function_by_hand_dummy.
(call_function_by_hand_dummy): Rename from call_function_by_hand.
Add arguments. Register a destructor.
---
gdb/ChangeLog | 8 ++++++++
gdb/infcall.c | 16 +++++++++++++++-
gdb/infcall.h | 11 +++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9222c54..fc60169 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-07 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * infcall.h (call_function_by_hand_dummy): Declare.
+ * infcall.c (call_function_by_hand): Use
+ call_function_by_hand_dummy.
+ (call_function_by_hand_dummy): Rename from call_function_by_hand.
+ Add arguments. Register a destructor.
+
2014-10-07 Tom Tromey <tromey@redhat.com>
Jan Kratochvil <jan.kratochvil@redhat.com>

diff --git a/gdb/infcall.c b/gdb/infcall.c
index bbac693..74e90d4 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -455,6 +455,14 @@ cleanup_delete_std_terminate_breakpoint (void *ignore)
delete_std_terminate_breakpoint ();
}

+/* See infcall.h. */
+
+struct value *
+call_function_by_hand (struct value *function, int nargs, struct value **args)
+{
+ return call_function_by_hand_dummy (function, nargs, args, NULL, NULL);
+}
+
/* All this stuff with a dummy frame may seem unnecessarily complicated
(why not just save registers in GDB?). The purpose of pushing a dummy
frame which looks just like a real frame is so that if you call a
@@ -474,7 +482,10 @@ cleanup_delete_std_terminate_breakpoint (void *ignore)
ARGS is modified to contain coerced values. */

struct value *
-call_function_by_hand (struct value *function, int nargs, struct value **args)
+call_function_by_hand_dummy (struct value *function,
+ int nargs, struct value **args,
+ call_function_by_hand_dummy_dtor_ftype *dummy_dtor,
+ void *dummy_dtor_data)
{
CORE_ADDR sp;
struct type *values_type, *target_values_type;
@@ -831,6 +842,9 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
caller (and identify the dummy-frame) onto the dummy-frame
stack. */
dummy_frame_push (caller_state, &dummy_id, inferior_ptid);
+ if (dummy_dtor != NULL)
+ register_dummy_frame_dtor (dummy_id, inferior_ptid,
+ dummy_dtor, dummy_dtor_data);

/* Discard both inf_status and caller_state cleanups.
From this point on we explicitly restore the associated state
diff --git a/gdb/infcall.h b/gdb/infcall.h
index c6dcdc3..f895e33 100644
--- a/gdb/infcall.h
+++ b/gdb/infcall.h
@@ -38,4 +38,15 @@ extern CORE_ADDR find_function_addr (struct value *function,
extern struct value *call_function_by_hand (struct value *function, int nargs,
struct value **args);

+/* Similar to call_function_by_hand and additional call
+ register_dummy_frame_dtor with DUMMY_DTOR and DUMMY_DTOR_DATA for the
+ created inferior call dummy frame. */
+
+typedef void (call_function_by_hand_dummy_dtor_ftype) (void *data);
+extern struct value *
+ call_function_by_hand_dummy (struct value *function, int nargs,
+ struct value **args,
+ call_function_by_hand_dummy_dtor_ftype *dummy_dtor,
+ void *dummy_dtor_data);
+
#endif