===================================================================
@@ -48,12 +48,12 @@ extern void mmix_output_register_setting
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 (int);
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);
===================================================================
@@ -45,6 +45,7 @@ the Free Software Foundation; either ver
#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 A
/* 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,7 +1902,7 @@ mmix_asm_output_align (FILE *stream, int
/* DBX_REGISTER_NUMBER. */
-int
+unsigned
mmix_dbx_register_number (int regno)
{
/* Adjust the register number to the one it will be output as, dammit.
@@ -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;
}