From: hjl <hjl>
Date: Wed, 13 Jan 2010 04:03:19 +0000 (+0000)
Subject: Remove rex_original
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95054b05579411be46a0960581ca435b7865cd52;p=pf3gnuchains%2Fpf3gnuchains4x.git

Remove rex_original

2010-01-12  H.J. Lu  <hongjiu.lu@intel.com>

	* i386-dis.c (rex_original): Removed.
	(ckprefix): Remove rex_original.
	(print_insn): Update comments.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index bd3de14185..9c9334be27 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (rex_original): Removed.
+	(ckprefix): Remove rex_original.
+	(print_insn): Update comments.
+
 2010-01-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* Makefile.in: Regenerate.
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 05504de57e..fc7859adae 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -144,10 +144,7 @@ static int prefixes;
 static int rex;
 /* Bits of REX we've already used.  */
 static int rex_used;
-/* Original REX prefix.  */
-static int rex_original;
-/* REX bits in original REX prefix ignored.  It may not be the same
-   as rex_original since some bits may not be ignored.  */
+/* REX bits in original REX prefix ignored.  */
 static int rex_ignored;
 /* Mark parts used in the REX prefix.  When we are testing for
    empty prefix (for 8bit register REX extension), just mask it
@@ -11423,7 +11420,6 @@ ckprefix (void)
 {
   int newrex, i, length;
   rex = 0;
-  rex_original = 0;
   rex_ignored = 0;
   prefixes = 0;
   used_prefixes = 0;
@@ -11537,7 +11533,6 @@ ckprefix (void)
       if (*codep != FWAIT_OPCODE)
 	all_prefixes[i++] = *codep;
       rex = newrex;
-      rex_original = rex;
       codep++;
       length++;
     }
@@ -12340,7 +12335,7 @@ print_insn (bfd_vma pc, disassemble_info *info)
 	  }
     }
 
-  /* Check if the REX prefix used.  */
+  /* Check if the REX prefix is used.  */
   if (rex_ignored == 0 && (rex ^ rex_used) == 0)
     all_prefixes[last_rex_prefix] = 0;