From c0dae7df38d5ce329cf01c743f76ec12d560c6f1 Mon Sep 17 00:00:00 2001 From: amylaar Date: Wed, 10 Nov 2010 17:18:22 +0000 Subject: [PATCH] PR target/46415 * config/mmix/mmix-protos.h (mmix_local_alignment): Update prototype. (mmix_dbx_register_number): Likewise. * config/mmix/mmix.c: Include df.h . (mmix_local_alignment): Change argument basic_align and return type to unsigned. (mmix_dbx_register_number): Change argument and return type to unsigned. (mmix_expand_prologue): Use add_reg_note. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166545 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/mmix/mmix-protos.h | 4 ++-- gcc/config/mmix/mmix.c | 23 +++++++++++------------ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 09dd6ccd0c97..54da30722717 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -116,6 +116,16 @@ (valid_psw_flag): Constify parameter which. (rx_memory_move_cost): Change type of parameter regclass to reg_class_t. + PR target/46415 + * config/mmix/mmix-protos.h (mmix_local_alignment): Update prototype. + (mmix_dbx_register_number): Likewise. + * config/mmix/mmix.c: Include df.h . + (mmix_local_alignment): Change argument basic_align and return type + to unsigned. + (mmix_dbx_register_number): Change argument and return type to + unsigned. + (mmix_expand_prologue): Use add_reg_note. + 2010-11-10 Laurynas Biveinis PR/46268 diff --git a/gcc/config/mmix/mmix-protos.h b/gcc/config/mmix/mmix-protos.h index 1f9cae0a2116..847c16a86edc 100644 --- a/gcc/config/mmix/mmix-protos.h +++ b/gcc/config/mmix/mmix-protos.h @@ -48,12 +48,12 @@ extern void mmix_output_register_setting (FILE *, int, HOST_WIDEST_INT, int); extern void mmix_conditional_register_usage (void); extern int mmix_opposite_regno (int, int); extern int mmix_local_regno (int); -extern int mmix_dbx_register_number (int); +extern unsigned mmix_dbx_register_number (unsigned); extern int mmix_use_simple_return (void); extern void mmix_make_decl_one_only (tree); extern int mmix_data_alignment (tree, int); extern int mmix_constant_alignment (tree, int); -extern int mmix_local_alignment (tree, int); +extern unsigned mmix_local_alignment (tree, unsigned); extern void mmix_asm_output_pool_prologue (FILE *, const char *, tree, int); extern void mmix_asm_output_aligned_common (FILE *, const char *, int, int); extern void mmix_asm_output_aligned_local (FILE *, const char *, int, int); diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c index 4944a390f24f..babac44183a6 100644 --- a/gcc/config/mmix/mmix.c +++ b/gcc/config/mmix/mmix.c @@ -45,6 +45,7 @@ along with GCC; see the file COPYING3. If not see #include "integrate.h" #include "target.h" #include "target-def.h" +#include "df.h" /* First some local helper definitions. */ #define MMIX_FIRST_GLOBAL_REGNUM 32 @@ -327,8 +328,8 @@ mmix_constant_alignment (tree constant ATTRIBUTE_UNUSED, int basic_align) /* LOCAL_ALIGNMENT. */ -int -mmix_local_alignment (tree type ATTRIBUTE_UNUSED, int basic_align) +unsigned +mmix_local_alignment (tree type ATTRIBUTE_UNUSED, unsigned basic_align) { if (basic_align < 32) return 32; @@ -1901,8 +1902,8 @@ mmix_asm_output_align (FILE *stream, int power) /* DBX_REGISTER_NUMBER. */ -int -mmix_dbx_register_number (int regno) +unsigned +mmix_dbx_register_number (unsigned regno) { /* Adjust the register number to the one it will be output as, dammit. It'd be nice if we could check the assumption that we're filling a @@ -2110,14 +2111,12 @@ mmix_expand_prologue (void) offset)), tmpreg); RTX_FRAME_RELATED_P (insn) = 1; - REG_NOTES (insn) - = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR, - gen_rtx_SET (VOIDmode, - gen_rtx_MEM (DImode, - plus_constant (stack_pointer_rtx, - offset)), - retreg), - REG_NOTES (insn)); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, + gen_rtx_SET (VOIDmode, + gen_rtx_MEM (DImode, + plus_constant (stack_pointer_rtx, + offset)), + retreg)); offset -= 8; } -- 2.47.2