From patchwork Fri May 16 15:26:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 963 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id 5989036007B for ; Fri, 16 May 2014 08:27:13 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14314964) id 084825A2A777; Fri, 16 May 2014 08:27:12 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx22.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id CC46D58EED95 for ; Fri, 16 May 2014 08:27:12 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=VL481C9cDOLIRRPwqv+LCT3h0Er5eE5 IzMpp50CJAtzb7GMGPsSS58hWK6IM9ZHWr1hyfsCgJ8fGqoXJCeg2WSws9p416/y FACa5BzlxQKnKu2t99MxY1Af2igc5jGsX95oDY88ay6dzQUZ5tcv/tbwKBhA6twd +4PJ51gdzbbY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=jGNWkEGw+WHChu2OijmAcIRmnj4=; b=gsaCk 0eSeA6MY1bZOEt8FkUAxigUJeO6VBN5hobxAioyYD7cmOKCUt4zMRL0YilV5Mn6z AloLnnxHV3pafpMDQEHy/eJPoiPrDHctLpM9389ZoksD7Duux0E2h/S2Wg7Drmwx 06yKwby27C6DVv7mWzCi7OMmIDkbIgvoYMt0sU= Received: (qmail 15507 invoked by alias); 16 May 2014 15:26:47 -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 15432 invoked by uid 89); 16 May 2014 15:26:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 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 ESMTP; Fri, 16 May 2014 15:26:45 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4GFQhQM029218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 16 May 2014 11:26:43 -0400 Received: from barimba.redhat.com (ovpn-113-182.phx2.redhat.com [10.3.113.182]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4GFQcVA006849; Fri, 16 May 2014 11:26:43 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Jan Kratochvil Subject: [PATCH 08/14] introduce call_function_by_hand_dummy Date: Fri, 16 May 2014 09:26:29 -0600 Message-Id: <1400253995-12333-9-git-send-email-tromey@redhat.com> In-Reply-To: <1400253995-12333-1-git-send-email-tromey@redhat.com> References: <1400253995-12333-1-git-send-email-tromey@redhat.com> X-DH-Original-To: gdb@patchwork.siddhesh.in From: Jan Kratochvil 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-05-16 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 | 15 ++++++++++++++- gdb/infcall.h | 11 +++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/gdb/infcall.c b/gdb/infcall.c index 9907263..52a2dae 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -450,6 +450,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 @@ -469,7 +477,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; @@ -826,6 +837,8 @@ 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); + if (dummy_dtor != NULL) + register_dummy_frame_dtor (dummy_id, 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