OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dummy_frame_dtor_ftype vs. call_function_by_hand_dummy_dtor_ftype cleanup 

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.

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.
This commit is contained in:
Jan Kratochvil 2015-05-13 15:55:09 +02:00
parent ebfd00d210
commit 558e546967
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
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.
2015-05-13 Patrick Palka <patrick@parcs.ath.cx>
PR gdb/17820

2
gdb/dummy-frame.c
View File

@ -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;

4
gdb/dummy-frame.h
View File

@ -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);

2
gdb/infcall.c
View File

@ -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;

5
gdb/infcall.h
View File

@ -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