diff --git a/include/ChangeLog b/include/ChangeLog
index 2fc2fc63d..8103bd5f7 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * opcode/cgen.h (CGEN_INSN): Add regex support.
+        (build_insn_regex): Declare.
+
 2001-07-10  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* xregex.h: New file to support libiberty regex.
diff --git a/include/opcode/cgen.h b/include/opcode/cgen.h
index c01b5c2a2..bcde4729a 100644
--- a/include/opcode/cgen.h
+++ b/include/opcode/cgen.h
@@ -1009,6 +1009,11 @@ struct cgen_insn
   const CGEN_IBASE *base;
   const CGEN_OPCODE *opcode;
   const CGEN_OPINST *opinst;
+
+  /* Regex to disambiguate overloaded opcodes */
+  void *rx;
+#define CGEN_INSN_RX(insn) ((insn)->rx)
+#define CGEN_MAX_RX_ELEMENTS (CGEN_MAX_SYNTAX_ELEMENTS * 5)
 };
 
 /* Instruction lists.
@@ -1364,6 +1369,11 @@ extern void CGEN_SYM (cpu_close) PARAMS ((CGEN_CPU_DESC));
 
 extern void CGEN_SYM (init_opcode_table) PARAMS ((CGEN_CPU_DESC cd_));
 
+/* build the insn selection regex.
+   called by init_opcode_table */
+
+extern char * CGEN_SYM(build_insn_regex) PARAMS ((CGEN_INSN *insn_));
+
 /* Initialize the ibld table for use.
    Called by init_asm/init_dis.  */