From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 1/6] dummy_frame_dtor_ftype vs. call_function_by_hand_dummy_dtor_ftype cleanup
Date: Fri, 08 May 2015 20:21:00 -0000 [thread overview]
Message-ID: <20150508202119.15830.18218.stgit@host1.jankratochvil.net> (raw)
Hi,
both dummy_frame_dtor_ftype and call_function_by_hand_dummy_dtor_ftype
represent the same type, there was some mistake/duplication during check-in.
Jan
gdb/ChangeLog
2015-05-08 Jan Kratochvil <jan.kratochvil@redhat.com>
* dummy-frame.c (struct dummy_frame): Use proper typedef for dtor.
* dummy-frame.h (dummy_frame_dtor_ftype): Add its comment.
* infcall.c (call_function_by_hand_dummy): Use proper typedef for
dummy_dtor parameter.
* infcall.h: Include dummy-frame.h.
(call_function_by_hand_dummy_dtor_ftype): Remove.
(call_function_by_hand_dummy): Use proper typedef for dummy_dtor
parameter.
---
gdb/dummy-frame.c | 2 +-
gdb/dummy-frame.h | 4 +++-
gdb/infcall.c | 2 +-
gdb/infcall.h | 5 +++--
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 0fbbeb1..f193289 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -64,7 +64,7 @@ struct dummy_frame
/* If non-NULL, a destructor that is run when this dummy frame is
popped. */
- void (*dtor) (void *data);
+ dummy_frame_dtor_ftype *dtor;
/* Arbitrary data that is passed to DTOR. */
void *dtor_data;
diff --git a/gdb/dummy-frame.h b/gdb/dummy-frame.h
index bdc406a..ffd3b0a 100644
--- a/gdb/dummy-frame.h
+++ b/gdb/dummy-frame.h
@@ -54,10 +54,12 @@ extern void dummy_frame_discard (struct frame_id dummy_id, ptid_t ptid);
extern const struct frame_unwind dummy_frame_unwind;
+/* Destructor for dummy_frame. DATA is supplied by registrant. */
+typedef void (dummy_frame_dtor_ftype) (void *data);
+
/* Call DTOR with DTOR_DATA when DUMMY_ID frame of thread PTID gets discarded.
Dummy frame with DUMMY_ID must exist. There must be no other call of
register_dummy_frame_dtor for that dummy frame. */
-typedef void (dummy_frame_dtor_ftype) (void *data);
extern void register_dummy_frame_dtor (struct frame_id dummy_id, ptid_t ptid,
dummy_frame_dtor_ftype *dtor,
void *dtor_data);
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 26c64f6..cef6b91 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -490,7 +490,7 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
struct value *
call_function_by_hand_dummy (struct value *function,
int nargs, struct value **args,
- call_function_by_hand_dummy_dtor_ftype *dummy_dtor,
+ dummy_frame_dtor_ftype *dummy_dtor,
void *dummy_dtor_data)
{
CORE_ADDR sp;
diff --git a/gdb/infcall.h b/gdb/infcall.h
index d038b6a..77c5101 100644
--- a/gdb/infcall.h
+++ b/gdb/infcall.h
@@ -20,6 +20,8 @@
#ifndef INFCALL_H
#define INFCALL_H
+#include "dummy-frame.h"
+
struct value;
struct type;
@@ -42,11 +44,10 @@ extern struct value *call_function_by_hand (struct value *function, int nargs,
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,
+ dummy_frame_dtor_ftype *dummy_dtor,
void *dummy_dtor_data);
#endif
next reply other threads:[~2015-05-08 20:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-08 20:21 Jan Kratochvil [this message]
2015-05-08 20:21 ` [PATCH 5/6] Remove stop_registers Jan Kratochvil
2015-05-13 13:10 ` Pedro Alves
2015-05-13 18:55 ` [commit] " Jan Kratochvil
2015-05-08 20:21 ` [PATCH 2/6] Call dummy_frame_dtor_ftype also from remove_dummy_frame Jan Kratochvil
2015-05-13 12:57 ` Pedro Alves
2015-05-13 13:52 ` Jan Kratochvil
2015-05-13 18:53 ` [commit] " Jan Kratochvil
2015-05-08 20:21 ` [PATCH 3/6] register_dummy_frame_dtor: Permit multiple dtors Jan Kratochvil
2015-05-13 13:00 ` Pedro Alves
2015-05-13 19:50 ` [commit] " Jan Kratochvil
2015-05-08 20:21 ` [PATCH 4/6] infcall: stop_registers -> register_dummy_frame_dtor Jan Kratochvil
2015-05-13 13:28 ` Pedro Alves
2015-05-13 18:54 ` [commit] " Jan Kratochvil
2015-05-08 20:22 ` [PATCH 6/6] Make regcache_cpy_no_passthrough static Jan Kratochvil
2015-05-13 13:16 ` Pedro Alves
2015-05-13 19:49 ` [commit] " Jan Kratochvil
2015-05-13 12:55 ` [PATCH 1/6] dummy_frame_dtor_ftype vs. call_function_by_hand_dummy_dtor_ftype cleanup Pedro Alves
2015-05-13 13:56 ` [commit] " Jan Kratochvil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150508202119.15830.18218.stgit@host1.jankratochvil.net \
--to=jan.kratochvil@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).