2006-10-25 Paul Brook <paul@codesourcery.com>

	gas/
	* config/tc-arm.c (do_vfp_sp_const, do_vfp_dp_const): Fix operans
	encoding.

	gas/testsuite/
	* gas/arm/vfpv3-const-conv.s: Improve test coverage.
	* gas/arm/vfpv3-const-conv.d: Adjust expected output.
	* gas/arm/vfp-neon-syntax_t2.d: Ditto.
	* gas/arm/vfp-neon-syntax.d: Ditto.

	opcodes/
	* arm-dis.c (coprocessor_opcodes): Fix bitfields for fconstd/fconstd.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index a5162f4d4785b33096cde100eb99fbb4681dd417..dc6168aa341e088e0cf509136446a01832ba97c9 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,18 @@
+2006-10-25  Paul Brook  <paul@codesourcery.com>
+
+       gas/
+       * config/tc-arm.c (do_vfp_sp_const, do_vfp_dp_const): Fix operans
+       encoding.
+
+       gas/testsuite/
+       * gas/arm/vfpv3-const-conv.s: Improve test coverage.
+       * gas/arm/vfpv3-const-conv.d: Adjust expected output.
+       * gas/arm/vfp-neon-syntax_t2.d: Ditto.
+       * gas/arm/vfp-neon-syntax.d: Ditto.
+
+       opcodes/
+       * arm-dis.c (coprocessor_opcodes): Fix bitfields for fconstd/fconstd.
+
 2006-10-24  Mark Shinwell  <shinwell@codesourcery.com>
 
        gas/

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 263b500c6d766e7f1a205cddc49cd65eace67f4d..13b29844e35161d065f33f1a075b4c7a9405b3f8 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -7716,16 +7716,16 @@ static void
 do_vfp_sp_const (void)
 {
   encode_arm_vfp_reg (inst.operands[0].reg, VFP_REG_Sd);
-  inst.instruction |= (inst.operands[1].imm & 15) << 16;
-  inst.instruction |= (inst.operands[1].imm >> 4);
+  inst.instruction |= (inst.operands[1].imm & 0xf0) << 12;
+  inst.instruction |= (inst.operands[1].imm & 0x0f);
 }
 
 static void
 do_vfp_dp_const (void)
 {
   encode_arm_vfp_reg (inst.operands[0].reg, VFP_REG_Dd);
-  inst.instruction |= (inst.operands[1].imm & 15) << 16;
-  inst.instruction |= (inst.operands[1].imm >> 4);
+  inst.instruction |= (inst.operands[1].imm & 0xf0) << 12;
+  inst.instruction |= (inst.operands[1].imm & 0x0f);
 }
 
 static void

diff --git a/gas/testsuite/gas/arm/vfp-neon-syntax.d b/gas/testsuite/gas/arm/vfp-neon-syntax.d
index 22620adde62291ebedf1ae100a5299b502cd863a..8d9743527bca005eda648258dcaaa40f6abcd8e0 100644 (file)
--- a/gas/testsuite/gas/arm/vfp-neon-syntax.d
+++ b/gas/testsuite/gas/arm/vfp-neon-syntax.d
@@ -7,16 +7,16 @@
 Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> eeb00a60    fcpys   s0, s1
 0[0-9a-f]+ <[^>]+> eeb00b41    fcpyd   d0, d1
-0[0-9a-f]+ <[^>]+> eeb00a05    fconsts s0, #80
-0[0-9a-f]+ <[^>]+> eeb00b07    fconstd d0, #112
+0[0-9a-f]+ <[^>]+> eeb50a00    fconsts s0, #80
+0[0-9a-f]+ <[^>]+> eeb70b00    fconstd d0, #112
 0[0-9a-f]+ <[^>]+> ee100a90    fmrs    r0, s1
 0[0-9a-f]+ <[^>]+> ee001a10    fmsr    s0, r1
 0[0-9a-f]+ <[^>]+> ec510a11    fmrrs   r0, r1, {s2, s3}
 0[0-9a-f]+ <[^>]+> ec442a10    fmsrr   {s0, s1}, r2, r4
 0[0-9a-f]+ <[^>]+> 0eb00a60    fcpyseq s0, s1
 0[0-9a-f]+ <[^>]+> 0eb00b41    fcpydeq d0, d1
