diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 760fd9d1065..6a370d0b8f6 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-dis.c (USE_REG_TABLE): Defined as the previous one + 1.
+	(USE_REG_TABLE): Likewise.
+	(USE_MOD_TABLE): Likewise.
+	(USE_RM_TABLE): Likewise.
+	(USE_PREFIX_TABLE): Likewise.
+	(USE_X86_64_TABLE): Likewise.
+	(USE_3BYTE_TABLE): Likewise.
+
 2007-10-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-dis.c (MOD_0F2B_PREFIX_0...MOD_0F2B_PREFIX_3): New.
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 921883b307e..c169343c4a0 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -455,13 +455,13 @@ fetch_data (struct disassemble_info *info, bfd_byte *addr)
 #error MAX_BYTEMODE must be less than DREX_OC1
 #endif
 
-#define FLOATCODE 1
-#define USE_REG_TABLE 2
-#define USE_MOD_TABLE 3
-#define USE_RM_TABLE 4
-#define USE_PREFIX_TABLE 5
-#define USE_X86_64_TABLE 6
-#define USE_3BYTE_TABLE 7
+#define FLOATCODE		1
+#define USE_REG_TABLE		(FLOATCODE + 1)
+#define USE_MOD_TABLE		(USE_REG_TABLE + 1)
+#define USE_RM_TABLE		(USE_MOD_TABLE + 1)
+#define USE_PREFIX_TABLE	(USE_RM_TABLE + 1)
+#define USE_X86_64_TABLE	(USE_PREFIX_TABLE + 1)
+#define USE_3BYTE_TABLE		(USE_X86_64_TABLE + 1)
 
 #define FLOAT			NULL, { { NULL, FLOATCODE } }