From 43070a6e9b83d07021fb1a9c70e9358a0d76e004 Mon Sep 17 00:00:00 2001 From: Anatoly Sokolov Date: Mon, 7 Mar 2011 22:59:55 +0300 Subject: [PATCH] stormy16.h (PRINT_OPERAND, [...]): Remove. * config/stormy16/stormy16.h (PRINT_OPERAND, PRINT_OPERAND_ADDRESS): Remove. * config/stormy16/stormy16-protos.h (xstormy16_print_operand, xstormy16_print_operand_address): Remove. * config/stormy16/stormy16.c (xstormy16_print_operand, xstormy16_print_operand_address): Make static. (TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define. From-SVN: r170751 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/stormy16/stormy16-protos.h | 3 --- gcc/config/stormy16/stormy16.c | 17 +++++++++++++---- gcc/config/stormy16/stormy16.h | 4 ---- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64ff65e3d1a..413b5467bcc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2011-03-07 Anatoly Sokolov + + * config/stormy16/stormy16.h (PRINT_OPERAND, PRINT_OPERAND_ADDRESS): + Remove. + * config/stormy16/stormy16-protos.h (xstormy16_print_operand, + xstormy16_print_operand_address): Remove. + * config/stormy16/stormy16.c (xstormy16_print_operand, + xstormy16_print_operand_address): Make static. + (TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define. + 2011-03-07 Pat Haugen PR target/47862 diff --git a/gcc/config/stormy16/stormy16-protos.h b/gcc/config/stormy16/stormy16-protos.h index bd0b5818e08..83e116f5098 100644 --- a/gcc/config/stormy16/stormy16-protos.h +++ b/gcc/config/stormy16/stormy16-protos.h @@ -44,9 +44,6 @@ extern void xstormy16_emit_cbranch (enum rtx_code, rtx, rtx, rtx); extern char *xstormy16_output_cbranch_hi (rtx, const char *, int, rtx); extern char *xstormy16_output_cbranch_si (rtx, const char *, int, rtx); -extern void xstormy16_print_operand (FILE *, rtx, int); -extern void xstormy16_print_operand_address (FILE *, rtx); - extern void xstormy16_expand_casesi (rtx, rtx, rtx, rtx, rtx); extern void xstormy16_output_addr_vec (FILE *, rtx, rtx); extern void xstormy16_expand_call (rtx, rtx, rtx); diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c index eb456e27213..3954d5055f3 100644 --- a/gcc/config/stormy16/stormy16.c +++ b/gcc/config/stormy16/stormy16.c @@ -1642,9 +1642,11 @@ xstormy16_asm_out_constructor (rtx symbol, int priority) assemble_integer (symbol, POINTER_SIZE / BITS_PER_UNIT, POINTER_SIZE, 1); } -/* Print a memory address as an operand to reference that memory location. */ +/* Worker function for TARGET_PRINT_OPERAND_ADDRESS. -void + Print a memory address as an operand to reference that memory location. */ + +static void xstormy16_print_operand_address (FILE *file, rtx address) { HOST_WIDE_INT offset; @@ -1692,9 +1694,11 @@ xstormy16_print_operand_address (FILE *file, rtx address) fputc (')', file); } -/* Print an operand to an assembler instruction. */ +/* Worker function for TARGET_PRINT_OPERAND. -void + Print an operand to an assembler instruction. */ + +static void xstormy16_print_operand (FILE *file, rtx x, int code) { switch (code) @@ -2608,6 +2612,11 @@ static const struct default_options xstorym16_option_optimization_table[] = #undef TARGET_ASM_CAN_OUTPUT_MI_THUNK #define TARGET_ASM_CAN_OUTPUT_MI_THUNK default_can_output_mi_thunk_no_vcall +#undef TARGET_PRINT_OPERAND +#define TARGET_PRINT_OPERAND xstormy16_print_operand +#undef TARGET_PRINT_OPERAND_ADDRESS +#define TARGET_PRINT_OPERAND_ADDRESS xstormy16_print_operand_address + #undef TARGET_MEMORY_MOVE_COST #define TARGET_MEMORY_MOVE_COST xstormy16_memory_move_cost #undef TARGET_RTX_COSTS diff --git a/gcc/config/stormy16/stormy16.h b/gcc/config/stormy16/stormy16.h index ac42ebd40a0..a838b8acf83 100644 --- a/gcc/config/stormy16/stormy16.h +++ b/gcc/config/stormy16/stormy16.h @@ -440,10 +440,6 @@ enum reg_class { { "r14", 14 }, \ { "r15", 15 } } -#define PRINT_OPERAND(STREAM, X, CODE) xstormy16_print_operand (STREAM, X, CODE) - -#define PRINT_OPERAND_ADDRESS(STREAM, X) xstormy16_print_operand_address (STREAM, X) - #define REGISTER_PREFIX "" #define LOCAL_LABEL_PREFIX "." #define USER_LABEL_PREFIX "" -- 2.30.2