-0[0-9a-f]+ <[^>]+> 0eb00a05    fconstseq       s0, #80
-0[0-9a-f]+ <[^>]+> 0eb00b07    fconstdeq       d0, #112
+0[0-9a-f]+ <[^>]+> 0eb50a00    fconstseq       s0, #80
+0[0-9a-f]+ <[^>]+> 0eb70b00    fconstdeq       d0, #112
 0[0-9a-f]+ <[^>]+> 0e100a90    fmrseq  r0, s1
 0[0-9a-f]+ <[^>]+> 0e001a10    fmsreq  s0, r1
 0[0-9a-f]+ <[^>]+> 0c510a11    fmrrseq r0, r1, {s2, s3}

diff --git a/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
index 49c2d2f7a579abfa35170511272d6f1c08253030..5c022352858390680daf3703a65906a711852a13 100644 (file)
--- a/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
+++ b/gas/testsuite/gas/arm/vfp-neon-syntax_t2.d
@@ -7,8 +7,8 @@
 Disassembly of section \.text:
 0[0-9a-f]+ <[^>]+> eeb0 0a60   fcpys   s0, s1
 0[0-9a-f]+ <[^>]+> eeb0 0b41   fcpyd   d0, d1
-0[0-9a-f]+ <[^>]+> eeb0 0a05   fconsts s0, #80
-0[0-9a-f]+ <[^>]+> eeb0 0b07   fconstd d0, #112
+0[0-9a-f]+ <[^>]+> eeb5 0a00   fconsts s0, #80
+0[0-9a-f]+ <[^>]+> eeb7 0b00   fconstd d0, #112
 0[0-9a-f]+ <[^>]+> ee10 0a90   fmrs    r0, s1
 0[0-9a-f]+ <[^>]+> ee00 1a10   fmsr    s0, r1
 0[0-9a-f]+ <[^>]+> ec51 0a11   fmrrs   r0, r1, {s2, s3}
@@ -16,8 +16,8 @@ Disassembly of section \.text:
 0[0-9a-f]+ <[^>]+> bf01        itttt   eq
 0[0-9a-f]+ <[^>]+> eeb0 0a60   fcpyseq s0, s1
 0[0-9a-f]+ <[^>]+> eeb0 0b41   fcpydeq d0, d1
-0[0-9a-f]+ <[^>]+> eeb0 0a05   fconstseq       s0, #80
-0[0-9a-f]+ <[^>]+> eeb0 0b07   fconstdeq       d0, #112
+0[0-9a-f]+ <[^>]+> eeb5 0a00   fconstseq       s0, #80
+0[0-9a-f]+ <[^>]+> eeb7 0b00   fconstdeq       d0, #112
 0[0-9a-f]+ <[^>]+> bf01        itttt   eq
 0[0-9a-f]+ <[^>]+> ee10 0a90   fmrseq  r0, s1
 0[0-9a-f]+ <[^>]+> ee00 1a10   fmsreq  s0, r1

diff --git a/gas/testsuite/gas/arm/vfpv3-const-conv.d b/gas/testsuite/gas/arm/vfpv3-const-conv.d
index ddabd1c91440f68db7d85b9abd0f10b8563aa76a..9515feff7133c555bb0aa3338b29692da58c4c58 100644 (file)
--- a/gas/testsuite/gas/arm/vfpv3-const-conv.d
+++ b/gas/testsuite/gas/arm/vfpv3-const-conv.d
@@ -5,12 +5,12 @@
 .*: +file format .*arm.*
 
 Disassembly of section \.text:
-0[0-9a-f]+ <[^>]+> eef48a00    fconsts s17, #4
-0[0-9a-f]+ <[^>]+> eeb59a00    fconsts s18, #5
-0[0-9a-f]+ <[^>]+> eef69a00    fconsts s19, #6
-0[0-9a-f]+ <[^>]+> eef41b00    fconstd d17, #4
-0[0-9a-f]+ <[^>]+> eef52b00    fconstd d18, #5
-0[0-9a-f]+ <[^>]+> eef63b00    fconstd d19, #6
+0[0-9a-f]+ <[^>]+> eef08a04    fconsts s17, #4
+0[0-9a-f]+ <[^>]+> eeba9a05    fconsts s18, #165
+0[0-9a-f]+ <[^>]+> eef49a00    fconsts s19, #64
+0[0-9a-f]+ <[^>]+> eef01b04    fconstd d17, #4
+0[0-9a-f]+ <[^>]+> eefa2b05    fconstd d18, #165
+0[0-9a-f]+ <[^>]+> eef43b00    fconstd d19, #64
 0[0-9a-f]+ <[^>]+> eefa8a63    fshtos  s17, #9
 0[0-9a-f]+ <[^>]+> eefa1b63    fshtod  d17, #9
 0[0-9a-f]+ <[^>]+> eefa8aeb    fsltos  s17, #9

diff --git a/gas/testsuite/gas/arm/vfpv3-const-conv.s b/gas/testsuite/gas/arm/vfpv3-const-conv.s
index c40301c851969960cd8198d1daada3156dcc62ec..d726d14b568e981675fbb049feb68554c2fbf508 100644 (file)
--- a/gas/testsuite/gas/arm/vfpv3-const-conv.s
+++ b/gas/testsuite/gas/arm/vfpv3-const-conv.s
@@ -1,11 +1,11 @@
 .arm
 .syntax unified
        fconsts s17, #4
-       fconsts s18, #5
-       fconsts s19, #6
+       fconsts s18, #0xa5
+       fconsts s19, #0x40
        fconstd d17, #4
-       fconstd d18, #5
-       fconstd d19, #6
+       fconstd d18, #0xa5
+       fconstd d19, #0x40
        fshtos s17, 9
        fshtod d17, 9
        fsltos s17, 9

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 365a155bed8d082c8628f7a3da3b4cb1aed89054..b4085c64ba8e995ddabb276f0c0cf71bc4f06ad1 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -308,8 +308,8 @@ static const struct opcode32 coprocessor_opcodes[] =
   {FPU_VFP_EXT_V3, 0x0ebe0a40, 0x0fbe0f50, "fto%16?us%7?lhs%c\t%y1, #%5,0-3k"},
   {FPU_VFP_EXT_V3, 0x0ebe0b40, 0x0fbe0f50, "fto%16?us%7?lhd%c\t%z1, #%5,0-3k"},
   {FPU_VFP_EXT_V1, 0x0c500b10, 0x0fb00ff0, "fmrrd%c\t%12-15r, %16-19r, %z0"},
-  {FPU_VFP_EXT_V3, 0x0eb00a00, 0x0fb00ff0, "fconsts%c\t%y1, #%16-19,0-3d"},
-  {FPU_VFP_EXT_V3, 0x0eb00b00, 0x0fb00ff0, "fconstd%c\t%z1, #%16-19,0-3d"},
+  {FPU_VFP_EXT_V3, 0x0eb00a00, 0x0fb00ff0, "fconsts%c\t%y1, #%0-3,16-19d"},
+  {FPU_VFP_EXT_V3, 0x0eb00b00, 0x0fb00ff0, "fconstd%c\t%z1, #%0-3,16-19d"},
   {FPU_VFP_EXT_V2, 0x0c400a10, 0x0ff00fd0, "fmsrr%c\t%y4, %12-15r, %16-19r"},
   {FPU_VFP_EXT_V2, 0x0c400b10, 0x0ff00fd0, "fmdrr%c\t%z0, %12-15r, %16-19r"},
   {FPU_VFP_EXT_V2, 0x0c500a10, 0x0ff00fd0, "fmrrs%c\t%12-15r, %16-19r, %y4"},