From efe554e48b242c720f36c632c60833f8ed1c2344 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 17 Jun 2010 18:14:45 +0000 Subject: [PATCH] m68hc11-protos.h (print_operand): Delete. * config/m68hc11/m68hc11-protos.h (print_operand): Delete. (print_operand_address): Delete. * config/m68hc11/m68hc11.h (PRINT_OPERAND): Delete. (PRINT_OPERAND_ADDRESS): Delete. * config/m68hc11/m68hc11.c (m68hc11_print_operand_address): Make static. (m68hc11_print_operand): Make static. (TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define. From-SVN: r160940 --- gcc/ChangeLog | 11 +++++++++++ gcc/config/m68hc11/m68hc11-protos.h | 5 +---- gcc/config/m68hc11/m68hc11.c | 17 ++++++++++++----- gcc/config/m68hc11/m68hc11.h | 13 +------------ 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c4483a79a45..0aceca84bf6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2010-06-17 Nathan Froyd + + * config/m68hc11/m68hc11-protos.h (print_operand): Delete. + (print_operand_address): Delete. + * config/m68hc11/m68hc11.h (PRINT_OPERAND): Delete. + (PRINT_OPERAND_ADDRESS): Delete. + * config/m68hc11/m68hc11.c (m68hc11_print_operand_address): Make + static. + (m68hc11_print_operand): Make static. + (TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define. + 2010-06-17 Nathan Froyd * config/m32r/m32r-protos.h (m32r_print_operand): Delete. diff --git a/gcc/config/m68hc11/m68hc11-protos.h b/gcc/config/m68hc11/m68hc11-protos.h index 59154faf00b..d8ae8e078a9 100644 --- a/gcc/config/m68hc11/m68hc11-protos.h +++ b/gcc/config/m68hc11/m68hc11-protos.h @@ -1,5 +1,5 @@ /* Prototypes for exported functions defined in m68hc11.c - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009 + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. Contributed by Stephane Carrez (stcarrez@nerim.fr) @@ -57,9 +57,6 @@ extern void m68hc11_output_swap (rtx, rtx*); extern int next_insn_test_reg (rtx, rtx); -extern void print_operand (FILE*, rtx, int); -extern void print_operand_address (FILE*, rtx); - extern int m68hc11_reload_operands (rtx*); extern int dead_register_here (rtx, rtx); diff --git a/gcc/config/m68hc11/m68hc11.c b/gcc/config/m68hc11/m68hc11.c index 397413f61b7..ad63ee8153d 100644 --- a/gcc/config/m68hc11/m68hc11.c +++ b/gcc/config/m68hc11/m68hc11.c @@ -1,6 +1,6 @@ /* Subroutines for code generation on Motorola 68HC11 and 68HC12. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009 Free Software Foundation, Inc. + 2009, 2010 Free Software Foundation, Inc. Contributed by Stephane Carrez (stcarrez@nerim.fr) This file is part of GCC. @@ -78,6 +78,8 @@ static tree m68hc11_handle_page0_attribute (tree *, tree, tree, int, bool *); void create_regs_rtx (void); static void asm_print_register (FILE *, int); +static void m68hc11_print_operand (FILE *, rtx, int); +static void m68hc11_print_operand_address (FILE *, rtx); static void m68hc11_output_function_epilogue (FILE *, HOST_WIDE_INT); static void m68hc11_asm_out_constructor (rtx, int); static void m68hc11_asm_out_destructor (rtx, int); @@ -238,6 +240,11 @@ static const struct attribute_spec m68hc11_attribute_table[] = #undef TARGET_ASM_ALIGNED_HI_OP #define TARGET_ASM_ALIGNED_HI_OP "\t.word\t" +#undef TARGET_PRINT_OPERAND +#define TARGET_PRINT_OPERAND m68hc11_print_operand +#undef TARGET_PRINT_OPERAND_ADDRESS +#define TARGET_PRINT_OPERAND_ADDRESS m68hc11_print_operand_address + #undef TARGET_ASM_FUNCTION_EPILOGUE #define TARGET_ASM_FUNCTION_EPILOGUE m68hc11_output_function_epilogue @@ -2123,8 +2130,8 @@ asm_print_register (FILE *file, int regno) 'T' generate the low-part temporary scratch register. The operand is ignored. */ -void -print_operand (FILE *file, rtx op, int letter) +static void +m68hc11_print_operand (FILE *file, rtx op, int letter) { if (letter == 't') { @@ -2316,8 +2323,8 @@ must_parenthesize (rtx op) assembler syntax for an instruction operand that is a memory reference whose address is ADDR. ADDR is an RTL expression. */ -void -print_operand_address (FILE *file, rtx addr) +static void +m68hc11_print_operand_address (FILE *file, rtx addr) { rtx base; rtx offset; diff --git a/gcc/config/m68hc11/m68hc11.h b/gcc/config/m68hc11/m68hc11.h index b9626e1ecca..aef48a6e894 100644 --- a/gcc/config/m68hc11/m68hc11.h +++ b/gcc/config/m68hc11/m68hc11.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. Motorola 68HC11 and 68HC12. - Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Stephane Carrez (stcarrez@nerim.fr) @@ -1351,17 +1351,6 @@ do { \ "*_.frame", "*_.tmp", "*_.z", "*_.xy", "*fake clobber", \ SOFT_REG_NAMES, "*sframe", "*ap"} -/* Print an instruction operand X on file FILE. CODE is the code from the - %-spec for printing this operand. If `%z3' was used to print operand - 3, then CODE is 'z'. */ - -#define PRINT_OPERAND(FILE, X, CODE) \ - print_operand (FILE, X, CODE) - -/* Print a memory operand whose address is X, on file FILE. */ -#define PRINT_OPERAND_ADDRESS(FILE, ADDR) \ - print_operand_address (FILE, ADDR) - /* This is how to output an insn to push/pop a register on the stack. It need not be very fast code. -- 2.30.2