diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2004-11-19 11:54:53 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2004-11-19 11:54:53 +0100 |
| commit | ee57599295edea9f7edd73768deab9cc526dc505 (patch) | |
| tree | 6efa7bf4ecf82f27c400f99353c69a8bcca1b6c7 /gcc/ada/raise.c | |
| parent | f5a0cbf1083ff9d9635c813929b89d9f831f4ec9 (diff) | |
| download | gcc-ee57599295edea9f7edd73768deab9cc526dc505.zip gcc-ee57599295edea9f7edd73768deab9cc526dc505.tar.gz gcc-ee57599295edea9f7edd73768deab9cc526dc505.tar.bz2 | |
a-exexpr.adb (Others_Value, [...]): New variables...
* a-exexpr.adb (Others_Value, All_Others_Value): New variables, the
address of which may be used to represent "others" and "all others"
choices in exception tables, instead of the current harcoded
(void *)0 and (void *)1.
(Setup_Exception): Do nothing in the GNAT SJLJ case.
* gigi.h (others_decl, all_others_decl): New decls representing the
new Others_Value and All_Others_Value objects.
(struct attrib): Rename "arg" component as "args", since GCC expects a
list of arguments in there.
* raise.c (GNAT_OTHERS, GNAT_ALL_OTHERS): Are now the address of the
corresponding objects exported by a-exexpr, instead of hardcoded dummy
addresses.
* trans.c (Exception_Handler_to_gnu_zcx): Use the address of
others_decl and all_others_decl instead of hardcoded dummy addresses
to represent "others" and "all others" choices, which is cleaner and
more flexible with respect to the possible eh pointer encoding policies.
* utils.c (init_gigi_decls): Initialize others_decl and all_others_decl.
(process_attributes): Account for the naming change of the "args"
attribute list entry component.
* decl.c (build_attr_list): Rename into prepend_attributes to allow
cumulating attributes for different entities into a single list.
(gnat_to_gnu_entity): Use prepend_attributes to build the list of
attributes for the current entity and propagate first subtype
attributes to other subtypes.
<E_Procedure>: Attribute arguments are attr->args and not
attr->arg any more.
(build_attr_list): Ditto. Make attr->args a TREE_LIST when there is an
argument provided, as this is what GCC expects. Use NULL_TREE instead
of 0 for trees.
From-SVN: r90900
Diffstat (limited to 'gcc/ada/raise.c')
| -rw-r--r-- | gcc/ada/raise.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gcc/ada/raise.c b/gcc/ada/raise.c index 77a712b..7de1f77 100644 --- a/gcc/ada/raise.c +++ b/gcc/ada/raise.c @@ -480,11 +480,13 @@ typedef struct } _GNAT_Exception; /* The two constants below are specific ttype identifiers for special - exception ids. Their value is currently hardcoded at the gigi level - (see N_Exception_Handler). */ + exception ids. Their type should match what a-exexpr exports. */ -#define GNAT_OTHERS ((_Unwind_Ptr) 0x0) -#define GNAT_ALL_OTHERS ((_Unwind_Ptr) 0x1) +extern const int __gnat_others_value; +#define GNAT_OTHERS ((_Unwind_Ptr) &__gnat_others_value) + +extern const int __gnat_all_others_value; +#define GNAT_ALL_OTHERS ((_Unwind_Ptr) &__gnat_all_others_value) /* Describe the useful region data associated with an unwind context. */ |