[SFrame-V3] sframe: gas: bfd: add support for signal frames

Reserve a bit in function info byte in the SFrame FDE to designate
signal frames.

Also update the SFrame opt code in GAS and dumping routines in libsframe
to handle signal frame bit.

include/
	* sframe.h (SFRAME_V3_FUNC_SIGNAL_P): Extract signal frame bit.
	(SFRAME_V3_FUNC_INFO_UPDATE_SIGNAL_P): Set signal frame bit.
gas/
	* gen-sframe.c (get_dw_fde_signal_p): New function to retrieve signal
	frame state from DWARF FDE.
	(sframe_v3_set_func_info): Renamed from sframe_v1_set_func_info.
	Accept signal_p argument and encode it.
	(sframe_set_version): Update ops to use sframe_v3_set_func_info.
	(sframe_set_func_info): Pass signal_p to the ops hook.
	(output_sframe_funcdesc): Retrieve signal frame marker and pass to
	sframe_set_func_info.
	* gen-sframe.h (struct sframe_version_ops): Update set_func_info
	signature.
	* sframe-opt.c (sframe_convert_frag): Preserve signal_p bit during
	fragment conversion.
libsframe/testsuite/
	* gas/cfi-sframe/cfi-sframe-common-13.d: New test.
	* gas/cfi-sframe/cfi-sframe-common-13.s: New test.
	* gas/cfi-sframe/cfi-sframe.exp: Run new test.
libsframe/
	* sframe-dump.c (dump_sframe_func_with_fres): Decode signal frame bit
	and print "S" attribute in the dump output.

diff --git a/gas/gen-sframe.c b/gas/gen-sframe.c
index a25d85629943da579002e8db2ba0ec115ee90ae5..7a92c0d26a10cdb457875fafc773ed864cf888a1 100644 (file)
--- a/gas/gen-sframe.c
+++ b/gas/gen-sframe.c
@@ -116,6 +116,13 @@ get_dw_fde_pauth_b_key_p (const struct fde_entry *dw_fde ATTRIBUTE_UNUSED)
 #endif
 }
 
+/* Get whether signal frame.  */
+static bool
+get_dw_fde_signal_p (const struct fde_entry *dw_fde)
+{
+  return (dw_fde->signal_frame == 1);
+}
+
 /* SFrame Frame Row Entry (FRE) related functions.  */
 
 static void
@@ -294,14 +301,16 @@ sframe_v1_set_fre_info (unsigned int cfa_base_reg, unsigned int num_offsets,
   return fre_info;
 }
 
-/* SFrame (SFRAME_VERSION_1) set function info.  */
+/* SFrame (SFRAME_VERSION_3) set function info.  */
+
 static unsigned char
-sframe_v1_set_func_info (unsigned int fde_type, unsigned int fre_type,
-                        unsigned int pauth_key)
+sframe_v3_set_func_info (unsigned int fde_type, unsigned int fre_type,
+                        unsigned int pauth_key, bool signal_p)
 {
   unsigned char func_info;
-  func_info = SFRAME_V1_FUNC_INFO (fde_type, fre_type);
-  func_info = SFRAME_V1_FUNC_INFO_UPDATE_PAUTH_KEY (pauth_key, func_info);
+  func_info = SFRAME_V2_FUNC_INFO (fde_type, fre_type);
+  func_info = SFRAME_V2_FUNC_INFO_UPDATE_PAUTH_KEY (pauth_key, func_info);
+  func_info = SFRAME_V3_FUNC_INFO_UPDATE_SIGNAL_P (signal_p, func_info);
   return func_info;
 }
 
@@ -317,7 +326,7 @@ sframe_set_version (uint32_t sframe_version ATTRIBUTE_UNUSED)
 
   sframe_ver_ops.set_fre_info = sframe_v1_set_fre_info;
 
-  sframe_ver_ops.set_func_info = sframe_v1_set_func_info;
+  sframe_ver_ops.set_func_info = sframe_v3_set_func_info;
 }
 
 /* SFrame set FRE info.  */
