From: Bob Wilson <bob.wilson@acm.org>
Date: Fri, 11 Mar 2005 00:14:15 +0000 (+0000)
Subject:         * config/tc-xtensa.c (finish_vinsn): Include the last instruction slot
X-Git-Tag: csl-arm-20050325-branchpoint~180
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fa77c953fa63fc96ebcc2b2560481c0bd0b4b56;p=external%2Fbinutils.git

    * config/tc-xtensa.c (finish_vinsn): Include the last instruction slot
        when checking if xg_resolve_literals needs to be called.
        * config/tc-xtensa.h: Fix spelling typo in a comment.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 57a9b94..5849d33 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-10  Bob Wilson  <bob.wilson@acm.org>
+
+	* config/tc-xtensa.c (finish_vinsn): Include the last instruction slot
+	when checking if xg_resolve_literals needs to be called.
+	* config/tc-xtensa.h: Fix spelling typo in a comment.
+
 2005-03-10  Jan Beulich  <jbeulich@novell.com>
 
 	* config/tc-tic54x.h (tic54x_macro_info): Change parameter type.
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 34fdc2c..9d20a6b 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -6145,7 +6145,7 @@ finish_vinsn (vliw_insn *vinsn)
 	      return;
 	    }
 
-	  for (j = 0; j < slotstack.ninsn - 1; j++)
+	  for (j = 0; j < slotstack.ninsn; j++)
 	    {
 	      TInsn *insn = &slotstack.insn[j];
 	      if (insn->insn_type == ITYPE_LITERAL)
@@ -6155,9 +6155,11 @@ finish_vinsn (vliw_insn *vinsn)
 		}
 	      else
 		{
+		  assert (insn->insn_type == ITYPE_INSN);
 		  if (lit_sym)
 		    xg_resolve_literals (insn, lit_sym);
-		  emit_single_op (insn);
+		  if (j != slotstack.ninsn - 1)
+		    emit_single_op (insn);
 		}
 	    }
 
diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
index 585f1ce..4743617 100644
--- a/gas/config/tc-xtensa.h
+++ b/gas/config/tc-xtensa.h
@@ -201,7 +201,7 @@ struct xtensa_frag_type
      first time through a relaxation....  */
   unsigned int relax_seen : 1;
 
-  /* Infomation that is needed in the object file and set when known.  */
+  /* Information that is needed in the object file and set when known.  */
   unsigned int is_literal : 1;
   unsigned int is_loop_target : 1;
   unsigned int is_branch_target : 1;