X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Ffrags.h;h=73b71821b9c816f86de52043d471165e0b225842;hb=e0ab682bec5fe48fd19f5c3286e3b2e316449e48;hp=c1c652bd89a4d9ff12597b2f4cebb56c789122d0;hpb=0a9ef439079f50221dad9eb5248387236d370c87;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/frags.h b/gas/frags.h
index c1c652bd89..73b71821b9 100644
--- a/gas/frags.h
+++ b/gas/frags.h
@@ -1,5 +1,5 @@
 /* frags.h - Header file for the frag concept.
-   Copyright (C) 1987, 92, 93, 94, 95, 97, 98, 99, 2000
+   Copyright 1987, 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -38,13 +38,14 @@ struct obstack;
    of a particular frag}+offset.
 
    BUG: it may be smarter to have a single pointer off to various different
-   notes for different frag kinds.  See how code pans.   */
+   notes for different frag kinds.  See how code pans.  */
 
 struct frag {
   /* Object file address (as an octet offset).  */
   addressT fr_address;
-  /* Chain forward; ascending address order.  Rooted in frch_root.  */
-  struct frag *fr_next;
+  /* When relaxing multiple times, remember the address the frag had
+     in the last relax pass.  */
+  addressT last_fr_address;
 
   /* (Fixed) number of octets we know we have.  May be 0.  */
   offsetT fr_fix;
@@ -52,16 +53,27 @@ struct frag {
      The generic frag handling code no longer makes any use of fr_var.  */
   offsetT fr_var;
   /* For variable-length tail.  */
-  symbolS *fr_symbol;
-  /* For variable-length tail.  */
   offsetT fr_offset;
+  /* For variable-length tail.  */
+  symbolS *fr_symbol;
   /* Points to opcode low addr byte, for relaxation.  */
   char *fr_opcode;
 
+  /* Chain forward; ascending address order.  Rooted in frch_root.  */
+  struct frag *fr_next;
+
+  /* Where the frag was created, or where it became a variant frag.  */
+  char *fr_file;
+  unsigned int fr_line;
+
 #ifndef NO_LISTING
   struct list_info_struct *line;
 #endif
 
+  /* Flipped each relax pass so we can easily determine whether
+     fr_address has been adjusted.  */
+  unsigned int relax_marker:1;
+
   /* What state is my tail in? */
   relax_stateT fr_type;
   relax_substateT fr_subtype;
@@ -82,10 +94,6 @@ struct frag {
   TC_FRAG_TYPE tc_frag_data;
 #endif
 
-  /* Where the frag was created, or where it became a variant frag.  */
-  char *fr_file;
-  unsigned int fr_line;
-
   /* Data begins here.  */
   char fr_literal[1];
 };
@@ -98,8 +106,8 @@ struct frag {
    however, included in frchain_now.  The fr_fix field is bogus;
    instead, use frag_now_fix ().  */
 COMMON fragS *frag_now;
-extern addressT frag_now_fix PARAMS ((void));
-extern addressT frag_now_fix_octets PARAMS ((void));
+extern addressT frag_now_fix (void);
+extern addressT frag_now_fix_octets (void);
 
 /* For foreign-segment symbol fixups.  */
 COMMON fragS zero_address_frag;
@@ -108,7 +116,7 @@ COMMON fragS bss_address_frag;
 
 #if 0
 /* A macro to speed up appending exactly 1 char to current frag.  */
-/* JF changed < 1 to <= 1 to avoid a race conditon.  */
+/* JF changed < 1 to <= 1 to avoid a race condition.  */
 #define FRAG_APPEND_1_CHAR(datum)			\
 {							\
   if (obstack_room (&frags) <= 1)			\
@@ -119,37 +127,35 @@ COMMON fragS bss_address_frag;
   obstack_1grow (&frags, datum);			\
 }
 #else
-extern void frag_append_1_char PARAMS ((int));
+extern void frag_append_1_char (int);
 #define FRAG_APPEND_1_CHAR(X) frag_append_1_char (X)
 #endif
 
-void frag_init PARAMS ((void));
-fragS *frag_alloc PARAMS ((struct obstack *));
-void frag_grow PARAMS ((unsigned int nchars));
-char *frag_more PARAMS ((int nchars));
-void frag_align PARAMS ((int alignment, int fill_character, int max));
-void frag_align_pattern PARAMS ((int alignment,
-				 const char *fill_pattern,
-				 int n_fill,
-				 int max));
-void frag_align_code PARAMS ((int alignment, int max));
-void frag_new PARAMS ((int old_frags_var_max_size));
-void frag_wane PARAMS ((fragS * fragP));
-
-char *frag_variant PARAMS ((relax_stateT type,
-			    int max_chars,
-			    int var,
-			    relax_substateT subtype,
-			    symbolS * symbol,
-			    offsetT offset,
-			    char *opcode));
-
-char *frag_var PARAMS ((relax_stateT type,
-			int max_chars,
-			int var,
-			relax_substateT subtype,
-			symbolS * symbol,
-			offsetT offset,
-			char *opcode));
+void frag_init (void);
+fragS *frag_alloc (struct obstack *);
+void frag_grow (unsigned int nchars);
+char *frag_more (int nchars);
+void frag_align (int alignment, int fill_character, int max);
+void frag_align_pattern (int alignment, const char *fill_pattern,
+			 int n_fill, int max);
+void frag_align_code (int alignment, int max);
+void frag_new (int old_frags_var_max_size);
+void frag_wane (fragS * fragP);
+
+char *frag_variant (relax_stateT type,
+		    int max_chars,
+		    int var,
+		    relax_substateT subtype,
+		    symbolS * symbol,
+		    offsetT offset,
+		    char *opcode);
+
+char *frag_var (relax_stateT type,
+		int max_chars,
+		int var,
+		relax_substateT subtype,
+		symbolS * symbol,
+		offsetT offset,
+		char *opcode);
 
 #endif /* FRAGS_H */