diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-23 06:06:29 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-23 06:06:29 +0000 |
| commit | 8a096472683581315df6e6747212356b3255087e (patch) | |
| tree | dac105eba22e3c3a544b760bd2ca5b1db944f65e /gcc/except.c | |
| parent | 63217c8a41fa03e943e9859df194ab78cbe8639b (diff) | |
| download | gcc-8a096472683581315df6e6747212356b3255087e.tar.gz | |
2008-06-23 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r137030
* gcc/melt/warm-basilys.bysl: some primitives got explicit casts.
* gcc/basilys.h: added casts to avoid implicit conversion from void*
disallowed with C++
* gcc/basilys.c: (delete_special, forwarded, scanning) likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@137031 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/except.c')
| -rw-r--r-- | gcc/except.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gcc/except.c b/gcc/except.c index 8ebfd7fa1db..e6a16507cdb 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -338,7 +338,8 @@ init_eh (void) DECL_FIELD_CONTEXT (f_cs) = sjlj_fc_type_node; tmp = build_index_type (build_int_cst (NULL_TREE, 4 - 1)); - tmp = build_array_type (lang_hooks.types.type_for_mode (word_mode, 1), + tmp = build_array_type (lang_hooks.types.type_for_mode + (targetm.unwind_word_mode (), 1), tmp); f_data = build_decl (FIELD_DECL, get_identifier ("__data"), tmp); DECL_FIELD_CONTEXT (f_data) = sjlj_fc_type_node; @@ -1932,6 +1933,8 @@ sjlj_emit_function_exit (void) static void sjlj_emit_dispatch_table (rtx dispatch_label, struct sjlj_lp_info *lp_info) { + enum machine_mode unwind_word_mode = targetm.unwind_word_mode (); + enum machine_mode filter_mode = targetm.eh_return_filter_mode (); int i, first_reachable; rtx mem, dispatch, seq, fc; rtx before; @@ -1954,8 +1957,8 @@ sjlj_emit_dispatch_table (rtx dispatch_label, struct sjlj_lp_info *lp_info) sjlj_fc_call_site_ofs); dispatch = copy_to_reg (mem); - mem = adjust_address (fc, word_mode, sjlj_fc_data_ofs); - if (word_mode != ptr_mode) + mem = adjust_address (fc, unwind_word_mode, sjlj_fc_data_ofs); + if (unwind_word_mode != ptr_mode) { #ifdef POINTERS_EXTEND_UNSIGNED mem = convert_memory_address (ptr_mode, mem); @@ -1965,7 +1968,10 @@ sjlj_emit_dispatch_table (rtx dispatch_label, struct sjlj_lp_info *lp_info) } emit_move_insn (crtl->eh.exc_ptr, mem); - mem = adjust_address (fc, word_mode, sjlj_fc_data_ofs + UNITS_PER_WORD); + mem = adjust_address (fc, unwind_word_mode, + sjlj_fc_data_ofs + GET_MODE_SIZE (unwind_word_mode)); + if (unwind_word_mode != filter_mode) + mem = convert_to_mode (filter_mode, mem, 0); emit_move_insn (crtl->eh.filter, mem); /* Jump to one of the directly reachable regions. */ @@ -3002,7 +3008,7 @@ expand_builtin_extend_pointer (tree addr_tree) extend = 1; #endif - return convert_modes (word_mode, ptr_mode, addr, extend); + return convert_modes (targetm.unwind_word_mode (), ptr_mode, addr, extend); } /* In the following functions, we represent entries in the action table |