gas/

* config/tc-tic6x.c (tic6x_try_encode): Correct encoding of fstg field
	in SPKERNEL instructions.

opcodes/
	* tic6x-dis.c (print_insn_tic6x): Correct decoding of fstg field
	in SPKERNEL instructions.

gas/testsuite/
	* gas/tic6x/insns-c674x-sploop.d: Add two more sploop/spkernel tests.
	* gas/tic6x/insns-c674x-sploop.s: Likewise.

gas/ChangeLog

@@ -1,3 +1,8 @@
+2010-10-07  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* config/tc-tic6x.c (tic6x_try_encode): Correct encoding of fstg field
+	in SPKERNEL instructions.
+
 2010-10-06  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* config/tc-arm.c (encode_branch): Remove superfluous braces.

gas/config/tc-tic6x.c

@@ -2503,6 +2503,7 @@ tic6x_try_encode (tic6x_opcode_id id, tic6x_operand *operands,
 
 	  if (opct->variable_fields[fld].coding_method == tic6x_coding_fstg)
 	    {
+	      int i, t;
 	      if (operands[opno].value.exp.X_add_number < 0
 		  || (operands[opno].value.exp.X_add_number
 		      >= (1 << (fldd->width - fcyc_bits))))
@@ -2513,7 +2514,13 @@ tic6x_try_encode (tic6x_opcode_id id, tic6x_operand *operands,
 		  *ok = FALSE;
 		  return 0;
 		}
-	      value = operands[opno].value.exp.X_add_number << fcyc_bits;
+	      value = operands[opno].value.exp.X_add_number;
+	      for (t = 0, i = fcyc_bits; i < fldd->width; i++)
+		{
+		  t = (t << 1) | (value & 1);
+		  value >>= 1;
+		}
+	      value = t << fcyc_bits;
 	    }
 	  else
 	    {

gas/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2010-10-07  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* gas/tic6x/insns-c674x-sploop.d: Add two more sploop/spkernel tests.
+	* gas/tic6x/insns-c674x-sploop.s: Likewise.
+
 2010-10-04  David Daney  <ddaney@caviumnetworks.com>
 
 	* gas/mips/mips.exp (octeon-pref): Run the new test.

gas/testsuite/gas/tic6x/insns-c674x-sploop.d

@@ -77,4 +77,10 @@ Disassembly of section \.text:
 [0-9a-f]+[048c] <[^>]*> 06838000[ \t]+sploop 14
 [0-9a-f]+[048c] <[^>]*> 00000000[ \t]+nop 1
 [0-9a-f]+[048c] <[^>]*> 0f434000[ \t]+spkernel 3,13
+[0-9a-f]+[048c] <[^>]*> 00038000[ \t]+sploop 1
+[0-9a-f]+[048c] <[^>]*> 00000000[ \t]+nop 1
+[0-9a-f]+[048c] <[^>]*> 01034000[ \t]+spkernel 8,0
+[0-9a-f]+[048c] <[^>]*> 00838000[ \t]+sploop 2
 [0-9a-f]+[048c] <[^>]*> 00000000[ \t]+nop 1
+[0-9a-f]+[048c] <[^>]*> 06034000[ \t]+spkernel 6,0
+[ \t]*\.\.\.

gas/testsuite/gas/tic6x/insns-c674x-sploop.s

@@ -77,3 +77,9 @@ f:
 	sploop 14
 	nop
 	spkernel 3,13
+	sploop 1
+	nop
+	spkernel 8,0
+	sploop 2
+	nop
+	spkernel 6,0

opcodes/ChangeLog

@@ -1,3 +1,8 @@
+2010-10-07  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* tic6x-dis.c (print_insn_tic6x): Correct decoding of fstg field
+	in SPKERNEL instructions.
+
 2010-10-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/12076

opcodes/tic6x-dis.c

@@ -882,9 +882,11 @@ print_insn_tic6x (bfd_vma addr, struct disassemble_info *info)
 		    abort ();
 		  if (enc->coding_method == tic6x_coding_fstg)
 		    {
+		      int i, t;
+		      for (t = 0, i = fcyc_bits; i < 6; i++)
+			t = (t << 1) | ((fld_val >> i) & 1);
 		      operands_text[op_num] = TRUE;
-		      snprintf (operands[op_num], 24, "%u",
-				fld_val >> fcyc_bits);
+		      snprintf (operands[op_num], 24, "%u", t);
 		    }
 		  else
 		    {