From 14ae1d88b337dcd79f6bfe29263b8a8ae07c38b3 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 5 Jun 2015 01:00:05 -0400 Subject: [PATCH] msp430.md (movsi_s): New. * config/msp430/msp430.md (movsi_s): New. Special case for storing a 20-bit symbol into a 32-bit register. * config/msp430/msp430.c (msp430_subreg): Add support for it. * config/msp430/predicates.md (msp430_symbol_operand): New. From-SVN: r224145 --- gcc/ChangeLog | 7 +++++++ gcc/config/msp430/msp430.c | 7 +++++++ gcc/config/msp430/msp430.md | 13 +++++++++++++ gcc/config/msp430/predicates.md | 4 ++++ 4 files changed, 31 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2ad6068e15f..a052bd3cf9c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2015-06-04 DJ Delorie + + * config/msp430/msp430.md (movsi_s): New. Special case for + storing a 20-bit symbol into a 32-bit register. + * config/msp430/msp430.c (msp430_subreg): Add support for it. + * config/msp430/predicates.md (msp430_symbol_operand): New. + 2015-06-04 Sriraman Tallam * c-family/c-common.c (noplt): New attribute. diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c index f99cb60a65b..1c18047807d 100644 --- a/gcc/config/msp430/msp430.c +++ b/gcc/config/msp430/msp430.c @@ -2374,6 +2374,13 @@ msp430_subreg (machine_mode mode, rtx r, machine_mode omode, int byte) } else if (GET_CODE (r) == MEM) rv = adjust_address (r, mode, byte); + else if (GET_CODE (r) == SYMBOL_REF + && (byte == 0 || byte == 2) + && mode == HImode) + { + rv = gen_rtx_ZERO_EXTRACT (HImode, r, GEN_INT (16), GEN_INT (8*byte)); + rv = gen_rtx_CONST (HImode, r); + } else rv = simplify_gen_subreg (mode, r, omode, byte); diff --git a/gcc/config/msp430/msp430.md b/gcc/config/msp430/msp430.md index 64fdc459b78..ad8fb7af319 100644 --- a/gcc/config/msp430/msp430.md +++ b/gcc/config/msp430/msp430.md @@ -214,6 +214,19 @@ "" ) +(define_insn_and_split "movsi_s" + [(set (match_operand:SI 0 "nonimmediate_operand" "=rm") + (subreg:SI (match_operand:PSI 1 "msp430_symbol_operand" "i") 0))] + "" + "" + "reload_completed" + [(set (match_operand:HI 2 "nonimmediate_operand") + (match_operand:HI 4 "general_operand")) + (set (match_operand:HI 3 "nonimmediate_operand") + (match_operand:HI 5 "general_operand"))] + "msp430_split_movsi (operands);" + ) + (define_insn_and_split "movsi_x" [(set (match_operand:SI 0 "nonimmediate_operand" "=rm") (match_operand:SI 1 "general_operand" "rmi"))] diff --git a/gcc/config/msp430/predicates.md b/gcc/config/msp430/predicates.md index 1331ff6b115..5902339be97 100644 --- a/gcc/config/msp430/predicates.md +++ b/gcc/config/msp430/predicates.md @@ -82,3 +82,7 @@ (and (match_code "const_int") (match_test (" INTVAL (op) >= 0 && INTVAL (op) <= 15 ")))) + +(define_predicate "msp430_symbol_operand" + (match_code "symbol_ref") +) -- 2.30.2