[4/7,Arm.] Implement target feature macros for PACBTI.
Commit Message
Hi,
This patch implements target feature macros when PACBTI is
enabled through the -march option or -mbranch-protection.
Tested on arm-none-eabi. OK for trunk?
2021-10-04 Tejas Belagod <tbelagod@arm.com>
gcc/ChangeLog:
* config/arm/arm-c.c (arm_cpu_builtins): Define
__ARM_FEATURE_BTI_DEFAULT and __ARM_FEATURE_PAC_DEFAULT.
gcc/testsuite/ChangeLog:
* gcc.target/arm/acle/pacbti-m-predef-2.c: New test.
* gcc.target/arm/acle/pacbti-m-predef-4.c: New test.
* gcc.target/arm/acle/pacbti-m-predef-5.c: New test.
Comments
On 08/10/2021 13:18, Tejas Belagod via Gcc-patches wrote:
> Hi,
>
> This patch implements target feature macros when PACBTI is
> enabled through the -march option or -mbranch-protection.
>
> Tested on arm-none-eabi. OK for trunk?
>
> 2021-10-04 Tejas Belagod <tbelagod@arm.com>
>
> gcc/ChangeLog:
>
> * config/arm/arm-c.c (arm_cpu_builtins): Define
> __ARM_FEATURE_BTI_DEFAULT and __ARM_FEATURE_PAC_DEFAULT.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.target/arm/acle/pacbti-m-predef-2.c: New test.
> * gcc.target/arm/acle/pacbti-m-predef-4.c: New test.
> * gcc.target/arm/acle/pacbti-m-predef-5.c: New test.
>
I presume the specification for this is ACLE - please say so rather than
making me guess.
+ cpp_undef (pfile, "__ARM_FEATURE_BTI_DEFAULT");
+ cpp_undef (pfile, "__ARM_FEATURE_PAC_DEFAULT");
+ if (TARGET_HAVE_PACBTI)
+ {
+ builtin_define_with_int_value ("__ARM_FEATURE_BTI_DEFAULT",
+ arm_enable_pacbti & 0x1);
My reading of the ACLE specification would suggest this shouldn't be
defined if it would have a value of 0, but that's not what this code
does. I think it would be better to move this outside the
TARGET_HAVE_PACBTI and use the def_or_undef approach.
+ builtin_define_with_int_value ("__ARM_FEATURE_PAC_DEFAULT",
+ arm_enable_pacbti >> 1);
This one is less clear, could the value ever be zero? I guess exactly
one of a-key and b-key must be defined and each has a separate bit.
+ }
+
+
Not more than one blank line at the end of a block.
diff --git a/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-2.c
b/gcc/testsuite/gcc.target/arm/acle/pacbti-m-predef-2.c
Given what I've said above, I think you need to also test that
__ARM_FEATURE_BTI_DEFAULT is defined before testing the value (and
emitting #error if it isn't).
R.
@@ -193,6 +193,17 @@ arm_cpu_builtins (struct cpp_reader* pfile)
def_or_undef_macro (pfile, "__ARM_FEATURE_COMPLEX", TARGET_COMPLEX);
def_or_undef_macro (pfile, "__ARM_32BIT_STATE", TARGET_32BIT);
+ cpp_undef (pfile, "__ARM_FEATURE_BTI_DEFAULT");
+ cpp_undef (pfile, "__ARM_FEATURE_PAC_DEFAULT");
+ if (TARGET_HAVE_PACBTI)
+ {
+ builtin_define_with_int_value ("__ARM_FEATURE_BTI_DEFAULT",
+ arm_enable_pacbti & 0x1);
+ builtin_define_with_int_value ("__ARM_FEATURE_PAC_DEFAULT",
+ arm_enable_pacbti >> 1);
+ }
+
+
cpp_undef (pfile, "__ARM_FEATURE_MVE");
if (TARGET_HAVE_MVE && TARGET_HAVE_MVE_FLOAT)
{
new file mode 100644
@@ -0,0 +1,16 @@
+
+/* { dg-do run } */
+/* { dg-require-effective-target arm_pacbti_hw } */
+/* { dg-additional-options " -mbranch-protection=bti+pac-ret+b-key+leaf" } */
+
+int
+main()
+{
+ if (__ARM_FEATURE_BTI_DEFAULT != 1)
+ __builtin_abort ();
+
+ if (__ARM_FEATURE_PAC_DEFAULT != 6)
+ __builtin_abort ();
+
+ return 0;
+}
new file mode 100644
@@ -0,0 +1,16 @@
+
+/* { dg-do run } */
+/* { dg-require-effective-target arm_pacbti_hw } */
+/* { dg-additional-options " -mbranch-protection=pac-ret+b-key" } */
+
+int
+main()
+{
+ if (__ARM_FEATURE_BTI_DEFAULT != 0)
+ __builtin_abort ();
+
+ if (__ARM_FEATURE_PAC_DEFAULT != 2)
+ __builtin_abort ();
+
+ return 0;
+}
new file mode 100644
@@ -0,0 +1,16 @@
+
+/* { dg-do run } */
+/* { dg-require-effective-target arm_pacbti_hw } */
+/* { dg-additional-options " -mbranch-protection=bti+pac-ret+leaf" } */
+
+int
+main()
+{
+ if (__ARM_FEATURE_BTI_DEFAULT != 1)
+ __builtin_abort ();
+
+ if (__ARM_FEATURE_PAC_DEFAULT != 5)
+ __builtin_abort ();
+
+ return 0;
+}