Skip to content

R
riscv-gcc-1
Commit 82348675 by Sandra Loosemore Committed by Sandra Loosemore
Options

nios2-protos.h (nios2_large_constant_p): Declare. 

2017-10-23  Sandra Loosemore  <sandra@codesourcery.com>

	gcc/
	* config/nios2/nios2-protos.h (nios2_large_constant_p): Declare.
	(nios2_symbolic_memory_operand_p): Declare.
	(nios2_split_large_constant): Declare.
	(nios2_split_symbolic_memory_operand): Declare.
	* config/nios2/nios2.c: Adjust includes.
	(nios2_symbolic_constant_allowed): New.
	(nios2_symbolic_constant_p): New.
	(nios2_plus_symbolic_constant_p): New.
	(nios2_valid_addr_expr_p): Recognize addresses involving 
	symbolic constants.
	(nios2_legitimate_address_p): Likewise, also LO_SUM.
	(nios2_symbolic_memory_operand_p): New.
	(nios2_large_constant_p): New.
	(nios2_split_large_constant): New.
	(nios2_split_plus_large_constant): New.
	(nios2_split_symbolic_memory_operand): New.
	(nios2_legitimize_address): Code refactoring.  Handle addresses
	involving symbolic constants.
	(nios2_emit_move_sequence): Likewise.
	(nios2_print_operand): Improve error output.
	(nios2_print_operand_address): Handle LO_SUM.
	(nios2_cdx_narrow_form_p): Likewise.
	* config/nios2/nios2.md (movqi_internal): Add splitter for memory
	operands involving symbolic constants.
	(movhi_internal, movsi_internal): Likewise.
	(zero_extendhisi2, zero_extendqi<mode>2): Likewise.
	(extendhisi2, extendqi<mode>2): Likewise.

