opcodes: blackfin: constify register names

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

diff --git a/gas/frags.c b/gas/frags.c
index cfd183fb3d41ec63d70add20111b0a97161e7430..fe3b4cced211b2b0716115ab858cf5a84453a5cc 100644 (file)
--- a/gas/frags.c
+++ b/gas/frags.c
@@ -1,13 +1,13 @@
 /* frags.c - manage frags -
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 /* frags.c - manage frags -
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,

-   1999, 2000, 2001, 2003, 2004, 2005, 2006
+   1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009

    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -137,12 +137,12 @@ frag_new (int old_frags_var_max_size
   fragS *former_last_fragP;
   frchainS *frchP;
 
   fragS *former_last_fragP;
   frchainS *frchP;
 

-  assert (frchain_now->frch_last == frag_now);
+  gas_assert (frchain_now->frch_last == frag_now);

 
   /* Fix up old frag's fr_fix.  */
   frag_now->fr_fix = frag_now_fix_octets () - old_frags_var_max_size;
   /* Make sure its type is valid.  */
 
   /* Fix up old frag's fr_fix.  */
   frag_now->fr_fix = frag_now_fix_octets () - old_frags_var_max_size;
   /* Make sure its type is valid.  */

-  assert (frag_now->fr_type != 0);
+  gas_assert (frag_now->fr_type != 0);

 
   /* This will align the obstack so the next struct we allocate on it
      will begin at a correct boundary.  */
 
   /* This will align the obstack so the next struct we allocate on it
      will begin at a correct boundary.  */


@@ -150,8 +150,8 @@ frag_new (int old_frags_var_max_size
   frchP = frchain_now;
   know (frchP);
   former_last_fragP = frchP->frch_last;
   frchP = frchain_now;
   know (frchP);
   former_last_fragP = frchP->frch_last;

-  assert (former_last_fragP != 0);
-  assert (former_last_fragP == frag_now);
+  gas_assert (former_last_fragP != 0);
+  gas_assert (former_last_fragP == frag_now);

   frag_now = frag_alloc (&frchP->frch_obstack);
 
   as_where (&frag_now->fr_file, &frag_now->fr_line);
   frag_now = frag_alloc (&frchP->frch_obstack);
 
   as_where (&frag_now->fr_file, &frag_now->fr_line);


@@ -170,7 +170,7 @@ frag_new (int old_frags_var_max_size
   }
 #endif
 
   }
 #endif
 

-  assert (frchain_now->frch_last == frag_now);
+  gas_assert (frchain_now->frch_last == frag_now);

 
   frag_now->fr_next = NULL;
 }
 
   frag_now->fr_next = NULL;
 }


@@ -389,9 +389,9 @@ frag_append_1_char (int datum)
    not already accounted for in the frag FR_ADDRESS.  */
 
 bfd_boolean
    not already accounted for in the frag FR_ADDRESS.  */
 
 bfd_boolean

-frag_offset_fixed_p (fragS *frag1, fragS *frag2, bfd_vma *offset)
+frag_offset_fixed_p (const fragS *frag1, const fragS *frag2, bfd_vma *offset)

 {
 {

-  fragS *frag;
+  const fragS *frag;

   bfd_vma off;
 
   /* Start with offset initialised to difference between the two frags.
   bfd_vma off;
 
   /* Start with offset initialised to difference between the two frags.


@@ -419,6 +419,7 @@ frag_offset_fixed_p (fragS *frag1, fragS *frag2, bfd_vma *offset)
     }
 
   /* Maybe frag1 is after frag2.  */
     }
 
   /* Maybe frag1 is after frag2.  */

+  off = frag1->fr_address - frag2->fr_address;

   frag = frag2;
   while (frag->fr_type == rs_fill)
     {
   frag = frag2;
   while (frag->fr_type == rs_fill)
     {