Skip to content

R
riscv-gcc-1
Commit 277772f6 by Oleg Endo
Options

sh.c (MSW, LSW): Move and rename macros to... 

	* config/sh/sh.c (MSW, LSW): Move and rename macros to...
	* config/sh/sh.h (SH_REG_MSW_OFFSET, SH_REG_LSW_OFFSET): ... here.
	(TARGET_BIG_ENDIAN): New macro.
	* config/sh/sh.md: Use it instead of !TARGET_LITTLE_ENDIAN.
	Use SH_REG_MSW_OFFSET and SH_REG_LSW_OFFSET.
	* config/sh/sh.c: Likewise.
	* config/sh/sh.h: Likewise.

From-SVN: r204110
parent 1d9b1f94
Showing with 38 additions and 26 deletions
gcc/ChangeLog
2013-10-27 Oleg Endo <olegendo@gcc.gnu.org>
* config/sh/sh.c (MSW, LSW): Move and rename macros to...
* config/sh/sh.h (SH_REG_MSW_OFFSET, SH_REG_LSW_OFFSET): ... here.
(TARGET_BIG_ENDIAN): New macro.
* config/sh/sh.md: Use it instead of !TARGET_LITTLE_ENDIAN.
Use SH_REG_MSW_OFFSET and SH_REG_LSW_OFFSET.
* config/sh/sh.c: Likewise.
* config/sh/sh.h: Likewise.
2013-10-27 Hans-Peter Nilsson <hp@axis.com> 2013-10-27 Hans-Peter Nilsson <hp@axis.com>
* config/cris/cris.c (cris_emit_trap_for_misalignment): Replace the * config/cris/cris.c (cris_emit_trap_for_misalignment): Replace the
gcc/config/sh/sh.c
...@@ -63,9 +63,6 @@ along with GCC; see the file COPYING3. If not see ...@@ -63,9 +63,6 @@ along with GCC; see the file COPYING3. If not see
int code_for_indirect_jump_scratch = CODE_FOR_indirect_jump_scratch; int code_for_indirect_jump_scratch = CODE_FOR_indirect_jump_scratch;
#define MSW (TARGET_LITTLE_ENDIAN ? 1 : 0)
#define LSW (TARGET_LITTLE_ENDIAN ? 0 : 1)
/* These are some macros to abstract register modes. */ /* These are some macros to abstract register modes. */
#define CONST_OK_FOR_I10(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -512 \ #define CONST_OK_FOR_I10(VALUE) (((HOST_WIDE_INT)(VALUE)) >= -512 \
&& ((HOST_WIDE_INT)(VALUE)) <= 511) && ((HOST_WIDE_INT)(VALUE)) <= 511)
...@@ -1208,12 +1205,12 @@ sh_print_operand (FILE *stream, rtx x, int code) ...@@ -1208,12 +1205,12 @@ sh_print_operand (FILE *stream, rtx x, int code)
if (REG_P (x) || GET_CODE (x) == SUBREG) if (REG_P (x) || GET_CODE (x) == SUBREG)
{ {
regno = true_regnum (x); regno = true_regnum (x);
regno += FP_REGISTER_P (regno) ? 1 : LSW; regno += FP_REGISTER_P (regno) ? 1 : SH_REG_LSW_OFFSET;
fputs (reg_names[regno], (stream)); fputs (reg_names[regno], (stream));
} }
else if (MEM_P (x)) else if (MEM_P (x))
{ {
x = adjust_address (x, SImode, 4 * LSW); x = adjust_address (x, SImode, 4 * SH_REG_LSW_OFFSET);
sh_print_operand_address (stream, XEXP (x, 0)); sh_print_operand_address (stream, XEXP (x, 0));
} }
else else
...@@ -1224,7 +1221,7 @@ sh_print_operand (FILE *stream, rtx x, int code) ...@@ -1224,7 +1221,7 @@ sh_print_operand (FILE *stream, rtx x, int code)
if (mode == VOIDmode) if (mode == VOIDmode)
mode = DImode; mode = DImode;
if (GET_MODE_SIZE (mode) >= 8) if (GET_MODE_SIZE (mode) >= 8)
sub = simplify_subreg (SImode, x, mode, 4 * LSW); sub = simplify_subreg (SImode, x, mode, 4 * SH_REG_LSW_OFFSET);
if (sub) if (sub)
sh_print_operand (stream, sub, 0); sh_print_operand (stream, sub, 0);
else else
...@@ -1235,12 +1232,12 @@ sh_print_operand (FILE *stream, rtx x, int code) ...@@ -1235,12 +1232,12 @@ sh_print_operand (FILE *stream, rtx x, int code)
if (REG_P (x) || GET_CODE (x) == SUBREG) if (REG_P (x) || GET_CODE (x) == SUBREG)
{ {
regno = true_regnum (x); regno = true_regnum (x);
regno += FP_REGISTER_P (regno) ? 0 : MSW; regno += FP_REGISTER_P (regno) ? 0 : SH_REG_MSW_OFFSET;
fputs (reg_names[regno], (stream)); fputs (reg_names[regno], (stream));
} }
else if (MEM_P (x)) else if (MEM_P (x))
{ {
x = adjust_address (x, SImode, 4 * MSW); x = adjust_address (x, SImode, 4 * SH_REG_MSW_OFFSET);
sh_print_operand_address (stream, XEXP (x, 0)); sh_print_operand_address (stream, XEXP (x, 0));
} }
else else
...@@ -1251,7 +1248,7 @@ sh_print_operand (FILE *stream, rtx x, int code) ...@@ -1251,7 +1248,7 @@ sh_print_operand (FILE *stream, rtx x, int code)
if (mode == VOIDmode) if (mode == VOIDmode)
mode = DImode; mode = DImode;
if (GET_MODE_SIZE (mode) >= 8) if (GET_MODE_SIZE (mode) >= 8)
sub = simplify_subreg (SImode, x, mode, 4 * MSW); sub = simplify_subreg (SImode, x, mode, 4 * SH_REG_MSW_OFFSET);
if (sub) if (sub)
sh_print_operand (stream, sub, 0); sh_print_operand (stream, sub, 0);
else else
...@@ -8261,8 +8258,8 @@ sh_builtin_saveregs (void) ...@@ -8261,8 +8258,8 @@ sh_builtin_saveregs (void)
emit_insn (gen_addsi3 (fpregs, fpregs, GEN_INT (-UNITS_PER_WORD))); emit_insn (gen_addsi3 (fpregs, fpregs, GEN_INT (-UNITS_PER_WORD)));
mem = change_address (regbuf, SFmode, fpregs); mem = change_address (regbuf, SFmode, fpregs);
emit_move_insn (mem, emit_move_insn (mem,
gen_rtx_REG (SFmode, BASE_ARG_REG (SFmode) + regno gen_rtx_REG (SFmode, BASE_ARG_REG (SFmode)
- (TARGET_LITTLE_ENDIAN != 0))); + regno - SH_REG_MSW_OFFSET));
} }
} }
else else
......
gcc/config/sh/sh.h
...@@ -405,16 +405,21 @@ extern enum sh_divide_strategy_e sh_div_strategy; ...@@ -405,16 +405,21 @@ extern enum sh_divide_strategy_e sh_div_strategy;
/* Target machine storage layout. */ /* Target machine storage layout. */
#define TARGET_BIG_ENDIAN (!TARGET_LITTLE_ENDIAN)
#define SH_REG_MSW_OFFSET (TARGET_LITTLE_ENDIAN ? 1 : 0)
#define SH_REG_LSW_OFFSET (TARGET_LITTLE_ENDIAN ? 0 : 1)
/* Define this if most significant bit is lowest numbered /* Define this if most significant bit is lowest numbered
in instructions that operate on numbered bit-fields. */ in instructions that operate on numbered bit-fields. */
#define BITS_BIG_ENDIAN 0 #define BITS_BIG_ENDIAN 0
/* Define this if most significant byte of a word is the lowest numbered. */ /* Define this if most significant byte of a word is the lowest numbered. */
#define BYTES_BIG_ENDIAN (TARGET_LITTLE_ENDIAN == 0) #define BYTES_BIG_ENDIAN TARGET_BIG_ENDIAN
/* Define this if most significant word of a multiword number is the lowest /* Define this if most significant word of a multiword number is the lowest
numbered. */ numbered. */
#define WORDS_BIG_ENDIAN (TARGET_LITTLE_ENDIAN == 0) #define WORDS_BIG_ENDIAN TARGET_BIG_ENDIAN
#define MAX_BITS_PER_WORD 64 #define MAX_BITS_PER_WORD 64
...@@ -1437,7 +1442,7 @@ struct sh_args { ...@@ -1437,7 +1442,7 @@ struct sh_args {
#define SHCOMPACT_FORCE_ON_STACK(MODE,TYPE) \ #define SHCOMPACT_FORCE_ON_STACK(MODE,TYPE) \
((MODE) == BLKmode \ ((MODE) == BLKmode \
&& TARGET_SHCOMPACT \ && TARGET_SHCOMPACT \
&& ! TARGET_LITTLE_ENDIAN \ && TARGET_BIG_ENDIAN \
&& int_size_in_bytes (TYPE) > 4 \ && int_size_in_bytes (TYPE) > 4 \
&& int_size_in_bytes (TYPE) < 8) && int_size_in_bytes (TYPE) < 8)
......
gcc/config/sh/sh.md
...@@ -670,7 +670,7 @@ ...@@ -670,7 +670,7 @@
(and:SI (match_operand:SI 0 "arith_reg_operand" "%r") (and:SI (match_operand:SI 0 "arith_reg_operand" "%r")
(match_operand:SI 1 "arith_reg_operand" "r")) <lowpart_be>) (match_operand:SI 1 "arith_reg_operand" "r")) <lowpart_be>)
(const_int 0)))] (const_int 0)))]
"TARGET_SH1 && !TARGET_LITTLE_ENDIAN" "TARGET_SH1 && TARGET_BIG_ENDIAN"
"tst %0,%1" "tst %0,%1"
[(set_attr "type" "mt_group")]) [(set_attr "type" "mt_group")])
...@@ -761,7 +761,7 @@ ...@@ -761,7 +761,7 @@
(match_operand:SI 3 "const_int_operand")) 3) (match_operand:SI 3 "const_int_operand")) 3)
(match_operand:SI 1 "const_int_operand") (match_operand:SI 1 "const_int_operand")
(match_operand:SI 2 "const_int_operand")))] (match_operand:SI 2 "const_int_operand")))]
"TARGET_SH1 && ! TARGET_LITTLE_ENDIAN "TARGET_SH1 && TARGET_BIG_ENDIAN
&& ZERO_EXTRACT_ANDMASK (operands[1], operands[2]) && ZERO_EXTRACT_ANDMASK (operands[1], operands[2])
== (INTVAL (operands[3]) & 255) == (INTVAL (operands[3]) & 255)
&& CONST_OK_FOR_K08 (INTVAL (operands[3]) & 255)" && CONST_OK_FOR_K08 (INTVAL (operands[3]) & 255)"
...@@ -2115,7 +2115,7 @@ ...@@ -2115,7 +2115,7 @@
(zero_extend:SI (subreg:QI (not:SI (subreg:SI (match_operand:QI 1 (zero_extend:SI (subreg:QI (not:SI (subreg:SI (match_operand:QI 1
"general_extend_operand" "general_extend_operand"
"") 0)) 3)))] "") 0)) 3)))]
"TARGET_SHMEDIA && ! TARGET_LITTLE_ENDIAN" "TARGET_SHMEDIA && TARGET_BIG_ENDIAN"
[(set (match_dup 0) (zero_extend:SI (match_dup 1))) [(set (match_dup 0) (zero_extend:SI (match_dup 1)))
(set (match_dup 0) (xor:SI (match_dup 0) (const_int 255)))] (set (match_dup 0) (xor:SI (match_dup 0) (const_int 255)))]
"") "")
...@@ -3840,7 +3840,7 @@ label: ...@@ -3840,7 +3840,7 @@ label:
operands[0] = SUBREG_REG (operands[0]); operands[0] = SUBREG_REG (operands[0]);
} }
gcc_assert (REG_P (operands[0])); gcc_assert (REG_P (operands[0]));
if (! TARGET_LITTLE_ENDIAN) if (TARGET_BIG_ENDIAN)
offset += 8 - GET_MODE_SIZE (inmode); offset += 8 - GET_MODE_SIZE (inmode);
operands[5] = gen_rtx_SUBREG (inmode, operands[0], offset); operands[5] = gen_rtx_SUBREG (inmode, operands[0], offset);
}) })
...@@ -7733,11 +7733,11 @@ label: ...@@ -7733,11 +7733,11 @@ label:
rtx mem2 rtx mem2
= change_address (mem, SFmode, gen_rtx_POST_INC (Pmode, operands[1])); = change_address (mem, SFmode, gen_rtx_POST_INC (Pmode, operands[1]));
insn = emit_insn (gen_movsf_ie (gen_rtx_REG (SFmode, insn = emit_insn (gen_movsf_ie (gen_rtx_REG (SFmode,
regno + !! TARGET_LITTLE_ENDIAN), regno + SH_REG_MSW_OFFSET),
mem2, operands[2])); mem2, operands[2]));
add_reg_note (insn, REG_INC, operands[1]); add_reg_note (insn, REG_INC, operands[1]);
insn = emit_insn (gen_movsf_ie (gen_rtx_REG (SFmode, insn = emit_insn (gen_movsf_ie (gen_rtx_REG (SFmode,
regno + ! TARGET_LITTLE_ENDIAN), regno + SH_REG_LSW_OFFSET),
change_address (mem, SFmode, NULL_RTX), change_address (mem, SFmode, NULL_RTX),
operands[2])); operands[2]));
DONE; DONE;
...@@ -7755,8 +7755,8 @@ label: ...@@ -7755,8 +7755,8 @@ label:
int regno = true_regnum (operands[0]); int regno = true_regnum (operands[0]);
rtx addr, insn; rtx addr, insn;
rtx mem2 = change_address (operands[1], SFmode, NULL_RTX); rtx mem2 = change_address (operands[1], SFmode, NULL_RTX);
rtx reg0 = gen_rtx_REG (SFmode, regno + (TARGET_LITTLE_ENDIAN ? 1 : 0)); rtx reg0 = gen_rtx_REG (SFmode, regno + SH_REG_MSW_OFFSET);
rtx reg1 = gen_rtx_REG (SFmode, regno + (TARGET_LITTLE_ENDIAN ? 0 : 1)); rtx reg1 = gen_rtx_REG (SFmode, regno + SH_REG_LSW_OFFSET);
operands[1] = copy_rtx (mem2); operands[1] = copy_rtx (mem2);
addr = XEXP (mem2, 0); addr = XEXP (mem2, 0);
...@@ -7821,8 +7821,8 @@ label: ...@@ -7821,8 +7821,8 @@ label:
{ {
int regno = true_regnum (operands[1]); int regno = true_regnum (operands[1]);
rtx insn, addr; rtx insn, addr;
rtx reg0 = gen_rtx_REG (SFmode, regno + (TARGET_LITTLE_ENDIAN ? 1 : 0)); rtx reg0 = gen_rtx_REG (SFmode, regno + SH_REG_MSW_OFFSET);
rtx reg1 = gen_rtx_REG (SFmode, regno + (TARGET_LITTLE_ENDIAN ? 0 : 1)); rtx reg1 = gen_rtx_REG (SFmode, regno + SH_REG_LSW_OFFSET);
operands[0] = copy_rtx (operands[0]); operands[0] = copy_rtx (operands[0]);
PUT_MODE (operands[0], SFmode); PUT_MODE (operands[0], SFmode);
...@@ -13160,7 +13160,7 @@ label: ...@@ -13160,7 +13160,7 @@ label:
(match_operand:SI 1 "immediate_operand" "") (match_operand:SI 1 "immediate_operand" "")
(match_operand:SI 2 "immediate_operand" "")) (match_operand:SI 2 "immediate_operand" ""))
(match_operand:SI 3 "general_operand" ""))] (match_operand:SI 3 "general_operand" ""))]
"TARGET_SH1 && ! TARGET_LITTLE_ENDIAN" "TARGET_SH1 && TARGET_BIG_ENDIAN"
{ {
rtx addr_target, orig_address, shift_reg, qi_val; rtx addr_target, orig_address, shift_reg, qi_val;
HOST_WIDE_INT bitsize, size, v = 0; HOST_WIDE_INT bitsize, size, v = 0;
...@@ -14522,7 +14522,7 @@ label: ...@@ -14522,7 +14522,7 @@ label:
(zero_extract:QI (not:QI (match_dup 2)) (const_int 2) (const_int 4)) (zero_extract:QI (not:QI (match_dup 2)) (const_int 2) (const_int 4))
(zero_extract:QI (not:QI (match_dup 2)) (zero_extract:QI (not:QI (match_dup 2))
(const_int 2) (const_int 6))])))] (const_int 2) (const_int 6))])))]
"TARGET_SHMEDIA && ! TARGET_LITTLE_ENDIAN" "TARGET_SHMEDIA && TARGET_BIG_ENDIAN"
"mperm.w %1, %N2, %0" "mperm.w %1, %N2, %0"
[(set_attr "type" "arith_media")]) [(set_attr "type" "arith_media")])
......
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