Skip to content

R
riscv-gcc-1
Commit bda2a571 by Richard Sandiford Committed by Richard Sandiford
Options

m68k-protos.h (valid_mov3q_const): Take a HOST_WIDE_INT and return a bool. 

gcc/
	* config/m68k/m68k-protos.h (valid_mov3q_const): Take a HOST_WIDE_INT
	and return a bool.
	(output_move_const_into_data_reg, output_move_simode_const): Delete.
	* config/m68k/m68k.c (const_method, const_int_cost): Take a
	HOST_WIDE_INT instead of an rtx.
	(m68k_rtx_costs): Update call accordingly.
	(output_move_const_into_data_reg): Likewise.  Fix formatting.
	(valid_mov3q_const): Take a HOST_WIDE_INT instead of an rtx.
	Return a bool.
	(output_move_simode_const): Update calls after above changes.
	Rework to use automatic variables and predicates like MEM_P.
	* config/m68k/m68k.md (pushexthisi_const): Update call to
	valid_mov3q_const.

From-SVN: r120957
parent 23e73993
Showing with 60 additions and 52 deletions
gcc/ChangeLog
2007-01-19 Richard Sandiford <richard@codesourcery.com>
* config/m68k/m68k-protos.h (valid_mov3q_const): Take a HOST_WIDE_INT
and return a bool.
(output_move_const_into_data_reg, output_move_simode_const): Delete.
* config/m68k/m68k.c (const_method, const_int_cost): Take a
HOST_WIDE_INT instead of an rtx.
(m68k_rtx_costs): Update call accordingly.
(output_move_const_into_data_reg): Likewise. Fix formatting.
(valid_mov3q_const): Take a HOST_WIDE_INT instead of an rtx.
Return a bool.
(output_move_simode_const): Update calls after above changes.
Rework to use automatic variables and predicates like MEM_P.
* config/m68k/m68k.md (pushexthisi_const): Update call to
valid_mov3q_const.
2007-01-19 Dirk Mueller <dmueller@suse.de> 2007-01-19 Dirk Mueller <dmueller@suse.de>
* tree-ssa-alias.c (perform_var_substitution): Fix typo * tree-ssa-alias.c (perform_var_substitution): Fix typo
......
gcc/config/m68k/m68k-protos.h
...@@ -22,9 +22,7 @@ Boston, MA 02110-1301, USA. */ ...@@ -22,9 +22,7 @@ Boston, MA 02110-1301, USA. */
#ifdef RTX_CODE #ifdef RTX_CODE
extern HOST_WIDE_INT m68k_initial_elimination_offset (int from, int to); extern HOST_WIDE_INT m68k_initial_elimination_offset (int from, int to);
extern const char *output_move_const_into_data_reg (rtx *); extern bool valid_mov3q_const (HOST_WIDE_INT);
extern int valid_mov3q_const (rtx);
extern const char *output_move_simode_const (rtx *);
extern const char *output_move_simode (rtx *); extern const char *output_move_simode (rtx *);
extern const char *output_move_himode (rtx *); extern const char *output_move_himode (rtx *);
extern const char *output_move_qimode (rtx *); extern const char *output_move_qimode (rtx *);
......
gcc/config/m68k/m68k.c
...@@ -120,7 +120,6 @@ static tree m68k_handle_fndecl_attribute (tree *node, tree name, ...@@ -120,7 +120,6 @@ static tree m68k_handle_fndecl_attribute (tree *node, tree name,
bool *no_add_attrs); bool *no_add_attrs);
static void m68k_compute_frame_layout (void); static void m68k_compute_frame_layout (void);
static bool m68k_save_reg (unsigned int regno, bool interrupt_handler); static bool m68k_save_reg (unsigned int regno, bool interrupt_handler);
static int const_int_cost (rtx);
static bool m68k_rtx_costs (rtx, int, int, int *); static bool m68k_rtx_costs (rtx, int, int, int *);
...@@ -1752,17 +1751,15 @@ legitimize_pic_address (rtx orig, enum machine_mode mode ATTRIBUTE_UNUSED, ...@@ -1752,17 +1751,15 @@ legitimize_pic_address (rtx orig, enum machine_mode mode ATTRIBUTE_UNUSED,
typedef enum { MOVL, SWAP, NEGW, NOTW, NOTB, MOVQ, MVS, MVZ } CONST_METHOD; typedef enum { MOVL, SWAP, NEGW, NOTW, NOTB, MOVQ, MVS, MVZ } CONST_METHOD;
static CONST_METHOD const_method (rtx);
#define USE_MOVQ(i) ((unsigned) ((i) + 128) <= 255) #define USE_MOVQ(i) ((unsigned) ((i) + 128) <= 255)
/* Return the type of move that should be used for integer I. */
static CONST_METHOD static CONST_METHOD
const_method (rtx constant) const_method (HOST_WIDE_INT i)
{ {
int i;
unsigned u; unsigned u;
i = INTVAL (constant);
if (USE_MOVQ (i)) if (USE_MOVQ (i))
return MOVQ; return MOVQ;
...@@ -1800,10 +1797,12 @@ const_method (rtx constant) ...@@ -1800,10 +1797,12 @@ const_method (rtx constant)
return MOVL; return MOVL;
} }
/* Return the cost of moving constant I into a data register. */
static int static int
const_int_cost (rtx constant) const_int_cost (HOST_WIDE_INT i)
{ {
switch (const_method (constant)) switch (const_method (i))
{ {
case MOVQ: case MOVQ:
/* Constants between -128 and 127 are cheap due to moveq. */ /* Constants between -128 and 127 are cheap due to moveq. */
...@@ -1833,7 +1832,7 @@ m68k_rtx_costs (rtx x, int code, int outer_code, int *total) ...@@ -1833,7 +1832,7 @@ m68k_rtx_costs (rtx x, int code, int outer_code, int *total)
if (x == const0_rtx) if (x == const0_rtx)
*total = 0; *total = 0;
else else
*total = const_int_cost (x); *total = const_int_cost (INTVAL (x));
return true; return true;
case CONST: case CONST:
...@@ -1958,13 +1957,16 @@ m68k_rtx_costs (rtx x, int code, int outer_code, int *total) ...@@ -1958,13 +1957,16 @@ m68k_rtx_costs (rtx x, int code, int outer_code, int *total)
} }
} }
const char * /* Return an instruction to move CONST_INT OPERANDS[1] into data regsiter
OPERANDS[0]. */
static const char *
output_move_const_into_data_reg (rtx *operands) output_move_const_into_data_reg (rtx *operands)
{ {
int i; HOST_WIDE_INT i;
i = INTVAL (operands[1]); i = INTVAL (operands[1]);
switch (const_method (operands[1])) switch (const_method (i))
{ {
case MVZ: case MVZ:
return "mvzw %1,%0"; return "mvzw %1,%0";
...@@ -1991,63 +1993,55 @@ output_move_const_into_data_reg (rtx *operands) ...@@ -1991,63 +1993,55 @@ output_move_const_into_data_reg (rtx *operands)
return "moveq %1,%0\n\tswap %0"; return "moveq %1,%0\n\tswap %0";
} }
case MOVL: case MOVL:
return "move%.l %1,%0"; return "move%.l %1,%0";
default: default:
gcc_unreachable (); gcc_unreachable ();
} }
} }
/* Return 1 if 'constant' can be represented by /* Return true if I can be handled by ISA B's mov3q instruction. */
mov3q on a ColdFire V4 core. */
int
valid_mov3q_const (rtx constant)
{
int i;
if (TARGET_ISAB && GET_CODE (constant) == CONST_INT) bool
{ valid_mov3q_const (HOST_WIDE_INT i)
i = INTVAL (constant); {
if (i == -1 || (i >= 1 && i <= 7)) return TARGET_ISAB && (i == -1 || IN_RANGE (i, 1, 7));
return 1;
}
return 0;
} }
/* Return an instruction to move CONST_INT OPERANDS[1] into OPERANDS[0].
I is the value of OPERANDS[1]. */
const char * static const char *
output_move_simode_const (rtx *operands) output_move_simode_const (rtx *operands)
{ {
if (operands[1] == const0_rtx rtx dest;
&& (DATA_REG_P (operands[0]) HOST_WIDE_INT src;
|| GET_CODE (operands[0]) == MEM)
dest = operands[0];
src = INTVAL (operands[1]);
if (src == 0
&& (DATA_REG_P (dest) || MEM_P (dest))
/* clr insns on 68000 read before writing. */ /* clr insns on 68000 read before writing. */
&& ((TARGET_68010 || TARGET_COLDFIRE) && ((TARGET_68010 || TARGET_COLDFIRE)
|| !(GET_CODE (operands[0]) == MEM || !(MEM_P (dest) && MEM_VOLATILE_P (dest))))
&& MEM_VOLATILE_P (operands[0]))))
return "clr%.l %0"; return "clr%.l %0";
else if ((GET_MODE (operands[0]) == SImode) else if (GET_MODE (dest) == SImode && valid_mov3q_const (src))
&& valid_mov3q_const (operands[1]))
return "mov3q%.l %1,%0"; return "mov3q%.l %1,%0";
else if (operands[1] == const0_rtx else if (src == 0 && ADDRESS_REG_P (dest))
&& ADDRESS_REG_P (operands[0]))
return "sub%.l %0,%0"; return "sub%.l %0,%0";
else if (DATA_REG_P (operands[0])) else if (DATA_REG_P (dest))
return output_move_const_into_data_reg (operands); return output_move_const_into_data_reg (operands);
else if (ADDRESS_REG_P (operands[0]) else if (ADDRESS_REG_P (dest) && IN_RANGE (src, -0x8000, 0x7fff))
&& INTVAL (operands[1]) < 0x8000
&& INTVAL (operands[1]) >= -0x8000)
{ {
if (valid_mov3q_const (operands[1])) if (valid_mov3q_const (src))
return "mov3q%.l %1,%0"; return "mov3q%.l %1,%0";
return "move%.w %1,%0"; return "move%.w %1,%0";
} }
else if (GET_CODE (operands[0]) == MEM else if (MEM_P (dest)
&& GET_CODE (XEXP (operands[0], 0)) == PRE_DEC && GET_CODE (XEXP (dest, 0)) == PRE_DEC
&& REGNO (XEXP (XEXP (operands[0], 0), 0)) == STACK_POINTER_REGNUM && REGNO (XEXP (XEXP (dest, 0), 0)) == STACK_POINTER_REGNUM
&& INTVAL (operands[1]) < 0x8000 && IN_RANGE (src, -0x8000, 0x7fff))
&& INTVAL (operands[1]) >= -0x8000)
{ {
if (valid_mov3q_const (operands[1])) if (valid_mov3q_const (src))
return "mov3q%.l %1,%-"; return "mov3q%.l %1,%-";
return "pea %a1"; return "pea %a1";
} }
......
gcc/config/m68k/m68k.md
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
{ {
if (operands[1] == const0_rtx) if (operands[1] == const0_rtx)
return "clr%.l %0"; return "clr%.l %0";
if (valid_mov3q_const(operands[1])) if (valid_mov3q_const (INTVAL (operands[1])))
return "mov3q%.l %1,%-"; return "mov3q%.l %1,%-";
return "pea %a1"; return "pea %a1";
}) })
......
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