From-SVN: r254033
parent 6642bfb2
Showing with 317 additions and 22 deletions
gcc/ChangeLog
2017-10-23 Sandra Loosemore <sandra@codesourcery.com>
* config/nios2/nios2-protos.h (nios2_large_constant_p): Declare.
(nios2_symbolic_memory_operand_p): Declare.
(nios2_split_large_constant): Declare.
(nios2_split_symbolic_memory_operand): Declare.
* config/nios2/nios2.c: Adjust includes.
(nios2_symbolic_constant_allowed): New.
(nios2_symbolic_constant_p): New.
(nios2_plus_symbolic_constant_p): New.
(nios2_valid_addr_expr_p): Recognize addresses involving
symbolic constants.
(nios2_legitimate_address_p): Likewise, also LO_SUM.
(nios2_symbolic_memory_operand_p): New.
(nios2_large_constant_p): New.
(nios2_split_large_constant): New.
(nios2_split_plus_large_constant): New.
(nios2_split_symbolic_memory_operand): New.
(nios2_legitimize_address): Code refactoring. Handle addresses
involving symbolic constants.
(nios2_emit_move_sequence): Likewise.
(nios2_print_operand): Improve error output.
(nios2_print_operand_address): Handle LO_SUM.
(nios2_cdx_narrow_form_p): Likewise.
* config/nios2/nios2.md (movqi_internal): Add splitter for memory
operands involving symbolic constants.
(movhi_internal, movsi_internal): Likewise.
(zero_extendhisi2, zero_extendqi<mode>2): Likewise.
(extendhisi2, extendqi<mode>2): Likewise.
2017-10-23 Sandra Loosemore <sandra@codesourcery.com>
* tree-pass.h (PROP_rtl_split_insns): Define.
* recog.c (pass_data_split_all_insns): Provide PROP_rtl_split_insns.
gcc/config/nios2/nios2-protos.h
......@@ -30,6 +30,11 @@ extern bool nios2_expand_return (void);
extern void nios2_function_profiler (FILE *, int);
#ifdef RTX_CODE
extern bool nios2_large_constant_p (rtx);
extern bool nios2_symbolic_memory_operand_p (rtx);
extern rtx nios2_split_large_constant (rtx, rtx);
extern rtx nios2_split_symbolic_memory_operand (rtx);
extern bool nios2_emit_move_sequence (rtx *, machine_mode);
extern void nios2_emit_expensive_div (rtx *, machine_mode);
extern void nios2_adjust_call_address (rtx *, rtx);
......
gcc/config/nios2/nios2.md
......@@ -201,7 +201,7 @@
"addi\\t%0, %1, %L2"
[(set_attr "type" "alu")])
(define_insn "movqi_internal"
(define_insn_and_split "movqi_internal"
[(set (match_operand:QI 0 "nonimmediate_operand" "=m, r,r")
(match_operand:QI 1 "general_operand" "rM,m,rI"))]
"(register_operand (operands[0], QImode)
......@@ -224,20 +224,47 @@
gcc_unreachable ();
}
}
"(nios2_symbolic_memory_operand_p (operands[0])
|| nios2_symbolic_memory_operand_p (operands[1]))"
[(set (match_dup 0) (match_dup 1))]
{
if (nios2_symbolic_memory_operand_p (operands[0]))
operands[0] = nios2_split_symbolic_memory_operand (operands[0]);
else
operands[1] = nios2_split_symbolic_memory_operand (operands[1]);
}
[(set_attr "type" "st,ld,mov")])
(define_insn "movhi_internal"
(define_insn_and_split "movhi_internal"
[(set (match_operand:HI 0 "nonimmediate_operand" "=m, r,r")
(match_operand:HI 1 "general_operand" "rM,m,rI"))]
"(register_operand (operands[0], HImode)
|| reg_or_0_operand (operands[1], HImode))"
"@
sth%o0%.\\t%z1, %0
ldhu%o1%.\\t%0, %1
mov%i1%.\\t%0, %z1"
{
switch (which_alternative)
{
case 0:
return "sth%o0%.\\t%z1, %0";
case 1:
return "ldhu%o1%.\\t%0, %1";
case 2:
return "mov%i1%.\\t%0, %z1";
default:
gcc_unreachable ();
}
}
"(nios2_symbolic_memory_operand_p (operands[0])
|| nios2_symbolic_memory_operand_p (operands[1]))"
[(set (match_dup 0) (match_dup 1))]
{
if (nios2_symbolic_memory_operand_p (operands[0]))
operands[0] = nios2_split_symbolic_memory_operand (operands[0]);
else
operands[1] = nios2_split_symbolic_memory_operand (operands[1]);
}
[(set_attr "type" "st,ld,mov")])
(define_insn "movsi_internal"
(define_insn_and_split "movsi_internal"
[(set (match_operand:SI 0 "nonimmediate_operand" "=m, r,r, r")
(match_operand:SI 1 "general_operand" "rM,m,rIJK,S"))]
"(register_operand (operands[0], SImode)
......@@ -269,6 +296,18 @@
gcc_unreachable ();
}
}
"(nios2_symbolic_memory_operand_p (operands[0])
|| nios2_symbolic_memory_operand_p (operands[1])
|| nios2_large_constant_p (operands[1]))"
[(set (match_dup 0) (match_dup 1))]
{
if (nios2_symbolic_memory_operand_p (operands[0]))
operands[0] = nios2_split_symbolic_memory_operand (operands[0]);
else if (nios2_symbolic_memory_operand_p (operands[1]))
operands[1] = nios2_split_symbolic_memory_operand (operands[1]);
else
operands[1] = nios2_split_large_constant (operands[1], operands[0]);
}
[(set_attr "type" "st,ld,mov,alu")])
(define_mode_iterator BH [QI HI])
......@@ -318,42 +357,62 @@
(define_mode_iterator QX [HI SI])
;; Zero extension patterns
(define_insn "zero_extendhisi2"
(define_insn_and_split "zero_extendhisi2"
[(set (match_operand:SI 0 "register_operand" "=r,r")
(zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r,m")))]
""
"@
andi%.\\t%0, %1, 0xffff
ldhu%o1%.\\t%0, %1"
"nios2_symbolic_memory_operand_p (operands[1])"
[(set (match_dup 0) (zero_extend:SI (match_dup 1)))]
{
operands[1] = nios2_split_symbolic_memory_operand (operands[1]);
}
[(set_attr "type" "and,ld")])
(define_insn "zero_extendqi<mode>2"
(define_insn_and_split "zero_extendqi<mode>2"
[(set (match_operand:QX 0 "register_operand" "=r,r")
(zero_extend:QX (match_operand:QI 1 "nonimmediate_operand" "r,m")))]
""
"@
andi%.\\t%0, %1, 0xff
ldbu%o1%.\\t%0, %1"
"nios2_symbolic_memory_operand_p (operands[1])"
[(set (match_dup 0) (zero_extend:QX (match_dup 1)))]
{
operands[1] = nios2_split_symbolic_memory_operand (operands[1]);
}
[(set_attr "type" "and,ld")])
;; Sign extension patterns
(define_insn "extendhisi2"
(define_insn_and_split "extendhisi2"
[(set (match_operand:SI 0 "register_operand" "=r,r")
(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r,m")))]
""
"@
#
ldh%o1%.\\t%0, %1"
"nios2_symbolic_memory_operand_p (operands[1])"
[(set (match_dup 0) (sign_extend:SI (match_dup 1)))]
{
operands[1] = nios2_split_symbolic_memory_operand (operands[1]);
}
[(set_attr "type" "alu,ld")])
(define_insn "extendqi<mode>2"
(define_insn_and_split "extendqi<mode>2"
[(set (match_operand:QX 0 "register_operand" "=r,r")
(sign_extend:QX (match_operand:QI 1 "nonimmediate_operand" "r,m")))]
""
"@
#
ldb%o1%.\\t%0, %1"
"nios2_symbolic_memory_operand_p (operands[1])"
[(set (match_dup 0) (sign_extend:QX (match_dup 1)))]
{
operands[1] = nios2_split_symbolic_memory_operand (operands[1]);
}
[(set_attr "type" "alu,ld")])
;; Split patterns for register alternative cases.
......
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