diff options
Diffstat (limited to 'gcc/except.c')
| -rw-r--r-- | gcc/except.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/gcc/except.c b/gcc/except.c index 6aea0ec09f7..174e4e6953c 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -389,8 +389,8 @@ Boston, MA 02111-1307, USA. */ #include "config.h" +#include "system.h" #include "defaults.h" -#include <stdio.h> #include "rtl.h" #include "tree.h" #include "flags.h" @@ -795,7 +795,7 @@ get_dynamic_cleanup_chain () current_function_dcc = copy_to_reg (dcc); /* We don't want a copy of the dcc, but rather, the single dcc. */ - return gen_rtx (MEM, Pmode, current_function_dcc); + return gen_rtx_MEM (Pmode, current_function_dcc); } /* Generate code to evaluate X and jump to LABEL if the value is nonzero. @@ -862,10 +862,10 @@ start_dynamic_cleanup (func, arg) /* Store func and arg into the cleanup list element. */ - new_func = gen_rtx (MEM, Pmode, plus_constant (XEXP (buf, 0), - GET_MODE_SIZE (Pmode))); - new_arg = gen_rtx (MEM, Pmode, plus_constant (XEXP (buf, 0), - GET_MODE_SIZE (Pmode)*2)); + new_func = gen_rtx_MEM (Pmode, plus_constant (XEXP (buf, 0), + GET_MODE_SIZE (Pmode))); + new_arg = gen_rtx_MEM (Pmode, plus_constant (XEXP (buf, 0), + GET_MODE_SIZE (Pmode)*2)); x = expand_expr (func, new_func, Pmode, 0); if (x != new_func) emit_move_insn (new_func, x); @@ -918,8 +918,8 @@ start_dynamic_handler () /* Store dhc into the first word of the newly allocated buffer. */ dhc = get_dynamic_handler_chain (); - dcc = gen_rtx (MEM, Pmode, plus_constant (XEXP (arg, 0), - GET_MODE_SIZE (Pmode))); + dcc = gen_rtx_MEM (Pmode, plus_constant (XEXP (arg, 0), + GET_MODE_SIZE (Pmode))); emit_move_insn (arg, dhc); /* Zero out the start of the cleanup chain. */ @@ -1240,7 +1240,7 @@ void expand_internal_throw (context) rtx context; { - expand_internal_throw_indirect (gen_rtx (LABEL_REF, Pmode, context)); + expand_internal_throw_indirect (gen_rtx_LABEL_REF (Pmode, context)); } /* Called from expand_exception_blocks and expand_end_catch_block to @@ -1611,15 +1611,15 @@ output_exception_table_entry (file, n) rtx sym; ASM_GENERATE_INTERNAL_LABEL (buf, "LEHB", n); - sym = gen_rtx (SYMBOL_REF, Pmode, buf); + sym = gen_rtx_SYMBOL_REF (Pmode, buf); assemble_integer (sym, POINTER_SIZE / BITS_PER_UNIT, 1); ASM_GENERATE_INTERNAL_LABEL (buf, "LEHE", n); - sym = gen_rtx (SYMBOL_REF, Pmode, buf); + sym = gen_rtx_SYMBOL_REF (Pmode, buf); assemble_integer (sym, POINTER_SIZE / BITS_PER_UNIT, 1); ASM_GENERATE_INTERNAL_LABEL (buf, "L", n); - sym = gen_rtx (SYMBOL_REF, Pmode, buf); + sym = gen_rtx_SYMBOL_REF (Pmode, buf); assemble_integer (sym, POINTER_SIZE / BITS_PER_UNIT, 1); putc ('\n', file); /* blank line */ @@ -1661,9 +1661,9 @@ output_exception_table () void register_exception_table () { - emit_library_call (gen_rtx (SYMBOL_REF, Pmode, "__register_exceptions"), 0, + emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__register_exceptions"), 0, VOIDmode, 1, - gen_rtx (SYMBOL_REF, Pmode, "__EXCEPTION_TABLE__"), + gen_rtx_SYMBOL_REF (Pmode, "__EXCEPTION_TABLE__"), Pmode); } @@ -1749,7 +1749,7 @@ end_eh_unwinder () emit_move_insn (ret_val, throw_libfunc); #else label = gen_label_rtx (); - emit_move_insn (ret_val, gen_rtx (LABEL_REF, Pmode, label)); + emit_move_insn (ret_val, gen_rtx_LABEL_REF (Pmode, label)); #endif #ifdef RETURN_ADDR_OFFSET @@ -1908,8 +1908,8 @@ find_exception_handler_labels () if (label) exception_handler_labels - = gen_rtx (EXPR_LIST, VOIDmode, - label, exception_handler_labels); + = gen_rtx_EXPR_LIST (VOIDmode, + label, exception_handler_labels); else warning ("didn't find handler for EH region %d", NOTE_BLOCK_NUMBER (insn)); @@ -2331,7 +2331,7 @@ eh_regs (r1, r2, outgoing) for (i = 0; i < FIRST_PSEUDO_REGISTER; ++i) if (call_used_regs[i] && ! fixed_regs[i] && i != REGNO (reg1)) { - reg2 = gen_rtx (REG, Pmode, i); + reg2 = gen_rtx_REG (Pmode, i); break; } @@ -2363,7 +2363,7 @@ expand_builtin_eh_stub () emit_indirect_jump (handler); emit_label (after_stub); - return gen_rtx (LABEL_REF, Pmode, stub_start); + return gen_rtx_LABEL_REF (Pmode, stub_start); } /* Set up the registers for passing the handler address and stack offset @@ -2381,6 +2381,6 @@ expand_builtin_set_eh_regs (handler, offset) store_expr (handler, reg1, 0); /* These will be used by the stub. */ - emit_insn (gen_rtx (USE, VOIDmode, reg1)); - emit_insn (gen_rtx (USE, VOIDmode, reg2)); + emit_insn (gen_rtx_USE (VOIDmode, reg1)); + emit_insn (gen_rtx_USE (VOIDmode, reg2)); } |