From patchwork Sat Nov 1 21:46:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 3547 Received: (qmail 29084 invoked by alias); 1 Nov 2014 21:46:55 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 29020 invoked by uid 89); 1 Nov 2014 21:46:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 01 Nov 2014 21:46:53 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sA1Lkqx4015399 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Sat, 1 Nov 2014 17:46:52 -0400 Received: from host1.jankratochvil.net (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sA1LkpXp032096 for ; Sat, 1 Nov 2014 17:46:51 -0400 Subject: [PATCH v3 08/14] introduce call_function_by_hand_dummy From: Jan Kratochvil To: gdb-patches@sourceware.org Date: Sat, 01 Nov 2014 22:46:50 +0100 Message-ID: <20141101214650.13230.54646.stgit@host1.jankratochvil.net> In-Reply-To: <20141101214552.13230.45564.stgit@host1.jankratochvil.net> References: <20141101214552.13230.45564.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes 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 * 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 f66a995..abdf3f2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-10-07 Jan Kratochvil + + * 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 Jan Kratochvil 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