@@ -334,9 +343,10 @@ sframe_set_fre_info (unsigned int cfa_base_reg, unsigned int num_offsets,
 
 static unsigned char
 sframe_set_func_info (unsigned int fde_type, unsigned int fre_type,
-                     unsigned int pauth_key)
+                     unsigned int pauth_key, bool signal_p)
 {
-  return sframe_ver_ops.set_func_info (fde_type, fre_type, pauth_key);
+  return sframe_ver_ops.set_func_info (fde_type, fre_type, pauth_key,
+                                      signal_p);
 }
 
 /* Get the number of SFrame FDEs for the current file.  */
@@ -689,6 +699,7 @@ output_sframe_funcdesc (symbolS *start_of_fre_section,
   expressionS exp;
   symbolS *dw_fde_start_addrS, *dw_fde_end_addrS;
   unsigned int pauth_key;
+  bool signal_p;
 
   dw_fde_start_addrS = get_dw_fde_start_addrS (sframe_fde->dw_fde);
   dw_fde_end_addrS = get_dw_fde_end_addrS (sframe_fde->dw_fde);
@@ -732,9 +743,10 @@ output_sframe_funcdesc (symbolS *start_of_fre_section,
   unsigned char func_info;
   pauth_key = (get_dw_fde_pauth_b_key_p (sframe_fde->dw_fde)
               ? SFRAME_AARCH64_PAUTH_KEY_B : SFRAME_AARCH64_PAUTH_KEY_A);
+  signal_p = get_dw_fde_signal_p (sframe_fde->dw_fde);
   func_info = sframe_set_func_info (SFRAME_FDE_TYPE_PCINC,
                                    SFRAME_FRE_TYPE_ADDR4,
-                                   pauth_key);
+                                   pauth_key, signal_p);
   if (SFRAME_FRE_TYPE_SELECTION_OPT)
     {
       expressionS cexp;

diff --git a/gas/gen-sframe.h b/gas/gen-sframe.h
index f22e1e262acffcde75c1d19ae9d7b2e416729864..c4d621b01732aab3224d3fac199237a93ba1cad2 100644 (file)
--- a/gas/gen-sframe.h
+++ b/gas/gen-sframe.h
@@ -157,7 +157,8 @@ struct sframe_version_ops
   unsigned char (*set_fre_info) (unsigned int, unsigned int, unsigned int,
                                 bool);
   /* set SFrame Func info.  */
-  unsigned char (*set_func_info) (unsigned int, unsigned int, unsigned int);
+  unsigned char (*set_func_info) (unsigned int, unsigned int, unsigned int,
+                                 bool);
 };
 
 /* Generate SFrame stack trace info and prepare contents for the output.

diff --git a/gas/sframe-opt.c b/gas/sframe-opt.c
index 690617fab44a705651bbb0d177b4a9637fd1936d..01f042054cea18ee49a64892f917036eb133d1a7 100644 (file)
--- a/gas/sframe-opt.c
+++ b/gas/sframe-opt.c
@@ -96,6 +96,7 @@ sframe_convert_frag (fragS *frag)
   offsetT rest_of_data;
   uint8_t fde_type, fre_type;
   uint8_t pauth_key;
+  bool signal_p;
 
   expressionS *exp;
   symbolS *dataS;
@@ -118,6 +119,7 @@ sframe_convert_frag (fragS *frag)
       rest_of_data = (symbol_get_value_expression(dataS))->X_add_number;
       fde_type = SFRAME_V2_FUNC_FDE_TYPE (rest_of_data);
       pauth_key = SFRAME_V2_FUNC_PAUTH_KEY (rest_of_data);
+      signal_p = SFRAME_V3_FUNC_SIGNAL_P (rest_of_data);
       gas_assert (fde_type == SFRAME_FDE_TYPE_PCINC);
 
       /* Calculate the applicable fre_type.  */
@@ -133,6 +135,7 @@ sframe_convert_frag (fragS *frag)
       /* Create the new function info.  */
       value = SFRAME_V2_FUNC_INFO (fde_type, fre_type);
       value = SFRAME_V2_FUNC_INFO_UPDATE_PAUTH_KEY (pauth_key, value);
+      value = SFRAME_V3_FUNC_INFO_UPDATE_SIGNAL_P (signal_p, value);
 
       frag->fr_literal[frag->fr_fix] = value;
     }

