Skip to content

R
riscv-gcc-1
Commit 46e43d2b by Anatoly Sokolov Committed by Anatoly Sokolov
Options

sparc.h (PRINT_OPERAND, [...]): Remove. 

	* config/sparc/sparc.h (PRINT_OPERAND, PRINT_OPERAND_ADDRESS,
	PRINT_OPERAND_PUNCT_VALID_P): Remove.
	* config/sparc/sparc-protos.h (print_operand): Remove declaration.
	* config/sparc/sparc.c (TARGET_PRINT_OPERAND_PUNCT_VALID_P,
	TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define.
	(print_operand): Rename to...
	(sparc_print_operand): ...this. Make static. Adjust
	sparc_print_operand function call.
	(sparc_print_operand_punct_valid_p, sparc_print_operand_address): New
	functions.

From-SVN: r173212
parent ecb62563
Showing with 127 additions and 94 deletions
gcc/ChangeLog
2011-04-30 Anatoly Sokolov <aesok@post.ru>
* config/sparc/sparc.h (PRINT_OPERAND, PRINT_OPERAND_ADDRESS,
PRINT_OPERAND_PUNCT_VALID_P): Remove.
* config/sparc/sparc-protos.h (print_operand): Remove declaration.
* config/sparc/sparc.c (TARGET_PRINT_OPERAND_PUNCT_VALID_P,
TARGET_PRINT_OPERAND, TARGET_PRINT_OPERAND_ADDRESS): Define.
(print_operand): Rename to...
(sparc_print_operand): ...this. Make static. Adjust
sparc_print_operand function call.
(sparc_print_operand_punct_valid_p, sparc_print_operand_address): New
functions.
2011-04-30 Jan Hubicka <jh@suse.cz>
PR middle-end/48752
......
gcc/config/sparc/sparc-protos.h
......@@ -75,7 +75,6 @@ extern const char *output_v9branch (rtx, rtx, int, int, int, int, rtx);
extern const char *output_probe_stack_range (rtx, rtx);
extern bool emit_scc_insn (rtx []);
extern void emit_conditional_branch_insn (rtx []);
extern void print_operand (FILE *, rtx, int);
extern int mems_ok_for_ldd_peep (rtx, rtx, rtx);
extern int arith_double_4096_operand (rtx, enum machine_mode);
extern int arith_4096_operand (rtx, enum machine_mode);
......
gcc/config/sparc/sparc.c
......@@ -469,6 +469,9 @@ static const char *sparc_mangle_type (const_tree);
static void sparc_trampoline_init (rtx, tree, rtx);
static enum machine_mode sparc_preferred_simd_mode (enum machine_mode);
static reg_class_t sparc_preferred_reload_class (rtx x, reg_class_t rclass);
static bool sparc_print_operand_punct_valid_p (unsigned char);
static void sparc_print_operand (FILE *, rtx, int);
static void sparc_print_operand_address (FILE *, rtx);
#ifdef SUBTARGET_ATTRIBUTE_TABLE
/* Table of valid machine attributes. */
......@@ -667,6 +670,13 @@ static const struct default_options sparc_option_optimization_table[] =
#undef TARGET_TRAMPOLINE_INIT
#define TARGET_TRAMPOLINE_INIT sparc_trampoline_init
#undef TARGET_PRINT_OPERAND_PUNCT_VALID_P
#define TARGET_PRINT_OPERAND_PUNCT_VALID_P sparc_print_operand_punct_valid_p
#undef TARGET_PRINT_OPERAND
#define TARGET_PRINT_OPERAND sparc_print_operand
#undef TARGET_PRINT_OPERAND_ADDRESS
#define TARGET_PRINT_OPERAND_ADDRESS sparc_print_operand_address
struct gcc_target targetm = TARGET_INITIALIZER;
/* Validate and override various options, and do some machine dependent
......@@ -7330,12 +7340,29 @@ memory_ok_for_ldd (rtx op)
return 1;
}
/* Print operand X (an rtx) in assembler syntax to file FILE.
/* Implement TARGET_PRINT_OPERAND_PUNCT_VALID_P. */
static bool
sparc_print_operand_punct_valid_p (unsigned char code)
{
if (code == '#'
|| code == '*'
|| code == '('
|| code == ')'
|| code == '_'
|| code == '&')
return true;
return false;
}
/* Implement TARGET_PRINT_OPERAND.
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. */
void
print_operand (FILE *file, rtx x, int code)
static void
sparc_print_operand (FILE *file, rtx x, int code)
{
switch (code)
{
......@@ -7613,7 +7640,7 @@ print_operand (FILE *file, rtx x, int code)
}
else if (GET_CODE (x) == LO_SUM)
{
print_operand (file, XEXP (x, 0), 0);
sparc_print_operand (file, XEXP (x, 0), 0);
if (TARGET_CM_MEDMID)
fputs ("+%l44(", file);
else
......@@ -7637,6 +7664,89 @@ print_operand (FILE *file, rtx x, int code)
output_operand_lossage ("floating point constant not a valid immediate operand");
else { output_addr_const (file, x); }
}
/* Implement TARGET_PRINT_OPERAND_ADDRESS. */
static void
sparc_print_operand_address (FILE *file, rtx x)
{
register rtx base, index = 0;
int offset = 0;
register rtx addr = x;
if (REG_P (addr))
fputs (reg_names[REGNO (addr)], file);
else if (GET_CODE (addr) == PLUS)
{
if (CONST_INT_P (XEXP (addr, 0)))
offset = INTVAL (XEXP (addr, 0)), base = XEXP (addr, 1);
else if (CONST_INT_P (XEXP (addr, 1)))
offset = INTVAL (XEXP (addr, 1)), base = XEXP (addr, 0);
else
base = XEXP (addr, 0), index = XEXP (addr, 1);
if (GET_CODE (base) == LO_SUM)
{
gcc_assert (USE_AS_OFFSETABLE_LO10
&& TARGET_ARCH64
&& ! TARGET_CM_MEDMID);
output_operand (XEXP (base, 0), 0);
fputs ("+%lo(", file);
output_address (XEXP (base, 1));
fprintf (file, ")+%d", offset);
}
else
{
fputs (reg_names[REGNO (base)], file);
if (index == 0)
fprintf (file, "%+d", offset);
else if (REG_P (index))
fprintf (file, "+%s", reg_names[REGNO (index)]);
else if (GET_CODE (index) == SYMBOL_REF
|| GET_CODE (index) == LABEL_REF
|| GET_CODE (index) == CONST)
fputc ('+', file), output_addr_const (file, index);
else gcc_unreachable ();
}
}
else if (GET_CODE (addr) == MINUS
&& GET_CODE (XEXP (addr, 1)) == LABEL_REF)
{
output_addr_const (file, XEXP (addr, 0));
fputs ("-(", file);
output_addr_const (file, XEXP (addr, 1));
fputs ("-.)", file);
}
else if (GET_CODE (addr) == LO_SUM)
{
output_operand (XEXP (addr, 0), 0);
if (TARGET_CM_MEDMID)
fputs ("+%l44(", file);
else
fputs ("+%lo(", file);
output_address (XEXP (addr, 1));
fputc (')', file);
}
else if (flag_pic
&& GET_CODE (addr) == CONST
&& GET_CODE (XEXP (addr, 0)) == MINUS
&& GET_CODE (XEXP (XEXP (addr, 0), 1)) == CONST
&& GET_CODE (XEXP (XEXP (XEXP (addr, 0), 1), 0)) == MINUS
&& XEXP (XEXP (XEXP (XEXP (addr, 0), 1), 0), 1) == pc_rtx)
{
addr = XEXP (addr, 0);
output_addr_const (file, XEXP (addr, 0));
/* Group the args of the second CONST in parenthesis. */
fputs ("-(", file);
/* Skip past the second CONST--it does nothing for us. */
output_addr_const (file, XEXP (XEXP (addr, 1), 0));
/* Close the parenthesis. */
fputc (')', file);
}
else
{
output_addr_const (file, addr);
}
}
/* Target hook for assembling integer objects. The sparc version has
special handling for aligned DI-mode objects. */
......
gcc/config/sparc/sparc.h
......@@ -1916,95 +1916,6 @@ extern int sparc_indent_opcode;
} \
} while (0)
#define PRINT_OPERAND_PUNCT_VALID_P(CHAR) \
((CHAR) == '#' || (CHAR) == '*' || (CHAR) == '(' \
|| (CHAR) == ')' || (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) print_operand (FILE, X, CODE)
/* Print a memory address as an operand to reference that memory location. */
#define PRINT_OPERAND_ADDRESS(FILE, ADDR) \
{ register rtx base, index = 0; \
int offset = 0; \
register rtx addr = ADDR; \
if (GET_CODE (addr) == REG) \
fputs (reg_names[REGNO (addr)], FILE); \
else if (GET_CODE (addr) == PLUS) \
{ \
if (GET_CODE (XEXP (addr, 0)) == CONST_INT) \
offset = INTVAL (XEXP (addr, 0)), base = XEXP (addr, 1);\
else if (GET_CODE (XEXP (addr, 1)) == CONST_INT) \
offset = INTVAL (XEXP (addr, 1)), base = XEXP (addr, 0);\
else \
base = XEXP (addr, 0), index = XEXP (addr, 1); \
if (GET_CODE (base) == LO_SUM) \
{ \
gcc_assert (USE_AS_OFFSETABLE_LO10 \
&& TARGET_ARCH64 \
&& ! TARGET_CM_MEDMID); \
output_operand (XEXP (base, 0), 0); \
fputs ("+%lo(", FILE); \
output_address (XEXP (base, 1)); \
fprintf (FILE, ")+%d", offset); \
} \
else \
{ \
fputs (reg_names[REGNO (base)], FILE); \
if (index == 0) \
fprintf (FILE, "%+d", offset); \
else if (GET_CODE (index) == REG) \
fprintf (FILE, "+%s", reg_names[REGNO (index)]); \
else if (GET_CODE (index) == SYMBOL_REF \
|| GET_CODE (index) == LABEL_REF \
|| GET_CODE (index) == CONST) \
fputc ('+', FILE), output_addr_const (FILE, index); \
else gcc_unreachable (); \
} \
} \
else if (GET_CODE (addr) == MINUS \
&& GET_CODE (XEXP (addr, 1)) == LABEL_REF) \
{ \
output_addr_const (FILE, XEXP (addr, 0)); \
fputs ("-(", FILE); \
output_addr_const (FILE, XEXP (addr, 1)); \
fputs ("-.)", FILE); \
} \
else if (GET_CODE (addr) == LO_SUM) \
{ \
output_operand (XEXP (addr, 0), 0); \
if (TARGET_CM_MEDMID) \
fputs ("+%l44(", FILE); \
else \
fputs ("+%lo(", FILE); \
output_address (XEXP (addr, 1)); \
fputc (')', FILE); \
} \
else if (flag_pic && GET_CODE (addr) == CONST \
&& GET_CODE (XEXP (addr, 0)) == MINUS \
&& GET_CODE (XEXP (XEXP (addr, 0), 1)) == CONST \
&& GET_CODE (XEXP (XEXP (XEXP (addr, 0), 1), 0)) == MINUS \
&& XEXP (XEXP (XEXP (XEXP (addr, 0), 1), 0), 1) == pc_rtx) \
{ \
addr = XEXP (addr, 0); \
output_addr_const (FILE, XEXP (addr, 0)); \
/* Group the args of the second CONST in parenthesis. */ \
fputs ("-(", FILE); \
/* Skip past the second CONST--it does nothing for us. */\
output_addr_const (FILE, XEXP (XEXP (addr, 1), 0)); \
/* Close the parenthesis. */ \
fputc (')', FILE); \
} \
else \
{ \
output_addr_const (FILE, addr); \
} \
}
/* TLS support defaulting to original Sun flavor. GNU extensions
must be activated in separate configuration files. */
#ifdef HAVE_AS_TLS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment