[committed] i386: Clear vex instead of vex.evex

Message ID CAMe9rOq5y0KMtQuNDNfs4Uu95xk7tvXQOjRK+KCHvW0KC63=wg@mail.gmail.com
State New
Headers show
Series
  • [committed] i386: Clear vex instead of vex.evex
Related show

Commit Message

H.J. Lu April 4, 2018, 1:28 p.m.
I'd like to backport it to GDB 8.1 branch.  Is it OK  for gdb-8.1-branch?

H.J.
---------- Forwarded message ----------
From: H.J. Lu <hongjiu.lu@intel.com>

Date: Wed, Apr 4, 2018 at 4:42 AM
Subject: [PATCH, committed] i386: Clear vex instead of vex.evex
To: binutils@sourceware.org


"vex" has many fields to control how to decode an instruction.  Clear
all fields in "vex" before decoding an instruction to avoid using values
left from the previous instruction.

Checked into master and will backport it to 2.30 branch.

H.J.
----
gas/

        PR binutils/23025
        * testsuite/gas/i386/prefix.s: Add tests for vcvtpd2dq with
        VEX and EVEX prefixes.
        * testsuite/gas/i386/prefix.d: Updated.

opcodes/

        PR binutils/23025
        * i386-dis.c (get_valid_dis386): Don't set vex.prefix nor vex.w
        to 0.
        (print_insn): Clear vex instead of vex.evex.
---
 gas/ChangeLog                   | 7 +++++++
 gas/testsuite/gas/i386/prefix.d | 3 +++
 gas/testsuite/gas/i386/prefix.s | 4 ++++
 opcodes/ChangeLog               | 7 +++++++
 opcodes/i386-dis.c              | 7 +------
 5 files changed, 22 insertions(+), 6 deletions(-)

          vex.prefix = DATA_PREFIX_OPCODE;
@@ -12891,7 +12890,6 @@ get_valid_dis386 (const struct dis386 *dp,
disassemble_info *info)
       switch ((*codep & 0x3))
        {
        case 0:
-         vex.prefix = 0;
          break;
        case 1:
          vex.prefix = DATA_PREFIX_OPCODE;
@@ -12929,12 +12927,10 @@ get_valid_dis386 (const struct dis386 *dp,
disassemble_info *info)
       /* For the 2-byte VEX prefix in 32-bit mode, the highest bit in
         VEX.vvvv is 1.  */
       vex.register_specifier = (~(*codep >> 3)) & 0xf;
-      vex.w = 0;
       vex.length = (*codep & 0x4) ? 256 : 128;
       switch ((*codep & 0x3))
        {
        case 0:
-         vex.prefix = 0;
          break;
        case 1:
          vex.prefix = DATA_PREFIX_OPCODE;
@@ -13009,7 +13005,6 @@ get_valid_dis386 (const struct dis386 *dp,
disassemble_info *info)
       switch ((*codep & 0x3))
        {
        case 0:
-         vex.prefix = 0;
          break;
        case 1:
          vex.prefix = DATA_PREFIX_OPCODE;
@@ -13367,7 +13362,7 @@ print_insn (bfd_vma pc, disassemble_info *info)
   need_vex = 0;
   need_vex_reg = 0;
   vex_w_done = 0;
-  vex.evex = 0;
+  memset (&vex, 0, sizeof (vex));

   if (dp->name == NULL && dp->op[0].bytemode == FLOATCODE)
     {
--
2.14.3



-- 
H.J.

Comments

Joel Brobecker April 4, 2018, 2:43 p.m. | #1
> I'd like to backport it to GDB 8.1 branch.  Is it OK  for gdb-8.1-branch?


Looks good to me, but in that case, create a GDB PR that points
to the binutils one, and set the Target Milestone to 8.1. This is
to make sure all changes made on the 8.1 branch since the 8.1
release are easily trackable by everyone.

-- 
Joel
H.J. Lu April 4, 2018, 3:05 p.m. | #2
On Wed, Apr 4, 2018 at 7:43 AM, Joel Brobecker <brobecker@adacore.com> wrote:
>> I'd like to backport it to GDB 8.1 branch.  Is it OK  for gdb-8.1-branch?

>

> Looks good to me, but in that case, create a GDB PR that points

> to the binutils one, and set the Target Milestone to 8.1. This is

> to make sure all changes made on the 8.1 branch since the 8.1

> release are easily trackable by everyone.

>


Done:

https://sourceware.org/bugzilla/show_bug.cgi?id=23028

-- 
H.J.
Joel Brobecker April 4, 2018, 3:33 p.m. | #3
> > Looks good to me, but in that case, create a GDB PR that points

> > to the binutils one, and set the Target Milestone to 8.1. This is

> > to make sure all changes made on the 8.1 branch since the 8.1

> > release are easily trackable by everyone.

> 

> Done:

> https://sourceware.org/bugzilla/show_bug.cgi?id=23028


Perfect, thank you.

-- 
Joel
H.J. Lu April 4, 2018, 3:36 p.m. | #4
On Wed, Apr 4, 2018 at 8:33 AM, Joel Brobecker <brobecker@adacore.com> wrote:
>> > Looks good to me, but in that case, create a GDB PR that points

>> > to the binutils one, and set the Target Milestone to 8.1. This is

>> > to make sure all changes made on the 8.1 branch since the 8.1

>> > release are easily trackable by everyone.

>>

>> Done:

>> https://sourceware.org/bugzilla/show_bug.cgi?id=23028

>

> Perfect, thank you.



This is the patch I am checking in.

Thanks.

-- 
H.J.
From f13be04ec6cc83947d8c4997aa48296a915b637f Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 4 Apr 2018 04:36:44 -0700
Subject: [PATCH] i386: Clear vex instead of vex.evex

"vex" has many fields to control how to decode an instruction.  Clear
all fields in "vex" before decoding an instruction to avoid using values
left from the previous instruction.

gas/

	PR gdb/23028
	PR binutils/23025
	* testsuite/gas/i386/prefix.s: Add tests for vcvtpd2dq with
	VEX and EVEX prefixes.
	* testsuite/gas/i386/prefix.d: Updated.

opcodes/

	PR gdb/23028
	PR binutils/23025
	* i386-dis.c (get_valid_dis386): Don't set vex.prefix nor vex.w
	to 0.
	(print_insn): Clear vex instead of vex.evex.

(cherry picked from commit caf0678c84b5b55fbc4bcc853954745a4ad8b658)
---
 gas/ChangeLog                   | 11 +++++++++++
 gas/testsuite/gas/i386/prefix.d |  3 +++
 gas/testsuite/gas/i386/prefix.s |  4 ++++
 opcodes/ChangeLog               | 11 +++++++++++
 opcodes/i386-dis.c              |  7 +------
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 85ced2f05b..b6afd1e133 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+2018-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Backport from master branch
+	2018-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gdb/23028
+	PR binutils/23025
+	* testsuite/gas/i386/prefix.s: Add tests for vcvtpd2dq with
+	VEX and EVEX prefixes.
+	* testsuite/gas/i386/prefix.d: Updated.
+
 2018-01-04  Jim Wilson  <jimw@sifive.com>
 
 	* testsuite/gas/riscv/priv-reg.s: Add missing stval and mtval.
diff --git a/gas/testsuite/gas/i386/prefix.d b/gas/testsuite/gas/i386/prefix.d
index 8dd200be08..e9ad5eb56c 100644
--- a/gas/testsuite/gas/i386/prefix.d
+++ b/gas/testsuite/gas/i386/prefix.d
@@ -72,5 +72,8 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	90                   	nop
 [ 	]*[a-f0-9]+:	f2 0f c7             	\(bad\)  
 [ 	]*[a-f0-9]+:	f0 90                	lock nop
+[ 	]*[a-f0-9]+:	c5 fb e6 40 20       	vcvtpd2dqx 0x20\(%eax\),%xmm0
+[ 	]*[a-f0-9]+:	62 f1 ff 18 e6 40 04 	vcvtpd2dq 0x20\(%eax\)\{1to2\},%xmm0
+[ 	]*[a-f0-9]+:	c5 fb e6 40 20       	vcvtpd2dqx 0x20\(%eax\),%xmm0
 	...
 #pass
diff --git a/gas/testsuite/gas/i386/prefix.s b/gas/testsuite/gas/i386/prefix.s
index 12d8bbc007..a4c60a7144 100644
--- a/gas/testsuite/gas/i386/prefix.s
+++ b/gas/testsuite/gas/i386/prefix.s
@@ -391,5 +391,9 @@
 
 	nop
 
+	vcvtpd2dqx 0x20(%eax),%xmm0
+	vcvtpd2dq 0x20(%eax){1to2},%xmm0
+	vcvtpd2dqx 0x20(%eax),%xmm0
+
 # Get a good alignment.
  .p2align	4,0
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 076cd149fb..bb26b93813 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,14 @@
+2018-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Backport from master branch
+	2018-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gdb/23028
+	PR binutils/23025
+	* i386-dis.c (get_valid_dis386): Don't set vex.prefix nor vex.w
+	to 0.
+	(print_insn): Clear vex instead of vex.evex.
+
 2018-01-03  Alan Modra  <amodra@gmail.com>
 
 	Update year range in copyright notice of all files.
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 86a2cdd022..a9874dec96 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -12815,7 +12815,6 @@ get_valid_dis386 (const struct dis386 *dp, disassemble_info *info)
       switch ((*codep & 0x3))
 	{
 	case 0:
-	  vex.prefix = 0;
 	  break;
 	case 1:
 	  vex.prefix = DATA_PREFIX_OPCODE;
@@ -12880,7 +12879,6 @@ get_valid_dis386 (const struct dis386 *dp, disassemble_info *info)
       switch ((*codep & 0x3))
 	{
 	case 0:
-	  vex.prefix = 0;
 	  break;
 	case 1:
 	  vex.prefix = DATA_PREFIX_OPCODE;
@@ -12918,12 +12916,10 @@ get_valid_dis386 (const struct dis386 *dp, disassemble_info *info)
       /* For the 2-byte VEX prefix in 32-bit mode, the highest bit in
 	 VEX.vvvv is 1.  */
       vex.register_specifier = (~(*codep >> 3)) & 0xf;
-      vex.w = 0;
       vex.length = (*codep & 0x4) ? 256 : 128;
       switch ((*codep & 0x3))
 	{
 	case 0:
-	  vex.prefix = 0;
 	  break;
 	case 1:
 	  vex.prefix = DATA_PREFIX_OPCODE;
@@ -12998,7 +12994,6 @@ get_valid_dis386 (const struct dis386 *dp, disassemble_info *info)
       switch ((*codep & 0x3))
 	{
 	case 0:
-	  vex.prefix = 0;
 	  break;
 	case 1:
 	  vex.prefix = DATA_PREFIX_OPCODE;
@@ -13356,7 +13351,7 @@ print_insn (bfd_vma pc, disassemble_info *info)
   need_vex = 0;
   need_vex_reg = 0;
   vex_w_done = 0;
-  vex.evex = 0;
+  memset (&vex, 0, sizeof (vex));
 
   if (dp->name == NULL && dp->op[0].bytemode == FLOATCODE)
     {

Patch

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d0f047e335..17d1b17c6e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@ 
+2018-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/23025
+       * testsuite/gas/i386/prefix.s: Add tests for vcvtpd2dq with
+       VEX and EVEX prefixes.
+       * testsuite/gas/i386/prefix.d: Updated.
+
 2018-03-30  Peter Bergner <bergner@vnet.ibm.com>

        PR binutils/23013
diff --git a/gas/testsuite/gas/i386/prefix.d b/gas/testsuite/gas/i386/prefix.d
index 8dd200be08..e9ad5eb56c 100644
--- a/gas/testsuite/gas/i386/prefix.d
+++ b/gas/testsuite/gas/i386/prefix.d
@@ -72,5 +72,8 @@  Disassembly of section .text:
 [      ]*[a-f0-9]+:    90                      nop
 [      ]*[a-f0-9]+:    f2 0f c7                \(bad\)
 [      ]*[a-f0-9]+:    f0 90                   lock nop
+[      ]*[a-f0-9]+:    c5 fb e6 40 20          vcvtpd2dqx 0x20\(%eax\),%xmm0
+[      ]*[a-f0-9]+:    62 f1 ff 18 e6 40 04    vcvtpd2dq
0x20\(%eax\)\{1to2\},%xmm0
+[      ]*[a-f0-9]+:    c5 fb e6 40 20          vcvtpd2dqx 0x20\(%eax\),%xmm0
        ...
 #pass
diff --git a/gas/testsuite/gas/i386/prefix.s b/gas/testsuite/gas/i386/prefix.s
index 12d8bbc007..a4c60a7144 100644
--- a/gas/testsuite/gas/i386/prefix.s
+++ b/gas/testsuite/gas/i386/prefix.s
@@ -391,5 +391,9 @@ 

        nop

+       vcvtpd2dqx 0x20(%eax),%xmm0
+       vcvtpd2dq 0x20(%eax){1to2},%xmm0
+       vcvtpd2dqx 0x20(%eax),%xmm0
+
 # Get a good alignment.
  .p2align      4,0
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 28ffed3438..3add69b8d1 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@ 
+2018-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/23025
+       * i386-dis.c (get_valid_dis386): Don't set vex.prefix nor vex.w
+       to 0.
+       (print_insn): Clear vex instead of vex.evex.
+
 2018-04-04  Nick Clifton  <nickc@redhat.com>

        * po/es.po: Updated Spanish translation.
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index e5791c9a5f..3e45d0e1f3 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -12826,7 +12826,6 @@  get_valid_dis386 (const struct dis386 *dp,
disassemble_info *info)
       switch ((*codep & 0x3))
        {
        case 0:
-         vex.prefix = 0;
          break;
        case 1: