Add generic perfect string hashes, use for directives

Add a generic facility for generating perfect string hashes, where all
that is needed is an enum and a string table.  The existing mechanism
using a custom Perl script wrapped around a module continues to be
available for any use case where this particular approach isn't
sophisticated enough.

Much of this patch comes from renaming "enum directives" to "enum
directive" as a result of the string hash generator expecting a set of
uniform naming conventions.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 120 insertions, 107 deletions

diff --git a/Makefile.in b/Makefile.in
index 11bdb30c..2e833f55 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,6 +99,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
 	nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \
 	nasmlib/raa.$(O) nasmlib/saa.$(O) \
 	nasmlib/strlist.$(O) \
+	nasmlib/perfhash.$(O) nasmlib/badenum.$(O) \
 	common/common.$(O) \
 	x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) \
 	x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \
@@ -244,11 +245,11 @@ asm/pptok.ph: asm/pptok.dat asm/pptok.pl perllib/phash.ph
 		$(srcdir)/asm/pptok.dat asm/pptok.ph
 
 # Directives hash
-asm/directiv.h: asm/directiv.dat asm/directiv.pl perllib/phash.ph
-	$(RUNPERL) $(srcdir)/asm/directiv.pl h \
+asm/directiv.h: asm/directiv.dat nasmlib/perfhash.pl perllib/phash.ph
+	$(RUNPERL) $(srcdir)/nasmlib/perfhash.pl h \
 		$(srcdir)/asm/directiv.dat asm/directiv.h
-asm/directbl.c: asm/directiv.dat asm/directiv.pl perllib/phash.ph
-	$(RUNPERL) $(srcdir)/asm/directiv.pl c \
+asm/directbl.c: asm/directiv.dat nasmlib/perfhash.pl perllib/phash.ph
+	$(RUNPERL) $(srcdir)/nasmlib/perfhash.pl c \
 		$(srcdir)/asm/directiv.dat asm/directbl.c
 
 # This target generates all files that require perl.
@@ -387,19 +388,18 @@ asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
  include/disp8.h include/error.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
-asm/directbl.$(O): asm/directbl.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
+ include/perfhash.h include/strlist.h include/tables.h x86/iflaggen.h \
  x86/insnsi.h x86/regs.h
+asm/directbl.$(O): asm/directbl.c asm/directiv.h config/config.h \
+ config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
+ include/nasmint.h include/nasmlib.h include/perfhash.h
 asm/directiv.$(O): asm/directiv.c asm/assemble.h asm/directiv.h asm/eval.h \
  asm/float.h asm/listing.h asm/pptok.h asm/preproc.h asm/stdscan.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/error.h include/iflag.h include/labels.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h output/outform.h x86/iflaggen.h \
- x86/insnsi.h x86/regs.h
+ include/perfhash.h include/strlist.h include/tables.h output/outform.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/error.$(O): asm/error.c config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasmint.h \
  include/nasmlib.h
@@ -407,47 +407,49 @@ asm/eval.$(O): asm/eval.c asm/assemble.h asm/directiv.h asm/eval.h \
  asm/float.h asm/pptok.h asm/preproc.h config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/error.h \
  include/iflag.h include/labels.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/exprdump.$(O): asm/exprdump.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/opflags.h include/perfhash.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/exprlib.$(O): asm/exprlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/opflags.h include/perfhash.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/float.$(O): asm/float.c asm/directiv.h asm/float.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/labels.$(O): asm/labels.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/error.h include/hashtbl.h include/labels.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
+ include/perfhash.h include/strlist.h include/tables.h x86/insnsi.h \
+ x86/regs.h
 asm/listing.$(O): asm/listing.c asm/directiv.h asm/listing.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/nasm.$(O): asm/nasm.c asm/assemble.h asm/directiv.h asm/eval.h \
  asm/float.h asm/listing.h asm/parser.h asm/pptok.h asm/preproc.h \
  asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/iflag.h \
  include/insns.h include/labels.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/raa.h include/saa.h \
- include/strlist.h include/tables.h include/ver.h output/outform.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/raa.h \
+ include/saa.h include/strlist.h include/tables.h include/ver.h \
+ output/outform.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/parser.$(O): asm/parser.c asm/assemble.h asm/directiv.h asm/eval.h \
  asm/float.h asm/parser.h asm/pptok.h asm/preproc.h asm/stdscan.h \
  asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/error.h include/iflag.h include/insns.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/perfhash.h include/strlist.h include/tables.h x86/iflaggen.h \
+ x86/insnsi.h x86/regs.h
 asm/pptok.$(O): asm/pptok.c asm/pptok.h asm/preproc.h config/config.h \
  config/msvc.h config/unknown.h config/watcom.h include/compiler.h \
  include/hashtbl.h include/nasmint.h include/nasmlib.h
@@ -455,73 +457,78 @@ asm/pragma.$(O): asm/pragma.c asm/assemble.h asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/iflag.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/perfhash.h include/strlist.h include/tables.h x86/iflaggen.h \
+ x86/insnsi.h x86/regs.h
 asm/preproc-nop.$(O): asm/preproc-nop.c asm/directiv.h asm/listing.h \
  asm/pptok.h asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/preproc.$(O): asm/preproc.c asm/directiv.h asm/eval.h asm/listing.h \
  asm/pptok.h asm/preproc.h asm/quote.h asm/stdscan.h asm/tokens.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/error.h include/hashtbl.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 asm/quote.$(O): asm/quote.c asm/quote.h config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
 asm/rdstrnum.$(O): asm/rdstrnum.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/opflags.h include/perfhash.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/segalloc.$(O): asm/segalloc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/stdscan.$(O): asm/stdscan.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/quote.h asm/stdscan.h asm/tokens.h config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/error.h \
  include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 asm/strfunc.$(O): asm/strfunc.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/opflags.h include/perfhash.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 asm/tokhash.$(O): asm/tokhash.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/stdscan.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/hashtbl.h include/iflag.h \
  include/insns.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/iflaggen.h \
- x86/insnsi.h x86/regs.h
+ include/opflags.h include/perfhash.h include/strlist.h include/tables.h \
+ x86/iflaggen.h x86/insnsi.h x86/regs.h
 common/common.$(O): common/common.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 disasm/disasm.$(O): disasm/disasm.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
  disasm/disasm.h disasm/sync.h include/compiler.h include/disp8.h \
  include/iflag.h include/insns.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/iflaggen.h x86/insnsi.h x86/regdis.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h x86/iflaggen.h x86/insnsi.h x86/regdis.h x86/regs.h
 disasm/ndisasm.$(O): disasm/ndisasm.c asm/directiv.h asm/pptok.h \
  asm/preproc.h asm/tokens.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h disasm/disasm.h disasm/sync.h include/compiler.h \
  include/error.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h include/ver.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h include/ver.h x86/iflaggen.h \
+ x86/insnsi.h x86/regs.h
 disasm/sync.$(O): disasm/sync.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h disasm/sync.h include/compiler.h \
  include/nasmint.h include/nasmlib.h
 macros/macros.$(O): macros/macros.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/hashtbl.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- output/outform.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h output/outform.h x86/insnsi.h x86/regs.h
+nasmlib/badenum.$(O): nasmlib/badenum.c config/config.h config/msvc.h \
+ config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
+ include/nasmlib.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -537,8 +544,8 @@ nasmlib/filename.$(O): nasmlib/filename.c config/config.h config/msvc.h \
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/hashtbl.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 nasmlib/ilog2.$(O): nasmlib/ilog2.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -551,6 +558,9 @@ nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h \
 nasmlib/mmap.$(O): nasmlib/mmap.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/error.h \
  include/nasmint.h include/nasmlib.h nasmlib/file.h
+nasmlib/perfhash.$(O): nasmlib/perfhash.c config/config.h config/msvc.h \
+ config/unknown.h config/watcom.h include/compiler.h include/hashtbl.h \
+ include/nasmint.h include/nasmlib.h include/perfhash.h
 nasmlib/raa.$(O): nasmlib/raa.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h include/raa.h
@@ -560,8 +570,8 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/config.h config/msvc.h \
 nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/insnsi.h x86/regs.h
 nasmlib/realpath.$(O): nasmlib/realpath.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -585,93 +595,96 @@ output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/hashtbl.h \
  include/md5.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/saa.h include/strlist.h include/tables.h \
- output/outlib.h output/pecoff.h version.h x86/insnsi.h x86/regs.h
+ include/opflags.h include/perfhash.h include/saa.h include/strlist.h \
+ include/tables.h output/outlib.h output/pecoff.h version.h x86/insnsi.h \
+ x86/regs.h
 output/legacy.$(O): output/legacy.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/error.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
 output/nulldbg.$(O): output/nulldbg.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
 output/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
- include/saa.h include/strlist.h include/tables.h output/outform.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/raa.h include/saa.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outas86.$(O): output/outas86.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
- include/saa.h include/strlist.h include/tables.h output/outform.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/raa.h include/saa.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outbin.$(O): output/outbin.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/labels.h \
  include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
- include/saa.h include/strlist.h include/tables.h output/outform.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/perfhash.h include/saa.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outcoff.$(O): output/outcoff.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
- include/saa.h include/strlist.h include/tables.h output/outform.h \
- output/outlib.h output/pecoff.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/raa.h include/saa.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h output/pecoff.h x86/insnsi.h x86/regs.h
 output/outdbg.$(O): output/outdbg.c asm/directiv.h asm/pptok.h asm/preproc.h \
- config/config.h config/msvc.h config/unknown.h config/watcom.h \
- include/compiler.h include/error.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
+ include/compiler.h include/error.h include/iflag.h include/insns.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/perfhash.h include/strlist.h include/tables.h output/outform.h \
+ output/outlib.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 output/outelf.$(O): output/outelf.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
- include/rbtree.h include/saa.h include/strlist.h include/tables.h \
- include/ver.h output/dwarf.h output/elf.h output/outelf.h output/outform.h \
- output/outlib.h output/stabs.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/raa.h include/rbtree.h include/saa.h include/strlist.h \
+ include/tables.h include/ver.h output/dwarf.h output/elf.h output/outelf.h \
+ output/outform.h output/outlib.h output/stabs.h x86/insnsi.h x86/regs.h
 output/outform.$(O): output/outform.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- output/outform.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h output/outform.h x86/insnsi.h x86/regs.h
 output/outieee.$(O): output/outieee.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h include/ver.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h include/ver.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outlib.$(O): output/outlib.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/error.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h output/outlib.h x86/insnsi.h x86/regs.h
 output/outmacho.$(O): output/outmacho.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
- config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/raa.h \
- include/rbtree.h include/saa.h include/strlist.h include/tables.h \
- output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
+ config/watcom.h include/compiler.h include/error.h include/labels.h \
+ include/nasm.h include/nasmint.h include/nasmlib.h include/opflags.h \
+ include/perfhash.h include/raa.h include/rbtree.h include/saa.h \
+ include/strlist.h include/tables.h output/outform.h output/outlib.h \
+ x86/insnsi.h x86/regs.h
 output/outobj.$(O): output/outobj.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h include/ver.h output/outform.h output/outlib.h \
- x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h include/ver.h output/outform.h \
+ output/outlib.h x86/insnsi.h x86/regs.h
 output/outrdf2.$(O): output/outrdf2.c asm/directiv.h asm/pptok.h \
  asm/preproc.h config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/error.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/rdoff.h \
- include/saa.h include/strlist.h include/tables.h output/outform.h \
- output/outlib.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/rdoff.h include/saa.h include/strlist.h include/tables.h \
+ output/outform.h output/outlib.h x86/insnsi.h x86/regs.h
 stdlib/snprintf.$(O): stdlib/snprintf.c config/config.h config/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/nasmint.h \
  include/nasmlib.h
@@ -685,26 +698,26 @@ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/config.h config/msvc.h \
 x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/disp8.h include/nasm.h include/nasmint.h \
- include/nasmlib.h include/opflags.h include/strlist.h include/tables.h \
- x86/insnsi.h x86/regs.h
+ include/nasmlib.h include/opflags.h include/perfhash.h include/strlist.h \
+ include/tables.h x86/insnsi.h x86/regs.h
 x86/iflag.$(O): x86/iflag.c config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/iflag.h include/nasmint.h \
  x86/iflaggen.h
 x86/insnsa.$(O): x86/insnsa.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 x86/insnsb.$(O): x86/insnsb.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 x86/insnsd.$(O): x86/insnsd.c asm/directiv.h asm/pptok.h asm/preproc.h \
  asm/tokens.h config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/iflag.h include/insns.h include/nasm.h \
- include/nasmint.h include/nasmlib.h include/opflags.h include/strlist.h \
- include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
+ include/nasmint.h include/nasmlib.h include/opflags.h include/perfhash.h \
+ include/strlist.h include/tables.h x86/iflaggen.h x86/insnsi.h x86/regs.h
 x86/insnsn.$(O): x86/insnsn.c config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/tables.h \
  x86/insnsi.h
@@ -712,8 +725,8 @@ x86/regdis.$(O): x86/regdis.c x86/regdis.h x86/regs.h
 x86/regflags.$(O): x86/regflags.c asm/directiv.h asm/pptok.h asm/preproc.h \
  config/config.h config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasm.h include/nasmint.h include/nasmlib.h \
- include/opflags.h include/strlist.h include/tables.h x86/insnsi.h \
- x86/regs.h
+ include/opflags.h include/perfhash.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 x86/regs.$(O): x86/regs.c config/config.h config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/tables.h \
  x86/insnsi.h