703e049aa7
The implementation of define_expand and define_insn patterns to handle shifts in the MSP430 backend is inconsistent, resulting in missed opportunities to make best use of the architecture's features. There's now a single define_expand used as the entry point for all valid shifts, and the decision to either use a helper function to perform the shift (often required for the 430 ISA), or fall through to the define_insn patterns can be made from that expander function. Shifts by a constant amount have been grouped into one define_insn for each type of shift, instead of having different define_insn patterns for shifts by different amounts. A new target option "-mmax-inline-shift=" has been added to allow tuning of the number of shift instructions to emit inline, instead of using a library helper function. gcc/ChangeLog: * config/msp430/constraints.md (K): Change unused constraint to constraint to a const_int between 1 and 19. (P): New constraint. * config/msp430/msp430-protos.h (msp430x_logical_shift_right): Remove. (msp430_expand_shift): New. (msp430_output_asm_shift_insns): New. * config/msp430/msp430.c (msp430_rtx_costs): Remove shift costs. (CSH): Remove. (msp430_expand_helper): Remove hard-coded generation of some inline shift insns. (use_helper_for_const_shift): New. (msp430_expand_shift): New. (msp430_output_asm_shift_insns): New. (msp430_print_operand): Add new 'W' operand selector. (msp430x_logical_shift_right): Remove. * config/msp430/msp430.md (HPSI): New define_mode_iterator. (HDI): Likewise. (any_shift): New define_code_iterator. (shift_insn): New define_code_attr. Adjust unnamed insn patterns searched for by combine. (ashlhi3): Remove. (slli_1): Remove. (430x_shift_left): Remove. (slll_1): Remove. (slll_2): Remove. (ashlsi3): Remove. (ashldi3): Remove. (ashrhi3): Remove. (srai_1): Remove. (430x_arithmetic_shift_right): Remove. (srap_1): Remove. (srap_2): Remove. (sral_1): Remove. (sral_2): Remove. (ashrsi3): Remove. (ashrdi3): Remove. (lshrhi3): Remove. (srli_1): Remove. (430x_logical_shift_right): Remove. (srlp_1): Remove. (srll_1): Remove. (srll_2x): Remove. (lshrsi3): Remove. (lshrdi3): Remove. (<shift_insn><mode>3): New define_expand. (<shift_insn>hi3_430): New define_insn. (<shift_insn>si3_const): Likewise. (ashl<mode>3_430x): Likewise. (ashr<mode>3_430x): Likewise. (lshr<mode>3_430x): Likewise. (*bitbranch<mode>4_z): Replace renamed predicate msp430_bitpos with const_0_to_15_operand. * config/msp430/msp430.opt: New option -mmax-inline-shift=. * config/msp430/predicates.md (const_1_to_8_operand): New predicate. (const_0_to_15_operand): Rename msp430_bitpos predicate. (const_1_to_19_operand): New predicate. * doc/invoke.texi: Document -mmax-inline-shift=. libgcc/ChangeLog: * config/msp430/slli.S (__gnu_mspabi_sllp): New. * config/msp430/srai.S (__gnu_mspabi_srap): New. * config/msp430/srli.S (__gnu_mspabi_srlp): New. gcc/testsuite/ChangeLog: * gcc.target/msp430/emulate-srli.c: Fix expected assembler text. * gcc.target/msp430/max-inline-shift-430-no-opt.c: New test. * gcc.target/msp430/max-inline-shift-430.c: New test. * gcc.target/msp430/max-inline-shift-430x.c: New test.
166 lines
3.0 KiB
ArmAsm
166 lines
3.0 KiB
ArmAsm
; Copyright (C) 2012-2020 Free Software Foundation, Inc.
|
|
; Contributed by Red Hat.
|
|
;
|
|
; This file is free software; you can redistribute it and/or modify it
|
|
; under the terms of the GNU General Public License as published by the
|
|
; Free Software Foundation; either version 3, or (at your option) any
|
|
; later version.
|
|
;
|
|
; This file is distributed in the hope that it will be useful, but
|
|
; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
; General Public License for more details.
|
|
;
|
|
; Under Section 7 of GPL version 3, you are granted additional
|
|
; permissions described in the GCC Runtime Library Exception, version
|
|
; 3.1, as published by the Free Software Foundation.
|
|
;
|
|
; You should have received a copy of the GNU General Public License and
|
|
; a copy of the GCC Runtime Library Exception along with this program;
|
|
; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
; <http://www.gnu.org/licenses/>.
|
|
|
|
.text
|
|
|
|
.section .text.__mspabi_srli_n
|
|
.macro _srli n
|
|
.global __mspabi_srli_\n
|
|
__mspabi_srli_\n:
|
|
CLRC
|
|
RRC.W R12
|
|
.endm
|
|
|
|
/* Logical Right Shift - R12 -> R12. */
|
|
_srli 15
|
|
_srli 14
|
|
_srli 13
|
|
_srli 12
|
|
_srli 11
|
|
_srli 10
|
|
_srli 9
|
|
_srli 8
|
|
_srli 7
|
|
_srli 6
|
|
_srli 5
|
|
_srli 4
|
|
_srli 3
|
|
_srli 2
|
|
_srli 1
|
|
#ifdef __MSP430X_LARGE__
|
|
RETA
|
|
#else
|
|
RET
|
|
#endif
|
|
|
|
.section .text.__mspabi_srli
|
|
1: ADD.W #-1,R13
|
|
CLRC
|
|
RRC.W R12,R12
|
|
.global __mspabi_srli
|
|
__mspabi_srli:
|
|
CMP #0,R13
|
|
JNZ 1b
|
|
#ifdef __MSP430X_LARGE__
|
|
RETA
|
|
#else
|
|
RET
|
|
#endif
|
|
|
|
#ifdef __MSP430X__
|
|
.section .text.__gnu_mspabi_srlp
|
|
1: ADDA #-1,R13
|
|
CLRC
|
|
RRCX.A R12,R12
|
|
.global __gnu_mspabi_srlp
|
|
__gnu_mspabi_srlp:
|
|
CMP #0,R13
|
|
JNZ 1b
|
|
#ifdef __MSP430X_LARGE__
|
|
RETA
|
|
#else
|
|
RET
|
|
#endif /* __MSP430X_LARGE__ */
|
|
#endif /* __MSP430X__ */
|
|
|
|
/* Logical Right Shift - R12:R13 -> R12:R13. */
|
|
|
|
.section .text.__mspabi_srll_n
|
|
.macro _srll n
|
|
.global __mspabi_srll_\n
|
|
__mspabi_srll_\n:
|
|
CLRC
|
|
RRC.W R13
|
|
RRC.W R12
|
|
.endm
|
|
|
|
_srll 15
|
|
_srll 14
|
|
_srll 13
|
|
_srll 12
|
|
_srll 11
|
|
_srll 10
|
|
_srll 9
|
|
_srll 8
|
|
_srll 7
|
|
_srll 6
|
|
_srll 5
|
|
_srll 4
|
|
_srll 3
|
|
_srll 2
|
|
_srll 1
|
|
#ifdef __MSP430X_LARGE__
|
|
RETA
|
|
#else
|
|
RET
|
|
#endif
|
|
|
|
.section .text.__mspabi_srll
|
|
1: ADD.W #-1,R14
|
|
CLRC
|
|
RRC.W R13
|
|
RRC.W R12
|
|
.global __mspabi_srll
|
|
__mspabi_srll:
|
|
CMP #0,R14
|
|
JNZ 1b
|
|
#ifdef __MSP430X_LARGE__
|
|
RETA
|
|
#else
|
|
RET
|
|
#endif
|
|
|
|
/* Logical Right Shift - R8:R11 -> R12:R15
|
|
A 64-bit argument would normally be passed in R12:R15, but __mspabi_srlll has
|
|
special conventions, so the 64-bit value to shift is passed in R8:R11.
|
|
According to the MSPABI, the shift amount is a 64-bit value in R12:R15, but
|
|
we only use the low word in R12. */
|
|
|
|
.section .text.__mspabi_srlll
|
|
.global __mspabi_srlll
|
|
__mspabi_srlll:
|
|
MOV R11, R15 ; Free up R11 first
|
|
MOV R12, R11 ; Save the shift amount in R11
|
|
MOV R10, R14
|
|
MOV R9, R13
|
|
MOV R8, R12
|
|
CMP #0,R11
|
|
JNZ 1f
|
|
#ifdef __MSP430X_LARGE__
|
|
RETA
|
|
#else
|
|
RET
|
|
#endif
|
|
1:
|
|
CLRC
|
|
RRC R15
|
|
RRC R14
|
|
RRC R13
|
|
RRC R12
|
|
ADD #-1,R11
|
|
JNZ 1b
|
|
#ifdef __MSP430X_LARGE__
|
|
RETA
|
|
#else
|
|
RET
|
|
#endif
|