diff --git a/gas/testsuite/gas/cfi-sframe/cfi-sframe-common-13.d b/gas/testsuite/gas/cfi-sframe/cfi-sframe-common-13.d
new file mode 100644 (file)
index 0000000..5864fa6
--- /dev/null
+++ b/gas/testsuite/gas/cfi-sframe/cfi-sframe-common-13.d
@@ -0,0 +1,19 @@
+#as: --gsframe
+#objdump: --sframe=.sframe
+#name: Signal Frame
+#...
+Contents of the SFrame section .sframe:
+
+  Header :
+
+    Version: SFRAME_VERSION_3
+    Flags: SFRAME_F_FDE_FUNC_START_PCREL
+#?    CFA fixed FP offset: \-?\d+
+#?    CFA fixed RA offset: \-?\d+
+    Num FDEs: 1
+    Num FREs: 1
+
+  Function Index :
+    func idx \[0\]: pc = 0x0, size = 0 bytes, attr = \"S\"
+    STARTPC + CFA + FP + RA +
+#pass

diff --git a/gas/testsuite/gas/cfi-sframe/cfi-sframe-common-13.s b/gas/testsuite/gas/cfi-sframe/cfi-sframe-common-13.s
new file mode 100644 (file)
index 0000000..0009281
--- /dev/null
+++ b/gas/testsuite/gas/cfi-sframe/cfi-sframe-common-13.s
@@ -0,0 +1,3 @@
+       .cfi_startproc
+       .cfi_signal_frame
+       .cfi_endproc

