Rename REG_CFA_TOGGLE_RA_MANGLE to REG_CFA_NEGATE_RA_STATE

The current name REG_CFA_TOGGLE_RA_MANGLE is not representative of what
it really is, i.e. a register to represent several states, not only a
binary one. Same for dwarf2out_frame_debug_cfa_toggle_ra_mangle.

gcc/ChangeLog:

	* combine-stack-adj.cc
	(no_unhandled_cfa): Rename.
	* config/aarch64/aarch64.cc
	(aarch64_expand_prologue): Rename.
	(aarch64_expand_epilogue): Rename.
	* dwarf2cfi.cc
	(dwarf2out_frame_debug_cfa_toggle_ra_mangle): Rename this...
	(dwarf2out_frame_debug_cfa_negate_ra_state): To this.
	(dwarf2out_frame_debug): Rename.
	* reg-notes.def (REG_CFA_NOTE): Rename REG_CFA_TOGGLE_RA_MANGLE.

diff --git a/gcc/combine-stack-adj.cc b/gcc/combine-stack-adj.cc
index 2da9bf2bc1ef25e4ba790d61193bd40b84c45ea9..367d3b66b749755eb86133c37c6f6ffed9ba7994 100644 (file)
--- a/gcc/combine-stack-adj.cc
+++ b/gcc/combine-stack-adj.cc
@@ -212,7 +212,7 @@ no_unhandled_cfa (rtx_insn *insn)
       case REG_CFA_SET_VDRAP:
       case REG_CFA_WINDOW_SAVE:
       case REG_CFA_FLUSH_QUEUE:
-      case REG_CFA_TOGGLE_RA_MANGLE:
+      case REG_CFA_NEGATE_RA_STATE:
        return false;
       }
 

diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index 68913beaee2092d65279801c362d6e742269b3c4..e41431d56ac4393dc32c16eb7351e83d792a557f 100644 (file)
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -9612,7 +9612,7 @@ aarch64_expand_prologue (void)
          default:
            gcc_unreachable ();
        }
-      add_reg_note (insn, REG_CFA_TOGGLE_RA_MANGLE, const0_rtx);
+      add_reg_note (insn, REG_CFA_NEGATE_RA_STATE, const0_rtx);
       RTX_FRAME_RELATED_P (insn) = 1;
     }
 
@@ -10033,7 +10033,7 @@ aarch64_expand_epilogue (rtx_call_insn *sibcall)
          default:
            gcc_unreachable ();
        }
-      add_reg_note (insn, REG_CFA_TOGGLE_RA_MANGLE, const0_rtx);
+      add_reg_note (insn, REG_CFA_NEGATE_RA_STATE, const0_rtx);
       RTX_FRAME_RELATED_P (insn) = 1;
     }
 

diff --git a/gcc/dwarf2cfi.cc b/gcc/dwarf2cfi.cc
index 1231b5bb5f054054a0d35f8a8d4a0d7b6d12390e..4ad9acbd6fd61d2100c67327c3db4928ecf9c751 100644 (file)
--- a/gcc/dwarf2cfi.cc
+++ b/gcc/dwarf2cfi.cc
@@ -1547,13 +1547,13 @@ dwarf2out_frame_debug_cfa_window_save (void)
   cur_row->window_save = true;
 }
 
-/* A subroutine of dwarf2out_frame_debug, process a REG_CFA_TOGGLE_RA_MANGLE.
+/* A subroutine of dwarf2out_frame_debug, process a REG_CFA_NEGATE_RA_STATE.
    Note: DW_CFA_GNU_window_save dwarf opcode is reused for toggling RA mangle
    state, this is a target specific operation on AArch64 and can only be used
    on other targets if they don't use the window save operation otherwise.  */
 
 static void
-dwarf2out_frame_debug_cfa_toggle_ra_mangle (void)
+dwarf2out_frame_debug_cfa_negate_ra_state (void)
 {
   dw_cfi_ref cfi = new_cfi ();
 
@@ -2341,8 +2341,8 @@ dwarf2out_frame_debug (rtx_insn *insn)
        handled_one = true;
        break;
 
-      case REG_CFA_TOGGLE_RA_MANGLE:
-       dwarf2out_frame_debug_cfa_toggle_ra_mangle ();
+      case REG_CFA_NEGATE_RA_STATE:
+       dwarf2out_frame_debug_cfa_negate_ra_state ();
        handled_one = true;
        break;
 

diff --git a/gcc/reg-notes.def b/gcc/reg-notes.def
index 5b878fb2a1cd1c8e196380bebf3bd331d4ea700e..ddcf16b68be5db4994d5af425a7cc82629f5960f 100644 (file)
--- a/gcc/reg-notes.def
+++ b/gcc/reg-notes.def
@@ -180,10 +180,10 @@ REG_CFA_NOTE (CFA_WINDOW_SAVE)
    the rest of the compiler as a CALL_INSN.  */
 REG_CFA_NOTE (CFA_FLUSH_QUEUE)
 
-/* Attached to insns that are RTX_FRAME_RELATED_P, toggling the mangling status
-   of return address.  Currently it's only used by AArch64.  The argument is
-   ignored.  */
-REG_CFA_NOTE (CFA_TOGGLE_RA_MANGLE)
+/* Attached to insns that are RTX_FRAME_RELATED_P, indicating an authentication
+   of the return address. Currently it's only used by AArch64.
+   The argument is ignored.  */
+REG_CFA_NOTE (CFA_NEGATE_RA_STATE)
 
 /* Indicates what exception region an INSN belongs in.  This is used
    to indicate what region to which a call may throw.  REGION 0