From f12021edbe3e4806ce83c6c1d12b50d7f4f9d528 Mon Sep 17 00:00:00 2001 From: Anatoly Sokolov Date: Tue, 4 Aug 2015 22:51:28 +0300 Subject: [PATCH] [MOXIE] Hookize PRINT_OPERAND and PRINT_OPERAND_ADDRESS From-SVN: r226594 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/moxie/moxie-protos.h | 2 -- gcc/config/moxie/moxie.c | 9 +++++++-- gcc/config/moxie/moxie.h | 6 ------ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a3bf601828..e391b6f58d5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2015-08-04 Anatoly Sokolov + + * config/moxie/moxie.h (PRINT_OPERAND, + PRINT_OPERAND_ADDRESS): Remove macros. + * config/moxie/moxie-protos.h (moxie_print_operand, + moxie_print_operand_address): Remove declaration. + * config/moxie/moxie.c (TARGET_PRINT_OPERAND, + TARGET_PRINT_OPERAND_ADDRESS): Define. + (moxie_print_operand, moxie_print_operand_address): Make static. + 2015-08-04 Szabolcs Nagy PR target/66731 diff --git a/gcc/config/moxie/moxie-protos.h b/gcc/config/moxie/moxie-protos.h index b4c9267f38a..cc452af6810 100644 --- a/gcc/config/moxie/moxie-protos.h +++ b/gcc/config/moxie/moxie-protos.h @@ -20,6 +20,4 @@ along with GCC; see the file COPYING3. If not see extern void moxie_expand_prologue (void); extern void moxie_expand_epilogue (void); extern int moxie_initial_elimination_offset (int, int); -extern void moxie_print_operand (FILE *, rtx, int); -extern void moxie_print_operand_address (FILE *, rtx); extern bool moxie_offset_address_p (rtx); diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c index 97e0093c603..ea36db36291 100644 --- a/gcc/config/moxie/moxie.c +++ b/gcc/config/moxie/moxie.c @@ -128,7 +128,7 @@ moxie_operand_lossage (const char *msgid, rtx op) /* The PRINT_OPERAND_ADDRESS worker. */ -void +static void moxie_print_operand_address (FILE *file, rtx x) { switch (GET_CODE (x)) @@ -175,7 +175,7 @@ moxie_print_operand_address (FILE *file, rtx x) /* The PRINT_OPERAND worker. */ -void +static void moxie_print_operand (FILE *file, rtx x, int code) { rtx operand = x; @@ -679,6 +679,11 @@ moxie_legitimate_address_p (machine_mode mode ATTRIBUTE_UNUSED, #undef TARGET_OPTION_OVERRIDE #define TARGET_OPTION_OVERRIDE moxie_option_override +#undef TARGET_PRINT_OPERAND +#define TARGET_PRINT_OPERAND moxie_print_operand +#undef TARGET_PRINT_OPERAND_ADDRESS +#define TARGET_PRINT_OPERAND_ADDRESS moxie_print_operand_address + struct gcc_target targetm = TARGET_INITIALIZER; #include "gt-moxie.h" diff --git a/gcc/config/moxie/moxie.h b/gcc/config/moxie/moxie.h index d8ab936feac..1dc7a097ac8 100644 --- a/gcc/config/moxie/moxie.h +++ b/gcc/config/moxie/moxie.h @@ -212,12 +212,6 @@ enum reg_class #define ASM_OUTPUT_ALIGN(STREAM,POWER) \ fprintf (STREAM, "\t.p2align\t%d\n", POWER); -/* A C compound statement to output to stdio stream STREAM the - assembler syntax for an instruction operand X. */ -#define PRINT_OPERAND(STREAM, X, CODE) moxie_print_operand (STREAM, X, CODE) - -#define PRINT_OPERAND_ADDRESS(STREAM ,X) moxie_print_operand_address (STREAM, X) - /* Output and Generation of Labels */ #define GLOBAL_ASM_OP "\t.global\t" -- 2.30.2