1 files changed, 84 insertions, 84 deletions

diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index abb34d0596a..25dea30817b 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -128,7 +128,7 @@ df_chain_dump (struct df_link *link, FILE *file)
 	       DF_REF_REG_DEF_P (link->ref) ? 'd' : 'u',
 	       DF_REF_ID (link->ref),
 	       DF_REF_BBNO (link->ref),
-	       DF_REF_INSN_INFO (link->ref) ? DF_REF_INSN_UID (link->ref) : -1);
+	       DF_REF_IS_ARTIFICIAL (link->ref) ? -1 : DF_REF_INSN_UID (link->ref));
     }
   fprintf (file, "}");
 }
@@ -320,12 +320,12 @@ df_rd_alloc (bitmap all_blocks)
 
 static void
 df_rd_bb_local_compute_process_def (struct df_rd_bb_info *bb_info, 
-				    struct df_ref **def_rec,
+				    df_ref *def_rec,
 				    enum df_ref_flags top_flag)
 {
   while (*def_rec)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if (top_flag == (DF_REF_FLAGS (def) & DF_REF_AT_TOP))
 	{
 	  unsigned int regno = DF_REF_REGNO (def);
@@ -795,13 +795,13 @@ df_lr_bb_local_compute (unsigned int bb_index)
   basic_block bb = BASIC_BLOCK (bb_index);
   struct df_lr_bb_info *bb_info = df_lr_get_bb_info (bb_index);
   rtx insn;
-  struct df_ref **def_rec;
-  struct df_ref **use_rec;
+  df_ref *def_rec;
+  df_ref *use_rec;
 
   /* Process the registers set in an exception handler.  */
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if ((DF_REF_FLAGS (def) & DF_REF_AT_TOP) == 0)
 	{
 	  unsigned int dregno = DF_REF_REGNO (def);
@@ -813,7 +813,7 @@ df_lr_bb_local_compute (unsigned int bb_index)
   /* Process the hardware registers that are always live.  */
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       /* Add use to set of uses in this BB.  */
       if ((DF_REF_FLAGS (use) & DF_REF_AT_TOP) == 0)
 	bitmap_set_bit (bb_info->use, DF_REF_REGNO (use));
@@ -828,7 +828,7 @@ df_lr_bb_local_compute (unsigned int bb_index)
 
       for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
 	{
-	  struct df_ref *def = *def_rec;
+	  df_ref def = *def_rec;
 	  /* If the def is to only part of the reg, it does
 	     not kill the other defs that reach here.  */
 	  if (!(DF_REF_FLAGS (def) & (DF_REF_PARTIAL | DF_REF_CONDITIONAL)))
@@ -841,7 +841,7 @@ df_lr_bb_local_compute (unsigned int bb_index)
 
       for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++)
 	{
-	  struct df_ref *use = *use_rec;
+	  df_ref use = *use_rec;
 	  /* Add use to set of uses in this BB.  */
 	  bitmap_set_bit (bb_info->use, DF_REF_REGNO (use));
 	}
@@ -852,7 +852,7 @@ df_lr_bb_local_compute (unsigned int bb_index)
      goto.  */
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if (DF_REF_FLAGS (def) & DF_REF_AT_TOP)
 	{
 	  unsigned int dregno = DF_REF_REGNO (def);
@@ -865,7 +865,7 @@ df_lr_bb_local_compute (unsigned int bb_index)
   /* Process the uses that are live into an exception handler.  */
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       /* Add use to set of uses in this BB.  */
       if (DF_REF_FLAGS (use) & DF_REF_AT_TOP)
 	bitmap_set_bit (bb_info->use, DF_REF_REGNO (use));
@@ -1415,7 +1415,7 @@ df_live_bb_local_compute (unsigned int bb_index)
   basic_block bb = BASIC_BLOCK (bb_index);
   struct df_live_bb_info *bb_info = df_live_get_bb_info (bb_index);
   rtx insn;
-  struct df_ref **def_rec;
+  df_ref *def_rec;
   int luid = 0;
 
   FOR_BB_INSNS (bb, insn)
@@ -1438,7 +1438,7 @@ df_live_bb_local_compute (unsigned int bb_index)
       luid++;
       for (def_rec = DF_INSN_INFO_DEFS (insn_info); *def_rec; def_rec++)
 	{
-	  struct df_ref *def = *def_rec;
+	  df_ref def = *def_rec;
 	  unsigned int regno = DF_REF_REGNO (def);
 
 	  if (DF_REF_FLAGS_IS_SET (def,
@@ -1457,7 +1457,7 @@ df_live_bb_local_compute (unsigned int bb_index)
 
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       bitmap_set_bit (bb_info->gen, DF_REF_REGNO (def));
     }
 }
@@ -1858,7 +1858,7 @@ df_live_verify_transfer_functions (void)
 /* Create a du or ud chain from SRC to DST and link it into SRC.   */
 
 struct df_link *
-df_chain_create (struct df_ref *src, struct df_ref *dst)
+df_chain_create (df_ref src, df_ref dst)
 {
   struct df_link *head = DF_REF_CHAIN (src);
   struct df_link *link = (struct df_link *) pool_alloc (df_chain->block_pool);
@@ -1873,7 +1873,7 @@ df_chain_create (struct df_ref *src, struct df_ref *dst)
 /* Delete any du or ud chains that start at REF and point to
    TARGET.  */ 
 static void
-df_chain_unlink_1 (struct df_ref *ref, struct df_ref *target)
+df_chain_unlink_1 (df_ref ref, df_ref target)
 {
   struct df_link *chain = DF_REF_CHAIN (ref);
   struct df_link *prev = NULL;
@@ -1898,7 +1898,7 @@ df_chain_unlink_1 (struct df_ref *ref, struct df_ref *target)
 /* Delete a du or ud chain that leave or point to REF.  */
 
 void
-df_chain_unlink (struct df_ref *ref)
+df_chain_unlink (df_ref ref)
 {
   struct df_link *chain = DF_REF_CHAIN (ref);
   while (chain)
@@ -1917,7 +1917,7 @@ df_chain_unlink (struct df_ref *ref)
    TO_REF.  */ 
 
 void 
-df_chain_copy (struct df_ref *to_ref, 
+df_chain_copy (df_ref to_ref, 
 	       struct df_link *from_ref)
 {
   while (from_ref)
@@ -1943,8 +1943,8 @@ df_chain_remove_problem (void)
   EXECUTE_IF_SET_IN_BITMAP (df_chain->out_of_date_transfer_functions, 0, bb_index, bi)
     {
       rtx insn;
-      struct df_ref **def_rec;
-      struct df_ref **use_rec;
+      df_ref *def_rec;
+      df_ref *use_rec;
       basic_block bb = BASIC_BLOCK (bb_index);
 
       if (df_chain_problem_p (DF_DU_CHAIN))
@@ -2015,7 +2015,7 @@ df_chain_reset (bitmap blocks_to_clear ATTRIBUTE_UNUSED)
 
 static void
 df_chain_create_bb_process_use (bitmap local_rd,
-				struct df_ref **use_rec,
+				df_ref *use_rec,
 				enum df_ref_flags top_flag)
 {
   bitmap_iterator bi;
@@ -2023,7 +2023,7 @@ df_chain_create_bb_process_use (bitmap local_rd,
   
   while (*use_rec)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       unsigned int uregno = DF_REF_REGNO (use);
       if ((!(df->changeable_flags & DF_NO_HARD_REGS))
 	  || (uregno >= FIRST_PSEUDO_REGISTER))
@@ -2039,7 +2039,7 @@ df_chain_create_bb_process_use (bitmap local_rd,
 		  
 		  EXECUTE_IF_SET_IN_BITMAP (local_rd, first_index, def_index, bi)
 		    {
-		      struct df_ref *def;
+		      df_ref def;
 		      if (def_index > last_index) 
 			break;
 		      
@@ -2067,7 +2067,7 @@ df_chain_create_bb (unsigned int bb_index)
   struct df_rd_bb_info *bb_info = df_rd_get_bb_info (bb_index);
   rtx insn;
   bitmap cpy = BITMAP_ALLOC (NULL);
-  struct df_ref **def_rec;
+  df_ref *def_rec;
 
   bitmap_copy (cpy, bb_info->in);
   bitmap_set_bit (df_chain->out_of_date_transfer_functions, bb_index);
@@ -2088,7 +2088,7 @@ df_chain_create_bb (unsigned int bb_index)
 
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if (DF_REF_FLAGS (def) & DF_REF_AT_TOP)
 	{
 	  unsigned int dregno = DF_REF_REGNO (def);
@@ -2103,7 +2103,7 @@ df_chain_create_bb (unsigned int bb_index)
   /* Process the regular instructions next.  */
   FOR_BB_INSNS (bb, insn)
     {
-      struct df_ref **def_rec;
+      df_ref *def_rec;
       unsigned int uid = INSN_UID (insn);
 
       if (!INSN_P (insn))
@@ -2122,7 +2122,7 @@ df_chain_create_bb (unsigned int bb_index)
          pass only changes the bits in cpy.  */
       for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
 	{
-	  struct df_ref *def = *def_rec;
+	  df_ref def = *def_rec;
 	  unsigned int dregno = DF_REF_REGNO (def);
 	  if ((!(df->changeable_flags & DF_NO_HARD_REGS))
 	      || (dregno >= FIRST_PSEUDO_REGISTER))
@@ -2183,14 +2183,14 @@ df_chain_top_dump (basic_block bb, FILE *file)
   if (df_chain_problem_p (DF_DU_CHAIN))
     {
       rtx insn;
-      struct df_ref **def_rec = df_get_artificial_defs (bb->index);
+      df_ref *def_rec = df_get_artificial_defs (bb->index);
       if (*def_rec)
 	{
 	  
 	  fprintf (file, ";;  DU chains for artificial defs\n");
 	  while (*def_rec)
 	    {
-	      struct df_ref *def = *def_rec;
+	      df_ref def = *def_rec;
 	      fprintf (file, ";;   reg %d ", DF_REF_REGNO (def));
 	      df_chain_dump (DF_REF_CHAIN (def), file);
 	      fprintf (file, "\n");
@@ -2211,9 +2211,9 @@ df_chain_top_dump (basic_block bb, FILE *file)
 		  
 		  while (*def_rec)
 		    {
-		      struct df_ref *def = *def_rec;
+		      df_ref def = *def_rec;
 		      fprintf (file, ";;      reg %d ", DF_REF_REGNO (def));
-		      if (def->flags & DF_REF_READ_WRITE)
+		      if (DF_REF_FLAGS (def) & DF_REF_READ_WRITE)
 			fprintf (file, "read/write ");
 		      df_chain_dump (DF_REF_CHAIN (def), file);
 		      fprintf (file, "\n");
@@ -2232,14 +2232,14 @@ df_chain_bottom_dump (basic_block bb, FILE *file)
   if (df_chain_problem_p (DF_UD_CHAIN))
     {
       rtx insn;
-      struct df_ref **use_rec = df_get_artificial_uses (bb->index);
+      df_ref *use_rec = df_get_artificial_uses (bb->index);
 
       if (*use_rec)
 	{
 	  fprintf (file, ";;  UD chains for artificial uses\n");
 	  while (*use_rec)
 	    {
-	      struct df_ref *use = *use_rec;
+	      df_ref use = *use_rec;
 	      fprintf (file, ";;   reg %d ", DF_REF_REGNO (use));
 	      df_chain_dump (DF_REF_CHAIN (use), file);
 	      fprintf (file, "\n");
@@ -2252,7 +2252,7 @@ df_chain_bottom_dump (basic_block bb, FILE *file)
 	  if (INSN_P (insn))
 	    {
 	      struct df_insn_info *insn_info = DF_INSN_INFO_GET (insn);
-	      struct df_ref **eq_use_rec = DF_INSN_INFO_EQ_USES (insn_info);
+	      df_ref *eq_use_rec = DF_INSN_INFO_EQ_USES (insn_info);
 	      use_rec = DF_INSN_INFO_USES (insn_info);
 	      if (*use_rec || *eq_use_rec)
 		{
@@ -2261,9 +2261,9 @@ df_chain_bottom_dump (basic_block bb, FILE *file)
 		  
 		  while (*use_rec)
 		    {
-		      struct df_ref *use = *use_rec;
+		      df_ref use = *use_rec;
 		      fprintf (file, ";;      reg %d ", DF_REF_REGNO (use));
-		      if (use->flags & DF_REF_READ_WRITE)
+		      if (DF_REF_FLAGS (use) & DF_REF_READ_WRITE)
 			fprintf (file, "read/write ");
 		      df_chain_dump (DF_REF_CHAIN (use), file);
 		      fprintf (file, "\n");
@@ -2271,7 +2271,7 @@ df_chain_bottom_dump (basic_block bb, FILE *file)
 		    }
 		  while (*eq_use_rec)
 		    {
-		      struct df_ref *use = *eq_use_rec;
+		      df_ref use = *eq_use_rec;
 		      fprintf (file, ";;   eq_note reg %d ", DF_REF_REGNO (use));
 		      df_chain_dump (DF_REF_CHAIN (use), file);
 		      fprintf (file, "\n");
@@ -2432,14 +2432,14 @@ df_byte_lr_free_bb_info (basic_block bb ATTRIBUTE_UNUSED,
    extracts, subregs or strict_low_parts.  */
 
 static void
-df_byte_lr_check_regs (struct df_ref **ref_rec)
+df_byte_lr_check_regs (df_ref *ref_rec)
 {
   struct df_byte_lr_problem_data *problem_data 
     = (struct df_byte_lr_problem_data *)df_byte_lr->problem_data;
 
   for (; *ref_rec; ref_rec++)
     {
-      struct df_ref *ref = *ref_rec;
+      df_ref ref = *ref_rec;
       if (DF_REF_FLAGS_IS_SET (ref, DF_REF_SIGN_EXTRACT 
 			       | DF_REF_ZERO_EXTRACT 
 			       | DF_REF_STRICT_LOW_PART)
@@ -2595,13 +2595,13 @@ df_byte_lr_bb_local_compute (unsigned int bb_index)
   basic_block bb = BASIC_BLOCK (bb_index);
   struct df_byte_lr_bb_info *bb_info = df_byte_lr_get_bb_info (bb_index);
   rtx insn;
-  struct df_ref **def_rec;
-  struct df_ref **use_rec;
+  df_ref *def_rec;
+  df_ref *use_rec;
 
   /* Process the registers set in an exception handler.  */
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if ((DF_REF_FLAGS (def) & DF_REF_AT_TOP) == 0)
 	{
 	  unsigned int dregno = DF_REF_REGNO (def);
@@ -2615,7 +2615,7 @@ df_byte_lr_bb_local_compute (unsigned int bb_index)
   /* Process the hardware registers that are always live.  */
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       /* Add use to set of uses in this BB.  */
       if ((DF_REF_FLAGS (use) & DF_REF_AT_TOP) == 0)
 	{
@@ -2635,7 +2635,7 @@ df_byte_lr_bb_local_compute (unsigned int bb_index)
 
       for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
 	{
-	  struct df_ref *def = *def_rec;
+	  df_ref def = *def_rec;
 	  /* If the def is to only part of the reg, it does
 	     not kill the other defs that reach here.  */
 	  if (!(DF_REF_FLAGS (def) & (DF_REF_CONDITIONAL)))
@@ -2660,7 +2660,7 @@ df_byte_lr_bb_local_compute (unsigned int bb_index)
 
       for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++)
 	{
-	  struct df_ref *use = *use_rec;
+	  df_ref use = *use_rec;
 	  unsigned int uregno = DF_REF_REGNO (use);
 	  unsigned int start = problem_data->regno_start[uregno];
 	  unsigned int len = problem_data->regno_len[uregno];
@@ -2682,7 +2682,7 @@ df_byte_lr_bb_local_compute (unsigned int bb_index)
      goto.  */
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if (DF_REF_FLAGS (def) & DF_REF_AT_TOP)
 	{
 	  unsigned int dregno = DF_REF_REGNO (def);
@@ -2697,7 +2697,7 @@ df_byte_lr_bb_local_compute (unsigned int bb_index)
   /* Process the uses that are live into an exception handler.  */
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       /* Add use to set of uses in this BB.  */
       if (DF_REF_FLAGS (use) & DF_REF_AT_TOP)
 	{
@@ -2911,12 +2911,12 @@ df_byte_lr_simulate_defs (rtx insn, bitmap live)
 {
   struct df_byte_lr_problem_data *problem_data 
     = (struct df_byte_lr_problem_data *)df_byte_lr->problem_data;
-  struct df_ref **def_rec;
+  df_ref *def_rec;
   unsigned int uid = INSN_UID (insn);
 
   for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
 
       /* If the def is to only part of the reg, it does
 	 not kill the other defs that reach here.  */
@@ -2947,12 +2947,12 @@ df_byte_lr_simulate_uses (rtx insn, bitmap live)
 {
   struct df_byte_lr_problem_data *problem_data 
     = (struct df_byte_lr_problem_data *)df_byte_lr->problem_data;
-  struct df_ref **use_rec;
+  df_ref *use_rec;
   unsigned int uid = INSN_UID (insn);
 
   for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       unsigned int uregno = DF_REF_REGNO (use);
       unsigned int start = problem_data->regno_start[uregno];
       unsigned int len = problem_data->regno_len[uregno];
@@ -2980,16 +2980,16 @@ df_byte_lr_simulate_artificial_refs_at_top (basic_block bb, bitmap live)
 {
   struct df_byte_lr_problem_data *problem_data 
     = (struct df_byte_lr_problem_data *)df_byte_lr->problem_data;
-  struct df_ref **def_rec;
+  df_ref *def_rec;
 #ifdef EH_USES
-  struct df_ref **use_rec;
+  df_ref *use_rec;
 #endif
   int bb_index = bb->index;
   
 #ifdef EH_USES
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       if (DF_REF_FLAGS (use) & DF_REF_AT_TOP)
 	{
 	  unsigned int uregno = DF_REF_REGNO (use);
@@ -3002,7 +3002,7 @@ df_byte_lr_simulate_artificial_refs_at_top (basic_block bb, bitmap live)
 
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if (DF_REF_FLAGS (def) & DF_REF_AT_TOP)
 	{      
 	  unsigned int dregno = DF_REF_REGNO (def);
@@ -3022,13 +3022,13 @@ df_byte_lr_simulate_artificial_refs_at_end (basic_block bb, bitmap live)
 {
   struct df_byte_lr_problem_data *problem_data 
     = (struct df_byte_lr_problem_data *)df_byte_lr->problem_data;
-  struct df_ref **def_rec;
-  struct df_ref **use_rec;
+  df_ref *def_rec;
+  df_ref *use_rec;
   int bb_index = bb->index;
   
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if ((DF_REF_FLAGS (def) & DF_REF_AT_TOP) == 0)
 	{
 	  unsigned int dregno = DF_REF_REGNO (def);
@@ -3040,7 +3040,7 @@ df_byte_lr_simulate_artificial_refs_at_end (basic_block bb, bitmap live)
 
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       if ((DF_REF_FLAGS (use) & DF_REF_AT_TOP) == 0)
 	{
 	  unsigned int uregno = DF_REF_REGNO (use);
@@ -3351,7 +3351,7 @@ df_set_dead_notes_for_mw (rtx insn, rtx old, struct df_mw_hardreg *mws,
    LIVE.  Do not generate notes for registers in ARTIFICIAL_USES.  */
 
 static rtx
-df_create_unused_note (rtx insn, rtx old, struct df_ref *def, 
+df_create_unused_note (rtx insn, rtx old, df_ref def, 
 		       bitmap live, bitmap artificial_uses)
 {
   unsigned int dregno = DF_REF_REGNO (def);
@@ -3391,8 +3391,8 @@ df_note_bb_compute (unsigned int bb_index,
 {
   basic_block bb = BASIC_BLOCK (bb_index);
   rtx insn;
-  struct df_ref **def_rec;
-  struct df_ref **use_rec;
+  df_ref *def_rec;
+  df_ref *use_rec;
 
   bitmap_copy (live, df_get_live_out (bb));
   bitmap_clear (artificial_uses);
@@ -3409,7 +3409,7 @@ df_note_bb_compute (unsigned int bb_index,
      to begin processing.  */
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
 #ifdef REG_DEAD_DEBUGGING
       if (dump_file)
 	fprintf (dump_file, "artificial def %d\n", DF_REF_REGNO (def));
@@ -3421,7 +3421,7 @@ df_note_bb_compute (unsigned int bb_index,
 
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       if ((DF_REF_FLAGS (use) & DF_REF_AT_TOP) == 0)
 	{
 	  unsigned int regno = DF_REF_REGNO (use);
@@ -3470,7 +3470,7 @@ df_note_bb_compute (unsigned int bb_index,
 	  while (*mws_rec)
 	    {
 	      struct df_mw_hardreg *mws = *mws_rec; 
-	      if ((mws->type == DF_REF_REG_DEF) 
+	      if ((DF_MWS_REG_DEF_P (mws)) 
 		  && !df_ignore_stack_reg (mws->start_regno))
 		old_unused_notes 
 		  = df_set_unused_notes_for_mw (insn, old_unused_notes, 
@@ -3483,7 +3483,7 @@ df_note_bb_compute (unsigned int bb_index,
 	     clobber.  This code is for the return.  */
 	  for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
 	    {
-	      struct df_ref *def = *def_rec;
+	      df_ref def = *def_rec;
 	      unsigned int dregno = DF_REF_REGNO (def);
 	      if (!DF_REF_FLAGS_IS_SET (def, DF_REF_MUST_CLOBBER | DF_REF_MAY_CLOBBER))
 		{
@@ -3504,7 +3504,7 @@ df_note_bb_compute (unsigned int bb_index,
 	  while (*mws_rec)
 	    {
 	      struct df_mw_hardreg *mws = *mws_rec; 
-	      if (mws->type == DF_REF_REG_DEF)
+	      if (DF_MWS_REG_DEF_P (mws))
 		old_unused_notes
 		  = df_set_unused_notes_for_mw (insn, old_unused_notes, 
 						mws, live, do_not_gen, 
@@ -3514,7 +3514,7 @@ df_note_bb_compute (unsigned int bb_index,
 
 	  for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
 	    {
-	      struct df_ref *def = *def_rec;
+	      df_ref def = *def_rec;
 	      unsigned int dregno = DF_REF_REGNO (def);
 	      old_unused_notes
 		= df_create_unused_note (insn, old_unused_notes, 
@@ -3533,7 +3533,7 @@ df_note_bb_compute (unsigned int bb_index,
       while (*mws_rec)
 	{
 	  struct df_mw_hardreg *mws = *mws_rec; 
-	  if ((mws->type != DF_REF_REG_DEF)  
+	  if ((DF_MWS_REG_DEF_P (mws))  
 	      && !df_ignore_stack_reg (mws->start_regno))
 	    old_dead_notes
 	      = df_set_dead_notes_for_mw (insn, old_dead_notes, 
@@ -3544,7 +3544,7 @@ df_note_bb_compute (unsigned int bb_index,
 
       for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++)
 	{
-	  struct df_ref *use = *use_rec;
+	  df_ref use = *use_rec;
 	  unsigned int uregno = DF_REF_REGNO (use);
 
 #ifdef REG_DEAD_DEBUGGING
@@ -3689,12 +3689,12 @@ df_note_add_problem (void)
 void
 df_simulate_find_defs (rtx insn, bitmap defs)
 {
-  struct df_ref **def_rec;
+  df_ref *def_rec;
   unsigned int uid = INSN_UID (insn);
 
   for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       /* If the def is to only part of the reg, it does
 	 not kill the other defs that reach here.  */
       if (!(DF_REF_FLAGS (def) & (DF_REF_PARTIAL | DF_REF_CONDITIONAL)))
@@ -3708,12 +3708,12 @@ df_simulate_find_defs (rtx insn, bitmap defs)
 void
 df_simulate_defs (rtx insn, bitmap live)
 {
-  struct df_ref **def_rec;
+  df_ref *def_rec;
   unsigned int uid = INSN_UID (insn);
 
   for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       unsigned int dregno = DF_REF_REGNO (def);
 
       /* If the def is to only part of the reg, it does
@@ -3729,12 +3729,12 @@ df_simulate_defs (rtx insn, bitmap live)
 void 
 df_simulate_uses (rtx insn, bitmap live)
 {
-  struct df_ref **use_rec;
+  df_ref *use_rec;
   unsigned int uid = INSN_UID (insn);
 
   for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       /* Add use to set of uses in this BB.  */
       bitmap_set_bit (live, DF_REF_REGNO (use));
     }
@@ -3778,20 +3778,20 @@ df_simulate_fixup_sets (basic_block bb, bitmap live)
 void 
 df_simulate_artificial_refs_at_end (basic_block bb, bitmap live)
 {
-  struct df_ref **def_rec;
-  struct df_ref **use_rec;
+  df_ref *def_rec;
+  df_ref *use_rec;
   int bb_index = bb->index;
   
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if ((DF_REF_FLAGS (def) & DF_REF_AT_TOP) == 0)
 	bitmap_clear_bit (live, DF_REF_REGNO (def));
     }
 
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       if ((DF_REF_FLAGS (use) & DF_REF_AT_TOP) == 0)
 	bitmap_set_bit (live, DF_REF_REGNO (use));
     }
@@ -3818,15 +3818,15 @@ df_simulate_one_insn (basic_block bb, rtx insn, bitmap live)
 void 
 df_simulate_artificial_refs_at_top (basic_block bb, bitmap live)
 {
-  struct df_ref **def_rec;
+  df_ref *def_rec;
 #ifdef EH_USES
-  struct df_ref **use_rec;
+  df_ref *use_rec;
 #endif
   int bb_index = bb->index;
   
   for (def_rec = df_get_artificial_defs (bb_index); *def_rec; def_rec++)
     {
-      struct df_ref *def = *def_rec;
+      df_ref def = *def_rec;
       if (DF_REF_FLAGS (def) & DF_REF_AT_TOP)
 	bitmap_clear_bit (live, DF_REF_REGNO (def));
     }
@@ -3834,7 +3834,7 @@ df_simulate_artificial_refs_at_top (basic_block bb, bitmap live)
 #ifdef EH_USES
   for (use_rec = df_get_artificial_uses (bb_index); *use_rec; use_rec++)
     {
-      struct df_ref *use = *use_rec;
+      df_ref use = *use_rec;
       if (DF_REF_FLAGS (use) & DF_REF_AT_TOP)
 	bitmap_set_bit (live, DF_REF_REGNO (use));
     }