Skip to content

R
riscv-gcc-1
Commit 01a3a324 by Naveen H.S Committed by Naveen H.S
Options

aarch64.c (aarch64_print_operand): Replace %r in asm_fprintf with reg_names. 

	* config/aarch64/aarch64.c (aarch64_print_operand): Replace %r
	in asm_fprintf with reg_names.
	(aarch64_print_operand_address): Likewise.
	(aarch64_return_addr): Likewise.
	* config/aarch64/aarch64.h (ASM_FPRINTF_EXTENSIONS): Remove.

From-SVN: r195077
parent 997271c1
Showing with 32 additions and 34 deletions
gcc/ChangeLog
...@@ -96,6 +96,14 @@ ...@@ -96,6 +96,14 @@
* predict.c (predict_loops): If max is 0, don't call compare_tree_int. * predict.c (predict_loops): If max is 0, don't call compare_tree_int.
If nitercst is 0, don't predict the exit edge. If nitercst is 0, don't predict the exit edge.
2013-01-08 Naveen H.S <Naveen.Hurugalawadi@caviumnetworks.com>
* config/aarch64/aarch64.c (aarch64_print_operand): Replace %r
in asm_fprintf with reg_names.
(aarch64_print_operand_address): Likewise.
(aarch64_return_addr): Likewise.
* config/aarch64/aarch64.h (ASM_FPRINTF_EXTENSIONS): Remove.
2013-01-08 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> 2013-01-08 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* config/pa/pa.h (VAL_U6_BITS_P): Define. * config/pa/pa.h (VAL_U6_BITS_P): Define.
......
gcc/config/aarch64/aarch64.c
...@@ -3278,7 +3278,7 @@ aarch64_print_operand (FILE *f, rtx x, char code) ...@@ -3278,7 +3278,7 @@ aarch64_print_operand (FILE *f, rtx x, char code)
return; return;
} }
asm_fprintf (f, "%r", REGNO (x) + 1); asm_fprintf (f, "%s", reg_names [REGNO (x) + 1]);
break; break;
case 'Q': case 'Q':
...@@ -3288,7 +3288,7 @@ aarch64_print_operand (FILE *f, rtx x, char code) ...@@ -3288,7 +3288,7 @@ aarch64_print_operand (FILE *f, rtx x, char code)
output_operand_lossage ("invalid operand for '%%%c'", code); output_operand_lossage ("invalid operand for '%%%c'", code);
return; return;
} }
asm_fprintf (f, "%r", REGNO (x) + (WORDS_BIG_ENDIAN ? 1 : 0)); asm_fprintf (f, "%s", reg_names [REGNO (x) + (WORDS_BIG_ENDIAN ? 1 : 0)]);
break; break;
case 'R': case 'R':
...@@ -3298,7 +3298,7 @@ aarch64_print_operand (FILE *f, rtx x, char code) ...@@ -3298,7 +3298,7 @@ aarch64_print_operand (FILE *f, rtx x, char code)
output_operand_lossage ("invalid operand for '%%%c'", code); output_operand_lossage ("invalid operand for '%%%c'", code);
return; return;
} }
asm_fprintf (f, "%r", REGNO (x) + (WORDS_BIG_ENDIAN ? 0 : 1)); asm_fprintf (f, "%s", reg_names [REGNO (x) + (WORDS_BIG_ENDIAN ? 0 : 1)]);
break; break;
case 'm': case 'm':
...@@ -3403,7 +3403,7 @@ aarch64_print_operand (FILE *f, rtx x, char code) ...@@ -3403,7 +3403,7 @@ aarch64_print_operand (FILE *f, rtx x, char code)
switch (GET_CODE (x)) switch (GET_CODE (x))
{ {
case REG: case REG:
asm_fprintf (f, "%r", REGNO (x)); asm_fprintf (f, "%s", reg_names [REGNO (x)]);
break; break;
case MEM: case MEM:
...@@ -3558,36 +3558,36 @@ aarch64_print_operand_address (FILE *f, rtx x) ...@@ -3558,36 +3558,36 @@ aarch64_print_operand_address (FILE *f, rtx x)
{ {
case ADDRESS_REG_IMM: case ADDRESS_REG_IMM:
if (addr.offset == const0_rtx) if (addr.offset == const0_rtx)
asm_fprintf (f, "[%r]", REGNO (addr.base)); asm_fprintf (f, "[%s]", reg_names [REGNO (addr.base)]);
else else
asm_fprintf (f, "[%r,%wd]", REGNO (addr.base), asm_fprintf (f, "[%s,%wd]", reg_names [REGNO (addr.base)],
INTVAL (addr.offset)); INTVAL (addr.offset));
return; return;
case ADDRESS_REG_REG: case ADDRESS_REG_REG:
if (addr.shift == 0) if (addr.shift == 0)
asm_fprintf (f, "[%r,%r]", REGNO (addr.base), asm_fprintf (f, "[%s,%s]", reg_names [REGNO (addr.base)],
REGNO (addr.offset)); reg_names [REGNO (addr.offset)]);
else else
asm_fprintf (f, "[%r,%r,lsl %u]", REGNO (addr.base), asm_fprintf (f, "[%s,%s,lsl %u]", reg_names [REGNO (addr.base)],
REGNO (addr.offset), addr.shift); reg_names [REGNO (addr.offset)], addr.shift);
return; return;
case ADDRESS_REG_UXTW: case ADDRESS_REG_UXTW:
if (addr.shift == 0) if (addr.shift == 0)
asm_fprintf (f, "[%r,w%d,uxtw]", REGNO (addr.base), asm_fprintf (f, "[%s,w%d,uxtw]", reg_names [REGNO (addr.base)],
REGNO (addr.offset) - R0_REGNUM); REGNO (addr.offset) - R0_REGNUM);
else else
asm_fprintf (f, "[%r,w%d,uxtw %u]", REGNO (addr.base), asm_fprintf (f, "[%s,w%d,uxtw %u]", reg_names [REGNO (addr.base)],
REGNO (addr.offset) - R0_REGNUM, addr.shift); REGNO (addr.offset) - R0_REGNUM, addr.shift);
return; return;
case ADDRESS_REG_SXTW: case ADDRESS_REG_SXTW:
if (addr.shift == 0) if (addr.shift == 0)
asm_fprintf (f, "[%r,w%d,sxtw]", REGNO (addr.base), asm_fprintf (f, "[%s,w%d,sxtw]", reg_names [REGNO (addr.base)],
REGNO (addr.offset) - R0_REGNUM); REGNO (addr.offset) - R0_REGNUM);
else else
asm_fprintf (f, "[%r,w%d,sxtw %u]", REGNO (addr.base), asm_fprintf (f, "[%s,w%d,sxtw %u]", reg_names [REGNO (addr.base)],
REGNO (addr.offset) - R0_REGNUM, addr.shift); REGNO (addr.offset) - R0_REGNUM, addr.shift);
return; return;
...@@ -3595,27 +3595,27 @@ aarch64_print_operand_address (FILE *f, rtx x) ...@@ -3595,27 +3595,27 @@ aarch64_print_operand_address (FILE *f, rtx x)
switch (GET_CODE (x)) switch (GET_CODE (x))
{ {
case PRE_INC: case PRE_INC:
asm_fprintf (f, "[%r,%d]!", REGNO (addr.base), asm_fprintf (f, "[%s,%d]!", reg_names [REGNO (addr.base)],
GET_MODE_SIZE (aarch64_memory_reference_mode)); GET_MODE_SIZE (aarch64_memory_reference_mode));
return; return;
case POST_INC: case POST_INC:
asm_fprintf (f, "[%r],%d", REGNO (addr.base), asm_fprintf (f, "[%s],%d", reg_names [REGNO (addr.base)],
GET_MODE_SIZE (aarch64_memory_reference_mode)); GET_MODE_SIZE (aarch64_memory_reference_mode));
return; return;
case PRE_DEC: case PRE_DEC:
asm_fprintf (f, "[%r,-%d]!", REGNO (addr.base), asm_fprintf (f, "[%s,-%d]!", reg_names [REGNO (addr.base)],
GET_MODE_SIZE (aarch64_memory_reference_mode)); GET_MODE_SIZE (aarch64_memory_reference_mode));
return; return;
case POST_DEC: case POST_DEC:
asm_fprintf (f, "[%r],-%d", REGNO (addr.base), asm_fprintf (f, "[%s],-%d", reg_names [REGNO (addr.base)],
GET_MODE_SIZE (aarch64_memory_reference_mode)); GET_MODE_SIZE (aarch64_memory_reference_mode));
return; return;
case PRE_MODIFY: case PRE_MODIFY:
asm_fprintf (f, "[%r,%wd]!", REGNO (addr.base), asm_fprintf (f, "[%s,%wd]!", reg_names [REGNO (addr.base)],
INTVAL (addr.offset)); INTVAL (addr.offset));
return; return;
case POST_MODIFY: case POST_MODIFY:
asm_fprintf (f, "[%r],%wd", REGNO (addr.base), asm_fprintf (f, "[%s],%wd", reg_names [REGNO (addr.base)],
INTVAL (addr.offset)); INTVAL (addr.offset));
return; return;
default: default:
...@@ -3624,7 +3624,7 @@ aarch64_print_operand_address (FILE *f, rtx x) ...@@ -3624,7 +3624,7 @@ aarch64_print_operand_address (FILE *f, rtx x)
break; break;
case ADDRESS_LO_SUM: case ADDRESS_LO_SUM:
asm_fprintf (f, "[%r,#:lo12:", REGNO (addr.base)); asm_fprintf (f, "[%s,#:lo12:", reg_names [REGNO (addr.base)]);
output_addr_const (f, addr.offset); output_addr_const (f, addr.offset);
asm_fprintf (f, "]"); asm_fprintf (f, "]");
return; return;
...@@ -3935,9 +3935,9 @@ aarch64_return_addr (int count, rtx frame ATTRIBUTE_UNUSED) ...@@ -3935,9 +3935,9 @@ aarch64_return_addr (int count, rtx frame ATTRIBUTE_UNUSED)
static void static void
aarch64_asm_trampoline_template (FILE *f) aarch64_asm_trampoline_template (FILE *f)
{ {
asm_fprintf (f, "\tldr\t%r, .+16\n", IP1_REGNUM); asm_fprintf (f, "\tldr\t%s, .+16\n", reg_names [IP1_REGNUM]);
asm_fprintf (f, "\tldr\t%r, .+20\n", STATIC_CHAIN_REGNUM); asm_fprintf (f, "\tldr\t%s, .+20\n", reg_names [STATIC_CHAIN_REGNUM]);
asm_fprintf (f, "\tbr\t%r\n", IP1_REGNUM); asm_fprintf (f, "\tbr\t%s\n", reg_names [IP1_REGNUM]);
assemble_aligned_integer (4, const0_rtx); assemble_aligned_integer (4, const0_rtx);
assemble_aligned_integer (UNITS_PER_WORD, const0_rtx); assemble_aligned_integer (UNITS_PER_WORD, const0_rtx);
assemble_aligned_integer (UNITS_PER_WORD, const0_rtx); assemble_aligned_integer (UNITS_PER_WORD, const0_rtx);
......
gcc/config/aarch64/aarch64.h
...@@ -768,16 +768,6 @@ do { \ ...@@ -768,16 +768,6 @@ do { \
#define ASM_APP_ON "\t" ASM_COMMENT_START " Start of user assembly\n" #define ASM_APP_ON "\t" ASM_COMMENT_START " Start of user assembly\n"
#define ASM_APP_OFF "\t" ASM_COMMENT_START " End of user assembly\n" #define ASM_APP_OFF "\t" ASM_COMMENT_START " End of user assembly\n"
#define ASM_FPRINTF_EXTENSIONS(FILE, ARGS, P) \
case '@': \
fputs (ASM_COMMENT_START, FILE); \
break; \
\
case 'r': \
fputs (REGISTER_PREFIX, FILE); \
fputs (reg_names[va_arg (ARGS, int)], FILE); \
break;
#define CONSTANT_POOL_BEFORE_FUNCTION 0 #define CONSTANT_POOL_BEFORE_FUNCTION 0
/* This definition should be relocated to aarch64-elf-raw.h. This macro /* This definition should be relocated to aarch64-elf-raw.h. This macro
......
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