diff --git a/gas/testsuite/gas/cfi-sframe/cfi-sframe.exp b/gas/testsuite/gas/cfi-sframe/cfi-sframe.exp
index b60e4f8d68f3ed249d7b6c241bc45b6171feac42..a352b325fd6ae372c64d24bafe97a8c7af32474f 100644 (file)
--- a/gas/testsuite/gas/cfi-sframe/cfi-sframe.exp
+++ b/gas/testsuite/gas/cfi-sframe/cfi-sframe.exp
@@ -48,6 +48,7 @@ if  { ([istarget "x86_64-*-*"] || [istarget "aarch64*-*-*"]
     run_dump_test "cfi-sframe-common-10"
     run_dump_test "cfi-sframe-common-11"
     run_dump_test "cfi-sframe-common-12"
+    run_dump_test "cfi-sframe-common-13"
 
     run_dump_test "common-empty-1"
     run_dump_test "common-empty-2"

diff --git a/include/sframe.h b/include/sframe.h
index 8588ba667eaeb7b035a19f94c1463013f90c6e0d..fc059551d5f267a64dcb2434cd2e5d6e6808d6d4 100644 (file)
--- a/include/sframe.h
+++ b/include/sframe.h
@@ -256,12 +256,13 @@ typedef struct sframe_func_desc_entry_v3
      - 4-bits: Identify the FRE type used for the function.
      - 1-bit: Identify the FDE type of the function - mask or inc.
      - 1-bit: PAC authorization A/B key (aarch64).
-     - 2-bits: Unused.
-     --------------------------------------------------------------------------
-     |     Unused    |  PAC auth A/B key (aarch64) |  FDE type |   FRE type   |
-     |               |     Unused (amd64, s390x)   |           |              |
-     --------------------------------------------------------------------------
-     8               6                             5           4              0     */
+     - 1-bits: Unused.
+     - 1-bit: Signal frame.
+     ---------------------------------------------------------------------------------
+     | Signal |   Unused    |  PAC auth A/B key (aarch64) |  FDE type |   FRE type   |
+     | frame  |             |        Unused (amd64)       |           |              |
+     ---------------------------------------------------------------------------------
+     8        7             6                             5           4              0     */
   uint8_t sfde_func_info;
   /* Size of the block of repeating insns.  Used for SFrame FDEs of type
      SFRAME_FDE_TYPE_PCMASK.  */
@@ -276,10 +277,14 @@ typedef struct sframe_func_desc_entry_v3
 #define SFRAME_V3_FUNC_FRE_TYPE(data)    (SFRAME_V2_FUNC_FRE_TYPE (data))
 #define SFRAME_V3_FUNC_FDE_TYPE(data)    (SFRAME_V2_FUNC_FDE_TYPE (data))
 #define SFRAME_V3_FUNC_PAUTH_KEY(data)   (SFRAME_V2_FUNC_PAUTH_KEY (data))
+#define SFRAME_V3_FUNC_SIGNAL_P(data)     (((data) >> 7) & 0x1)
 
 #define SFRAME_V3_FUNC_INFO_UPDATE_PAUTH_KEY(pauth_key, fde_info) \
   SFRAME_V2_FUNC_INFO_UPDATE_PAUTH_KEY (pauth_key, fde_info)
 
+#define SFRAME_V3_FUNC_INFO_UPDATE_SIGNAL_P(signal_p, fde_info)  \
+  ((((signal_p) & 0x1) << 7) | ((fde_info) & 0x7f))
+
 /* Size of stack frame offsets in an SFrame Frame Row Entry.  A single
    SFrame FRE has all offsets of the same size.  Offset size may vary
    across frame row entries.  */

diff --git a/libsframe/sframe-dump.c b/libsframe/sframe-dump.c
index 49fa7b28ce77ac61206151b493d8512b9cdf793f..456b8ae813768f96bbc5ac7468d3b8ef8716bd48 100644 (file)
--- a/libsframe/sframe-dump.c
+++ b/libsframe/sframe-dump.c
@@ -169,31 +169,37 @@ dump_sframe_func_with_fres (const sframe_decoder_ctx *sfd_ctx,
                                                                     funcidx,
                                                                     NULL);
 
-  /* Mark FDEs with [m] where the FRE start address is interpreted as a
-     mask.  */
-  int fde_type_addrmask_p = (SFRAME_V2_FUNC_FDE_TYPE (func_info)
-                            == SFRAME_FDE_TYPE_PCMASK);
-  const char *fde_type_marker
-    = (fde_type_addrmask_p ? "[m]" : "   ");
+  /* Gather all FDE attributes.  */
+  char attrs[16] = {0};
+  bool fde_signal_p = SFRAME_V3_FUNC_SIGNAL_P (func_info);
+  sprintf (attrs, fde_signal_p ? "S" : "");
 
   printf ("\n    func idx [%d]: pc = 0x%"PRIx64 ", size = %d bytes",
          funcidx,
          func_start_pc_vma,
          func_size);
+  /* Print attributes if they exist.  */
+  if (attrs[0])
+    printf (", attr = \"%s\"", attrs);
 
   if (is_sframe_abi_arch_aarch64 (sfd_ctx)
       && (SFRAME_V2_FUNC_PAUTH_KEY (func_info) == SFRAME_AARCH64_PAUTH_KEY_B))
     printf (", pauth = B key");
 
-  char temp[100];
-
+  /* Mark FDEs with [m] where the FRE start address is interpreted as a
+     mask.  */
+  int pc_mask_p
+    = (SFRAME_V2_FUNC_FDE_TYPE (func_info) == SFRAME_FDE_TYPE_PCMASK);
+  const char *pc_mask_marker = (pc_mask_p ? "[m]" : "   ");
   printf ("\n    %-7s%-8s %-10s%-10s%-13s",
-         "STARTPC", fde_type_marker, "CFA", "FP", "RA");
+         "STARTPC", pc_mask_marker, "CFA", "FP", "RA");
+
+  char temp[100] = {0};
   for (j = 0; j < num_fres; j++)
     {
       sframe_decoder_get_fre (sfd_ctx, funcidx, j, &fre);
 
-      fre_start_pc_vma = (fde_type_addrmask_p
+      fre_start_pc_vma = (pc_mask_p
                          ? fre.fre_start_addr
                          : func_start_pc_vma + fre.fre_start_addr);