diff options
author | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-17 18:15:39 +0000 |
---|---|---|
committer | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-17 18:15:39 +0000 |
commit | 932f5d0a3eafef1035152d5e9e83f9844d8f3bba (patch) | |
tree | 538f2e2ead90f2370f1b7016b42e0a67a7d3513d /gcc | |
parent | 6d6df0208318ae556cbbb525c379a3c4155c75e6 (diff) | |
download | ppe42-gcc-932f5d0a3eafef1035152d5e9e83f9844d8f3bba.tar.gz ppe42-gcc-932f5d0a3eafef1035152d5e9e83f9844d8f3bba.zip |
* config/mcore/mcore-protos.h (mcore_print_operand): Delete.
(mcore_print_operand_address): Delete.
* config/mcore/mcore.h (PRINT_OPERAND): Delete.
(PRINT_OPERAND_PUNCT_VALID_P): Delete.
(PRINT_OPERAND_ADDRESS): Delete.
* config/mcore/mcore.c (mcore_print_operand_address): Make static.
(mcore_print_operand): Make static.
(mcore_print_operand_punct_valid_p): New function.
(TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define
(TARGET_PRINT_OPERAND_PUNCT_VALID_P): Define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160941 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 13 | ||||
-rw-r--r-- | gcc/config/mcore/mcore-protos.h | 2 | ||||
-rw-r--r-- | gcc/config/mcore/mcore.c | 21 | ||||
-rw-r--r-- | gcc/config/mcore/mcore.h | 11 |
4 files changed, 32 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0aceca84bf6..78a410a1f36 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,18 @@ 2010-06-17 Nathan Froyd <froydnj@codesourcery.com> + * config/mcore/mcore-protos.h (mcore_print_operand): Delete. + (mcore_print_operand_address): Delete. + * config/mcore/mcore.h (PRINT_OPERAND): Delete. + (PRINT_OPERAND_PUNCT_VALID_P): Delete. + (PRINT_OPERAND_ADDRESS): Delete. + * config/mcore/mcore.c (mcore_print_operand_address): Make static. + (mcore_print_operand): Make static. + (mcore_print_operand_punct_valid_p): New function. + (TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define + (TARGET_PRINT_OPERAND_PUNCT_VALID_P): Define. + +2010-06-17 Nathan Froyd <froydnj@codesourcery.com> + * config/m68hc11/m68hc11-protos.h (print_operand): Delete. (print_operand_address): Delete. * config/m68hc11/m68hc11.h (PRINT_OPERAND): Delete. diff --git a/gcc/config/mcore/mcore-protos.h b/gcc/config/mcore/mcore-protos.h index 331cf7191d7..9be73236aa2 100644 --- a/gcc/config/mcore/mcore-protos.h +++ b/gcc/config/mcore/mcore-protos.h @@ -54,8 +54,6 @@ extern int mcore_is_dead (rtx, rtx); extern int mcore_expand_insv (rtx *); extern bool mcore_expand_block_move (rtx *); extern const char * mcore_output_andn (rtx, rtx *); -extern void mcore_print_operand_address (FILE *, rtx); -extern void mcore_print_operand (FILE *, rtx, int); extern bool mcore_gen_compare (RTX_CODE, rtx, rtx); extern int mcore_symbolic_address_p (rtx); extern bool mcore_r15_operand_p (rtx); diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c index 574b5f6d5cd..6bb4e6476fb 100644 --- a/gcc/config/mcore/mcore.c +++ b/gcc/config/mcore/mcore.c @@ -131,6 +131,9 @@ static tree mcore_handle_naked_attribute (tree *, tree, tree, int, bool * static void mcore_asm_named_section (const char *, unsigned int, tree); #endif +static void mcore_print_operand (FILE *, rtx, int); +static void mcore_print_operand_address (FILE *, rtx); +static bool mcore_print_operand_punct_valid_p (unsigned char code); static void mcore_unique_section (tree, int); static void mcore_encode_section_info (tree, rtx, int); static const char *mcore_strip_name_encoding (const char *); @@ -173,6 +176,13 @@ static const struct attribute_spec mcore_attribute_table[] = #define TARGET_ASM_UNALIGNED_SI_OP "\t.long\t" #endif +#undef TARGET_PRINT_OPERAND +#define TARGET_PRINT_OPERAND mcore_print_operand +#undef TARGET_PRINT_OPERAND_ADDRESS +#define TARGET_PRINT_OPERAND_ADDRESS mcore_print_operand_address +#undef TARGET_PRINT_OPERAND_PUNCT_VALID_P +#define TARGET_PRINT_OPERAND_PUNCT_VALID_P mcore_print_operand_punct_valid_p + #undef TARGET_ATTRIBUTE_TABLE #define TARGET_ATTRIBUTE_TABLE mcore_attribute_table #undef TARGET_ASM_UNIQUE_SECTION @@ -287,7 +297,7 @@ calc_live_regs (int * count) /* Print the operand address in x to the stream. */ -void +static void mcore_print_operand_address (FILE * stream, rtx x) { switch (GET_CODE (x)) @@ -329,6 +339,13 @@ mcore_print_operand_address (FILE * stream, rtx x) } } +static bool +mcore_print_operand_punct_valid_p (unsigned char code) +{ + return (code == '.' || code == '#' || code == '*' || code == '^' + || code == '!'); +} + /* Print operand x (an rtx) in assembler syntax to file stream according to modifier code. @@ -341,7 +358,7 @@ mcore_print_operand_address (FILE * stream, rtx x) 'U' print register for ldm/stm instruction 'X' print byte number for xtrbN instruction. */ -void +static void mcore_print_operand (FILE * stream, rtx x, int code) { switch (code) diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h index 8167400633f..4f0ef1d7d6b 100644 --- a/gcc/config/mcore/mcore.h +++ b/gcc/config/mcore/mcore.h @@ -960,15 +960,4 @@ extern long mcore_current_compilation_timestamp; } \ while (0) -/* 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(STREAM, X, CODE) mcore_print_operand (STREAM, X, CODE) - -/* Print a memory address as an operand to reference that memory location. */ -#define PRINT_OPERAND_ADDRESS(STREAM,X) mcore_print_operand_address (STREAM, X) - -#define PRINT_OPERAND_PUNCT_VALID_P(CHAR) \ - ((CHAR)=='.' || (CHAR) == '#' || (CHAR) == '*' || (CHAR) == '^' || (CHAR) == '!') - #endif /* ! GCC_MCORE_H */ |