OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm: force use of r4 for __gnu_cmse_nonsecure_call when !FPCXT [PR99271]

Browse Source 
Commit r10-6017 relaxed the constraint on thumb2 calls to
__gnu_cmse_nonsecure_call to allow any register for the call address.
Although the initial code expansion continues to use r4 with the FPCXT
extension is not enabled, the change was unsafe because subsequent
optimizations could use the additional freedom to change which
register was being used.

To fix this we need to split the output patterns in the machine
description to use distinct recognizers: one with the additional
freedom when FPCXT is enabled an another that retains the original
restrictions when the extension is not available.

gcc:
	PR target/99271
	* config/arm/thumb2.md (nonsecure_call_reg_thumb2_fpcxt): New pattern.
	(nonsecure_call_value_reg_thumb2_fpcxt): Likewise.
	(nonsecure_call_reg_thumb2): Restrict to using r4 for the callee
	address and disable when the FPCXT is not available.
	(nonsecure_call_value_reg_thumb2): Likewise.

gcc/testsuite:
	* gcc.target/arm/cmse/cmse-18.c: New test.
This commit is contained in:
Richard Earnshaw 2021-02-22 15:00:53 +00:00
parent 9592deabf3
commit 44ab1cc1df
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gcc/config/arm/thumb2.md
View File

@ -536,19 +536,26 @@
[(set_attr "type" "call")]
)
(define_insn "*nonsecure_call_reg_thumb2"
(define_insn "*nonsecure_call_reg_thumb2_fpcxt"
[(call (unspec:SI [(mem:SI (match_operand:SI 0 "s_register_operand" "l*r"))]
UNSPEC_NONSECURE_MEM)
(match_operand 1 "" ""))
(use (match_operand 2 "" ""))
(clobber (reg:SI LR_REGNUM))]
"TARGET_THUMB2 && use_cmse"
{
if (TARGET_HAVE_FPCXT_CMSE)
return "blxns\\t%0";
else
return "bl\\t__gnu_cmse_nonsecure_call";
}
"TARGET_THUMB2 && use_cmse && TARGET_HAVE_FPCXT_CMSE"
"blxns\\t%0"
[(set_attr "length" "4")
(set_attr "type" "call")]
)
(define_insn "*nonsecure_call_reg_thumb2"
[(call (unspec:SI [(mem:SI (reg:SI R4_REGNUM))]
UNSPEC_NONSECURE_MEM)
(match_operand 0 "" ""))
(use (match_operand 1 "" ""))
(clobber (reg:SI LR_REGNUM))]
"TARGET_THUMB2 && use_cmse && !TARGET_HAVE_FPCXT_CMSE"
"bl\\t__gnu_cmse_nonsecure_call"
[(set_attr "length" "4")
(set_attr "type" "call")]
)
@ -564,7 +571,7 @@
[(set_attr "type" "call")]
)
(define_insn "*nonsecure_call_value_reg_thumb2"
(define_insn "*nonsecure_call_value_reg_thumb2_fpcxt"
[(set (match_operand 0 "" "")
(call
(unspec:SI [(mem:SI (match_operand:SI 1 "register_operand" "l*r"))]
@ -572,13 +579,21 @@
(match_operand 2 "" "")))
(use (match_operand 3 "" ""))
(clobber (reg:SI LR_REGNUM))]
"TARGET_THUMB2 && use_cmse"
{
if (TARGET_HAVE_FPCXT_CMSE)
return "blxns\\t%1";
else
return "bl\\t__gnu_cmse_nonsecure_call";
}
"TARGET_THUMB2 && use_cmse && TARGET_HAVE_FPCXT_CMSE"
"blxns\\t%1"
[(set_attr "length" "4")
(set_attr "type" "call")]
)
(define_insn "*nonsecure_call_value_reg_thumb2"
[(set (match_operand 0 "" "")
(call
(unspec:SI [(mem:SI (reg:SI R4_REGNUM))] UNSPEC_NONSECURE_MEM)
(match_operand 1 "" "")))
(use (match_operand 2 "" ""))
(clobber (reg:SI LR_REGNUM))]
"TARGET_THUMB2 && use_cmse && !TARGET_HAVE_FPCXT_CMSE"
"bl\\t__gnu_cmse_nonsecure_call"
[(set_attr "length" "4")
(set_attr "type" "call")]
)

11
gcc/testsuite/gcc.target/arm/cmse/cmse-18.c Normal file
View File

@ -0,0 +1,11 @@
/* { dg-do compile } */
/* { dg-options "-mcmse -fdump-rtl-final-slim" } */
typedef void (*f)(int) __attribute__((cmse_nonsecure_call));
void bar(f func, int a)
{
func(a);
}
/* { dg-final { scan-rtl-dump "call unspec\\\[\\\[r4:SI\\\]\\\]" "final" } } */