Skip to content

R
riscv-gcc-1
Commit dfb43cd5 by Pierre Vittet Committed by Basile Starynkevitch
Options

c-pragma.h (pragma_handler_1arg, [...]): New handler. 

2011-06-20  Pierre Vittet  <piervit@pvittet.com>

	* c-pragma.h (pragma_handler_1arg, pragma_handler_2arg): New
	handler.
	(gen_pragma_handler): New union.
	(internal_pragma_handler): New type.
	(c_register_pragma_with_data)
	(c_register_pragma_with_expansion_and_data): New functions.

	* c-pragma.c (registered_pragmas, c_register_pragma_1)
	(c_register_pragma, c_register_pragma_with_expansion)
	(c_invoke_pragma_handler): Changed to work with
	internal_pragma_handler.
	(c_register_pragma_with_data)
	(c_register_pragma_with_expansion_and_data): New functions.

From-SVN: r175202
parent 3bae1d98
Showing with 136 additions and 21 deletions
gcc/c-family/ChangeLog
2011-06-20 Pierre Vittet <piervit@pvittet.com>
* c-pragma.h (pragma_handler_1arg, pragma_handler_2arg): New
handler.
(gen_pragma_handler): New union.
(internal_pragma_handler): New type.
(c_register_pragma_with_data)
(c_register_pragma_with_expansion_and_data): New functions.
* c-pragma.c (registered_pragmas, c_register_pragma_1)
(c_register_pragma, c_register_pragma_with_expansion)
(c_invoke_pragma_handler): Changed to work with
internal_pragma_handler.
(c_register_pragma_with_data)
(c_register_pragma_with_expansion_and_data): New functions.
2011-06-14 Joseph Myers <joseph@codesourcery.com>
* c-common.c: Include common/common-target.h.
......
gcc/c-family/c-pragma.c
......@@ -1147,12 +1147,11 @@ handle_pragma_float_const_decimal64 (cpp_reader *ARG_UNUSED (dummy))
}
}
/* A vector of registered pragma callbacks. */
/* A vector of registered pragma callbacks, which is never freed. */
DEF_VEC_O (internal_pragma_handler);
DEF_VEC_ALLOC_O (internal_pragma_handler, heap);
DEF_VEC_O (pragma_handler);
DEF_VEC_ALLOC_O (pragma_handler, heap);
static VEC(pragma_handler, heap) *registered_pragmas;
static VEC(internal_pragma_handler, heap) *registered_pragmas;
typedef struct
{
......@@ -1216,7 +1215,7 @@ c_pp_lookup_pragma (unsigned int id, const char **space, const char **name)
static void
c_register_pragma_1 (const char *space, const char *name,
pragma_handler handler, bool allow_expansion)
internal_pragma_handler ihandler, bool allow_expansion)
{
unsigned id;
......@@ -1235,8 +1234,9 @@ c_register_pragma_1 (const char *space, const char *name,
}
else
{
VEC_safe_push (pragma_handler, heap, registered_pragmas, &handler);
id = VEC_length (pragma_handler, registered_pragmas);
VEC_safe_push (internal_pragma_handler, heap, registered_pragmas,
&ihandler);
id = VEC_length (internal_pragma_handler, registered_pragmas);
id += PRAGMA_FIRST_EXTERNAL - 1;
/* The C++ front end allocates 6 bits in cp_token; the C front end
......@@ -1248,28 +1248,95 @@ c_register_pragma_1 (const char *space, const char *name,
allow_expansion, false);
}
/* Register a C pragma handler, using a space and a name. It disallows pragma
expansion (if you want it, use c_register_pragma_with_expansion instead). */
void
c_register_pragma (const char *space, const char *name,
pragma_handler_1arg handler)
{
internal_pragma_handler ihandler;
ihandler.handler.handler_1arg = handler;
ihandler.extra_data = false;
ihandler.data = NULL;
c_register_pragma_1 (space, name, ihandler, false);
}
/* Register a C pragma handler, using a space and a name, it also carries an
extra data field which can be used by the handler. It disallows pragma
expansion (if you want it, use c_register_pragma_with_expansion_and_data
instead). */
void
c_register_pragma (const char *space, const char *name, pragma_handler handler)
c_register_pragma_with_data (const char *space, const char *name,
pragma_handler_2arg handler, void * data)
{
c_register_pragma_1 (space, name, handler, false);
internal_pragma_handler ihandler;
ihandler.handler.handler_2arg = handler;
ihandler.extra_data = true;
ihandler.data = data;
c_register_pragma_1 (space, name, ihandler, false);
}
/* Register a C pragma handler, using a space and a name. It allows pragma
expansion as in the following example:
#define NUMBER 10
#pragma count (NUMBER)
Name expansion is still disallowed. */
void
c_register_pragma_with_expansion (const char *space, const char *name,
pragma_handler handler)
pragma_handler_1arg handler)
{
c_register_pragma_1 (space, name, handler, true);
internal_pragma_handler ihandler;
ihandler.handler.handler_1arg = handler;
ihandler.extra_data = false;
ihandler.data = NULL;
c_register_pragma_1 (space, name, ihandler, true);
}
/* Register a C pragma handler, using a space and a name, it also carries an
extra data field which can be used by the handler. It allows pragma
expansion as in the following example:
#define NUMBER 10
#pragma count (NUMBER)
Name expansion is still disallowed. */
void
c_register_pragma_with_expansion_and_data (const char *space, const char *name,
pragma_handler_2arg handler,
void *data)
{
internal_pragma_handler ihandler;
ihandler.handler.handler_2arg = handler;
ihandler.extra_data = true;
ihandler.data = data;
c_register_pragma_1 (space, name, ihandler, true);
}
void
c_invoke_pragma_handler (unsigned int id)
{
pragma_handler handler;
internal_pragma_handler *ihandler;
pragma_handler_1arg handler_1arg;
pragma_handler_2arg handler_2arg;
id -= PRAGMA_FIRST_EXTERNAL;
handler = *VEC_index (pragma_handler, registered_pragmas, id);
handler (parse_in);
ihandler = VEC_index (internal_pragma_handler, registered_pragmas, id);
if (ihandler->extra_data)
{
handler_2arg = ihandler->handler.handler_2arg;
handler_2arg (parse_in, ihandler->data);
}
else
{
handler_1arg = ihandler->handler.handler_1arg;
handler_1arg (parse_in);
}
}
/* Set up front-end pragmas. */
......@@ -1308,7 +1375,8 @@ init_pragma (void)
c_register_pragma ("STDC", "FLOAT_CONST_DECIMAL64",
handle_pragma_float_const_decimal64);
c_register_pragma_with_expansion (0, "redefine_extname", handle_pragma_redefine_extname);
c_register_pragma_with_expansion (0, "redefine_extname",
handle_pragma_redefine_extname);
c_register_pragma (0, "extern_prefix", handle_pragma_extern_prefix);
c_register_pragma_with_expansion (0, "message", handle_pragma_message);
......
gcc/c-family/c-pragma.h
......@@ -84,10 +84,40 @@ extern bool pop_visibility (int);
extern void init_pragma (void);
/* Front-end wrappers for pragma registration. */
typedef void (*pragma_handler)(struct cpp_reader *);
extern void c_register_pragma (const char *, const char *, pragma_handler);
extern void c_register_pragma_with_expansion (const char *, const char *,
pragma_handler);
typedef void (*pragma_handler_1arg)(struct cpp_reader *);
/* A second pragma handler, which adds a void * argument allowing to pass extra
data to the handler. */
typedef void (*pragma_handler_2arg)(struct cpp_reader *, void *);
/* This union allows to abstract the different handlers. */
union gen_pragma_handler {
pragma_handler_1arg handler_1arg;
pragma_handler_2arg handler_2arg;
};
/* Internally used to keep the data of the handler. */
struct internal_pragma_handler_d {
union gen_pragma_handler handler;
/* Permits to know if handler is a pragma_handler_1arg (extra_data is false)
or a pragma_handler_2arg (extra_data is true). */
bool extra_data;
/* A data field which can be used when extra_data is true. */
void * data;
};
typedef struct internal_pragma_handler_d internal_pragma_handler;
extern void c_register_pragma (const char *space, const char *name,
pragma_handler_1arg handler);
extern void c_register_pragma_with_data (const char *space, const char *name,
pragma_handler_2arg handler,
void *data);
extern void c_register_pragma_with_expansion (const char *space,
const char *name,
pragma_handler_1arg handler);
extern void c_register_pragma_with_expansion_and_data (const char *space,
const char *name,
pragma_handler_2arg handler,
void *data);
extern void c_invoke_pragma_handler (unsigned int);
extern void maybe_apply_pragma_weak (tree);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment