From 8e8a63d190d6cf5fc5925a2fd31ffc5e812e235f Mon Sep 17 00:00:00 2001 From: froydnj Date: Thu, 17 Jun 2010 18:13:51 +0000 Subject: [PATCH] * config/m32r/m32r-protos.h (m32r_print_operand): Delete. (m32r_print_operand_address): Delete. * config/m32r/m32r.h (m32r_punct_chars): Delete. (PRINT_OPERAND): Delete. (PRINT_OPERAND_PUNCT_VALID_P): Delete. (PRINT_OPERAND_ADDRESS): Delete. * config/m32r/m32r.c (m32r_punct_chars): Make static. (m32r_print_operand_address): Make static. (m32r_print_operand): Make static. (m32r_print_operand_punct_valid_p): New function. (TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): (TARGET_PRINT_OPERAND_ADDRESS): Define. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160939 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 15 +++++++++++++++ gcc/config/m32r/m32r-protos.h | 2 -- gcc/config/m32r/m32r.c | 24 ++++++++++++++++++++---- gcc/config/m32r/m32r.h | 18 ------------------ 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b74ff10e0e8..c4483a79a45 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,20 @@ 2010-06-17 Nathan Froyd + * config/m32r/m32r-protos.h (m32r_print_operand): Delete. + (m32r_print_operand_address): Delete. + * config/m32r/m32r.h (m32r_punct_chars): Delete. + (PRINT_OPERAND): Delete. + (PRINT_OPERAND_PUNCT_VALID_P): Delete. + (PRINT_OPERAND_ADDRESS): Delete. + * config/m32r/m32r.c (m32r_punct_chars): Make static. + (m32r_print_operand_address): Make static. + (m32r_print_operand): Make static. + (m32r_print_operand_punct_valid_p): New function. + (TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): + (TARGET_PRINT_OPERAND_ADDRESS): Define. + +2010-06-17 Nathan Froyd + * config/iq2000/iq2000-protos.h (print_operand): Delete. (print_operand_address): Delete. * config/iq2000/iq2000.h (PRINT_OPERAND): Delete. diff --git a/gcc/config/m32r/m32r-protos.h b/gcc/config/m32r/m32r-protos.h index 2b7d09afeb5..56ad708cda5 100644 --- a/gcc/config/m32r/m32r-protos.h +++ b/gcc/config/m32r/m32r-protos.h @@ -43,8 +43,6 @@ extern int zero_and_one (rtx, rtx); extern char * emit_cond_move (rtx *, rtx); extern void m32r_output_block_move (rtx, rtx *); extern int m32r_expand_block_move (rtx *); -extern void m32r_print_operand (FILE *, rtx, int); -extern void m32r_print_operand_address (FILE *, rtx); extern int m32r_not_same_reg (rtx, rtx); extern int m32r_hard_regno_rename_ok (unsigned int, unsigned int); extern int m32r_legitimate_pic_operand_p (rtx); diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c index 36265e6221d..a700ec9a581 100644 --- a/gcc/config/m32r/m32r.c +++ b/gcc/config/m32r/m32r.c @@ -44,7 +44,7 @@ #include "tm-constrs.h" /* Array of valid operand punctuation characters. */ -char m32r_punct_chars[256]; +static char m32r_punct_chars[256]; /* Selected code model. */ enum m32r_model m32r_model = M32R_MODEL_DEFAULT; @@ -67,6 +67,9 @@ static void block_move_call (rtx, rtx, rtx); static int m32r_is_insn (rtx); static rtx m32r_legitimize_address (rtx, rtx, enum machine_mode); static tree m32r_handle_model_attribute (tree *, tree, tree, int, bool *); +static void m32r_print_operand (FILE *, rtx, int); +static void m32r_print_operand_address (FILE *, rtx); +static bool m32r_print_operand_punct_valid_p (unsigned char code); static void m32r_output_function_prologue (FILE *, HOST_WIDE_INT); static void m32r_output_function_epilogue (FILE *, HOST_WIDE_INT); @@ -111,6 +114,13 @@ static const struct attribute_spec m32r_attribute_table[] = #undef TARGET_ASM_ALIGNED_SI_OP #define TARGET_ASM_ALIGNED_SI_OP "\t.word\t" +#undef TARGET_PRINT_OPERAND +#define TARGET_PRINT_OPERAND m32r_print_operand +#undef TARGET_PRINT_OPERAND_ADDRESS +#define TARGET_PRINT_OPERAND_ADDRESS m32r_print_operand_address +#undef TARGET_PRINT_OPERAND_PUNCT_VALID_P +#define TARGET_PRINT_OPERAND_PUNCT_VALID_P m32r_print_operand_punct_valid_p + #undef TARGET_ASM_FUNCTION_PROLOGUE #define TARGET_ASM_FUNCTION_PROLOGUE m32r_output_function_prologue #undef TARGET_ASM_FUNCTION_EPILOGUE @@ -216,7 +226,7 @@ m32r_init (void) { init_reg_tables (); - /* Initialize array for PRINT_OPERAND_PUNCT_VALID_P. */ + /* Initialize array for TARGET_PRINT_OPERAND_PUNCT_VALID_P. */ memset (m32r_punct_chars, 0, sizeof (m32r_punct_chars)); m32r_punct_chars['#'] = 1; m32r_punct_chars['@'] = 1; /* ??? no longer used */ @@ -1933,7 +1943,7 @@ m32r_file_start (void) CODE is a letter or dot (`z' in `%z0') or 0 if no letter was specified. For `%' followed by punctuation, CODE is the punctuation and X is null. */ -void +static void m32r_print_operand (FILE * file, rtx x, int code) { rtx addr; @@ -2160,7 +2170,7 @@ m32r_print_operand (FILE * file, rtx x, int code) /* Print a memory address as an operand to reference that memory location. */ -void +static void m32r_print_operand_address (FILE * file, rtx addr) { rtx base; @@ -2248,6 +2258,12 @@ m32r_print_operand_address (FILE * file, rtx addr) } } +static bool +m32r_print_operand_punct_valid_p (unsigned char code) +{ + return m32r_punct_chars[code]; +} + /* Return true if the operands are the constants 0 and 1. */ int diff --git a/gcc/config/m32r/m32r.h b/gcc/config/m32r/m32r.h index 7b6237a7c22..28d06a4b23c 100644 --- a/gcc/config/m32r/m32r.h +++ b/gcc/config/m32r/m32r.h @@ -1274,24 +1274,6 @@ L2: .word STATIC SUBTARGET_ADDITIONAL_REGISTER_NAMES \ } -/* A C expression which evaluates to true if CODE is a valid - punctuation character for use in the `PRINT_OPERAND' macro. */ -extern char m32r_punct_chars[256]; -#define PRINT_OPERAND_PUNCT_VALID_P(CHAR) \ - m32r_punct_chars[(unsigned char) (CHAR)] - -/* Print operand X (an rtx) in assembler syntax to file FILE. - CODE is a letter or dot (`z' in `%z0') or 0 if no letter was specified. - For `%' followed by punctuation, CODE is the punctuation and X is null. */ -#define PRINT_OPERAND(FILE, X, CODE) \ - m32r_print_operand (FILE, X, CODE) - -/* A C compound statement to output to stdio stream STREAM the - assembler syntax for an instruction operand that is a memory - reference whose address is ADDR. ADDR is an RTL expression. */ -#define PRINT_OPERAND_ADDRESS(FILE, ADDR) \ - m32r_print_operand_address (FILE, ADDR) - /* If defined, C string expressions to be used for the `%R', `%L', `%U', and `%I' options of `asm_fprintf' (see `final.c'). These are useful when a single `md' file must support multiple assembler -- 2.11.0