Change regcache list to be an hash map

[deliverable/binutils-gdb.git] / gas / ehopt.c

diff --git a/gas/ehopt.c b/gas/ehopt.c
index 1c1ac60099a0658b4107e27b4ef4534eecfdb469..bf65602f533558f070d772e5e4364da6431787b8 100644 (file)
--- a/gas/ehopt.c
+++ b/gas/ehopt.c
@@ -1,6 +1,5 @@
 /* ehopt.c--optimize gcc exception frame information.
-   Copyright 1998, 2000, 2001, 2003, 2005, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>.
 
    This file is part of GAS, the GNU Assembler.
@@ -22,7 +21,6 @@
 
 #include "as.h"
 #include "subsegs.h"
-#include "struc-symbol.h"
 
 /* We include this ELF file, even though we may not be assembling for
    ELF, since the exception frame information is always in a format
@@ -105,7 +103,7 @@ get_cie_info (struct cie_info *info)
 {
   fragS *f;
   fixS *fix;
-  int offset;
+  unsigned int offset;
   char CIE_id;
   char augmentation[10];
   int iaug;
@@ -120,7 +118,7 @@ get_cie_info (struct cie_info *info)
 
   /* First make sure that the CIE Identifier Tag is 0/-1.  */
 
-  if (strcmp (segment_name (now_seg), ".debug_frame") == 0)
+  if (strncmp (segment_name (now_seg), ".debug_frame", 12) == 0)
     CIE_id = (char)0xff;
   else
     CIE_id = 0;
@@ -227,6 +225,19 @@ get_cie_info (struct cie_info *info)
   return 1;
 }
 
+enum frame_state
+{
+  state_idle,
+  state_saw_size,
+  state_saw_cie_offset,
+  state_saw_pc_begin,
+  state_seeing_aug_size,
+  state_skipping_aug,
+  state_wait_loc4,
+  state_saw_loc4,
+  state_error,
+};
+
 /* This function is called from emit_expr.  It looks for cases which
    we can optimize.
 
@@ -245,18 +256,7 @@ check_eh_frame (expressionS *exp, unsigned int *pnbytes)
 {
   struct frame_data
   {
-    enum frame_state
-    {
-      state_idle,
-      state_saw_size,
-      state_saw_cie_offset,
-      state_saw_pc_begin,
-      state_seeing_aug_size,
-      state_skipping_aug,
-      state_wait_loc4,
-      state_saw_loc4,
-      state_error,
-    } state;
+    enum frame_state state;
 
     int cie_info_ok;
     struct cie_info cie_info;
@@ -283,9 +283,10 @@ check_eh_frame (expressionS *exp, unsigned int *pnbytes)
 #endif
 
   /* Select the proper section data.  */
-  if (strcmp (segment_name (now_seg), ".eh_frame") == 0)
+  if (strncmp (segment_name (now_seg), ".eh_frame", 9) == 0
+      && segment_name (now_seg)[9] != '_')
     d = &eh_frame_data;
-  else if (strcmp (segment_name (now_seg), ".debug_frame") == 0)
+  else if (strncmp (segment_name (now_seg), ".debug_frame", 12) == 0)
     d = &debug_frame_data;
   else
     return 0;
@@ -324,7 +325,7 @@ check_eh_frame (expressionS *exp, unsigned int *pnbytes)
     case state_saw_size:
     case state_saw_cie_offset:
       /* Assume whatever form it appears in, it appears atomically.  */
-      d->state += 1;
+      d->state = (enum frame_state) (d->state + 1);
       break;
 
     case state_saw_pc_begin:
@@ -432,23 +433,28 @@ check_eh_frame (expressionS *exp, unsigned int *pnbytes)
                || exp->X_op == O_right_shift)
               && d->cie_info.code_alignment > 1)
        {
-         if (exp->X_add_symbol->bsym
-             && exp->X_op_symbol->bsym
-             && exp->X_add_symbol->sy_value.X_op == O_subtract
-             && exp->X_op_symbol->sy_value.X_op == O_constant
+         if (symbol_symbolS (exp->X_add_symbol)
+             && symbol_constant_p (exp->X_op_symbol)
+             && S_GET_SEGMENT (exp->X_op_symbol) == absolute_section
              && ((exp->X_op == O_divide
-                  ? exp->X_op_symbol->sy_value.X_add_number
-                  : (offsetT) 1 << exp->X_op_symbol->sy_value.X_add_number)
+                  ? *symbol_X_add_number (exp->X_op_symbol)
+                  : (offsetT) 1 << *symbol_X_add_number (exp->X_op_symbol))
                  == (offsetT) d->cie_info.code_alignment))
            {
-             /* This is a case we can optimize as well.  The expression was
-                not reduced, so we can not finish the optimization until the
-                end of the assembly.  We set up a variant frag which we
-                handle later.  */
-             frag_var (rs_cfa, 4, 0, d->cie_info.code_alignment << 3,
-                       make_expr_symbol (&exp->X_add_symbol->sy_value),
-                       d->loc4_fix, (char *) d->loc4_frag);
-             return 1;
+             expressionS *symval;
+
+             symval = symbol_get_value_expression (exp->X_add_symbol);
+             if (symval->X_op == O_subtract)
+               {
+                 /* This is a case we can optimize as well.  The
+                    expression was not reduced, so we can not finish
+                    the optimization until the end of the assembly.
+                    We set up a variant frag which we handle later.  */
+                 frag_var (rs_cfa, 4, 0, d->cie_info.code_alignment << 3,
+                           make_expr_symbol (symval),
+                           d->loc4_fix, (char *) d->loc4_frag);
+                 return 1;
+               }
            }
        }
       break;
@@ -476,7 +482,9 @@ eh_frame_estimate_size_before_relax (fragS *frag)
 
   gas_assert (ca > 0);
   diff /= ca;
-  if (diff < 0x40)
+  if (diff == 0)
+    ret = -1;
+  else if (diff < 0x40)
     ret = 0;
   else if (diff < 0x100)
     ret = 1;
@@ -485,7 +493,7 @@ eh_frame_estimate_size_before_relax (fragS *frag)
   else
     ret = 4;
 
-  frag->fr_subtype = (frag->fr_subtype & ~7) | ret;
+  frag->fr_subtype = (frag->fr_subtype & ~7) | (ret & 7);
 
   return ret;
 }
@@ -500,6 +508,8 @@ eh_frame_relax_frag (fragS *frag)
   int oldsize, newsize;
 
   oldsize = frag->fr_subtype & 7;
+  if (oldsize == 7)
+    oldsize = -1;
   newsize = eh_frame_estimate_size_before_relax (frag);
   return newsize - oldsize;
 }
@@ -542,9 +552,17 @@ eh_frame_convert_frag (fragS *frag)
       md_number_to_chars (frag->fr_literal + frag->fr_fix, diff, 2);
       break;
 
-    default:
+    case 4:
       md_number_to_chars (frag->fr_literal + frag->fr_fix, diff, 4);
       break;
+
+    case 7:
+      gas_assert (diff == 0);
+      frag->fr_fix -= 8;
+      break;
+
+    default:
+      abort ();
     }
 
   frag->fr_fix += frag->fr_subtype & 7;