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>

3 files changed, 313 insertions, 274 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index b62f5db7..ee003937 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -67,6 +67,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) \
@@ -275,134 +276,141 @@ asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h \
  asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.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/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/iflaggen.h x86/insnsi.h x86/regs.h
+asm/directbl.$(O): asm/directbl.c asm/directiv.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/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/nasmint.h include/nasmlib.h include/opflags.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/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/error.h include/nasmint.h include/nasmlib.h
 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/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/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/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/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/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/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/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/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/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/nasmint.h include/nasmlib.h include/opflags.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/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/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/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/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/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/msvc.h \
  config/unknown.h config/watcom.h include/compiler.h include/hashtbl.h \
  include/nasmint.h include/nasmlib.h
 asm/pragma.$(O): asm/pragma.c asm/assemble.h asm/directiv.h asm/pptok.h \
  asm/preproc.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/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/preproc-nop.$(O): asm/preproc-nop.c asm/directiv.h asm/listing.h \
  asm/pptok.h asm/preproc.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/msvc.h config/unknown.h \
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h \
@@ -417,8 +425,8 @@ nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h \
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h \
  asm/preproc.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/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/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h \
@@ -429,6 +437,9 @@ nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h \
 nasmlib/mmap.$(O): nasmlib/mmap.c 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/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/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h \
  include/raa.h
@@ -437,8 +448,8 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h \
 nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h \
  asm/preproc.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/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/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/saa.$(O): nasmlib/saa.c config/msvc.h config/unknown.h \
@@ -459,91 +470,94 @@ output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h \
  asm/preproc.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/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/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/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/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/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h \
  asm/preproc.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/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h \
  asm/preproc.h asm/stdscan.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/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/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/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/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/nasmint.h include/nasmlib.h include/opflags.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/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/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/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/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/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 \
+ 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/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/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/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/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/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/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/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
+ 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/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/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/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/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/msvc.h config/unknown.h \
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h \
@@ -556,32 +570,33 @@ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h \
 x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.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/opflags.h include/perfhash.h include/strlist.h include/tables.h \
+ x86/insnsi.h x86/regs.h
 x86/iflag.$(O): x86/iflag.c 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/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/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/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/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
 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/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/perfhash.h include/strlist.h include/tables.h x86/insnsi.h \
+ x86/regs.h
 x86/regs.$(O): x86/regs.c config/msvc.h config/unknown.h config/watcom.h \
  include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
 x86/regvals.$(O): x86/regvals.c config/msvc.h config/unknown.h \
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index b5cafffa..31737dbf 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -44,6 +44,7 @@ LIBOBJ = snprintf.o vsnprintf.o strlcpy.o \
 	rbtree.o hashtbl.o \
 	raa.o saa.o \
 	strlist.o \
+	perfhash.o badenum.o \
 	common.o \
 	insnsa.o insnsb.o insnsd.o insnsn.o \
 	regs.o regvals.o regflags.o regdis.o \
@@ -155,92 +156,93 @@ $(OBJDIR)/version.mak: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR)
 #-- Everything below is generated by mkdep.pl - do not edit --#
 assemble.o: assemble.c assemble.h directiv.h listing.h pptok.h preproc.h \
  tokens.h config.h msvc.h unknown.h watcom.h compiler.h disp8.h error.h \
- iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- iflaggen.h insnsi.h regs.h
-directbl.o: directbl.c directiv.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h insnsi.h regs.h
+ iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h strlist.h \
+ tables.h iflaggen.h insnsi.h regs.h
+directbl.o: directbl.c directiv.h config.h msvc.h unknown.h watcom.h \
+ compiler.h nasmint.h nasmlib.h perfhash.h
 directiv.o: directiv.c assemble.h directiv.h eval.h float.h listing.h \
  pptok.h preproc.h stdscan.h config.h msvc.h unknown.h watcom.h compiler.h \
- error.h iflag.h labels.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h outform.h iflaggen.h insnsi.h regs.h
+ error.h iflag.h labels.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h outform.h iflaggen.h insnsi.h regs.h
 error.o: error.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
  nasmint.h nasmlib.h
 eval.o: eval.c assemble.h directiv.h eval.h float.h pptok.h preproc.h \
  config.h msvc.h unknown.h watcom.h compiler.h error.h iflag.h labels.h \
- nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
- regs.h
+ nasm.h nasmint.h nasmlib.h opflags.h perfhash.h strlist.h tables.h \
+ iflaggen.h insnsi.h regs.h
 exprdump.o: exprdump.c directiv.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ perfhash.h strlist.h tables.h insnsi.h regs.h
 exprlib.o: exprlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- insnsi.h regs.h
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h insnsi.h regs.h
 float.o: float.c directiv.h float.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ perfhash.h strlist.h tables.h insnsi.h regs.h
 labels.o: labels.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h error.h hashtbl.h labels.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h insnsi.h regs.h
 listing.o: listing.c directiv.h listing.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ perfhash.h strlist.h tables.h insnsi.h regs.h
 nasm.o: nasm.c assemble.h directiv.h eval.h float.h listing.h parser.h \
  pptok.h preproc.h stdscan.h tokens.h config.h msvc.h unknown.h watcom.h \
  compiler.h error.h iflag.h insns.h labels.h nasm.h nasmint.h nasmlib.h \
- opflags.h raa.h saa.h strlist.h tables.h ver.h outform.h iflaggen.h \
- insnsi.h regs.h
+ opflags.h perfhash.h raa.h saa.h strlist.h tables.h ver.h outform.h \
+ iflaggen.h insnsi.h regs.h
 parser.o: parser.c assemble.h directiv.h eval.h float.h parser.h pptok.h \
  preproc.h stdscan.h tokens.h config.h msvc.h unknown.h watcom.h compiler.h \
- error.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h iflaggen.h insnsi.h regs.h
+ error.h iflag.h insns.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h iflaggen.h insnsi.h regs.h
 pptok.o: pptok.c pptok.h preproc.h config.h msvc.h unknown.h watcom.h \
  compiler.h hashtbl.h nasmint.h nasmlib.h
 pragma.o: pragma.c assemble.h directiv.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h error.h iflag.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 preproc-nop.o: preproc-nop.c directiv.h listing.h pptok.h preproc.h config.h \
  msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h insnsi.h regs.h
 preproc.o: preproc.c directiv.h eval.h listing.h pptok.h preproc.h quote.h \
  stdscan.h tokens.h config.h msvc.h unknown.h watcom.h compiler.h error.h \
- hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h insnsi.h \
- regs.h
+ hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h strlist.h \
+ tables.h insnsi.h regs.h
 quote.o: quote.c quote.h config.h msvc.h unknown.h watcom.h compiler.h \
  nasmint.h nasmlib.h
 rdstrnum.o: rdstrnum.c directiv.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ perfhash.h strlist.h tables.h insnsi.h regs.h
 segalloc.o: segalloc.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 stdscan.o: stdscan.c directiv.h pptok.h preproc.h quote.h stdscan.h tokens.h \
  config.h msvc.h unknown.h watcom.h compiler.h error.h iflag.h insns.h \
- nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
- regs.h
+ nasm.h nasmint.h nasmlib.h opflags.h perfhash.h strlist.h tables.h \
+ iflaggen.h insnsi.h regs.h
 strfunc.o: strfunc.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- insnsi.h regs.h
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h insnsi.h regs.h
 tokhash.o: tokhash.c directiv.h pptok.h preproc.h stdscan.h tokens.h \
  config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h iflag.h insns.h \
- nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
- regs.h
+ nasm.h nasmint.h nasmlib.h opflags.h perfhash.h strlist.h tables.h \
+ iflaggen.h insnsi.h regs.h
 common.o: common.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 disasm.o: disasm.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h disasm.h sync.h compiler.h disp8.h iflag.h insns.h \
- nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h iflaggen.h insnsi.h \
- regdis.h regs.h
+ nasm.h nasmint.h nasmlib.h opflags.h perfhash.h strlist.h tables.h \
+ iflaggen.h insnsi.h regdis.h regs.h
 ndisasm.o: ndisasm.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h disasm.h sync.h compiler.h error.h iflag.h insns.h \
- nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h ver.h iflaggen.h \
- insnsi.h regs.h
+ nasm.h nasmint.h nasmlib.h opflags.h perfhash.h strlist.h tables.h ver.h \
+ iflaggen.h insnsi.h regs.h
 sync.o: sync.c config.h msvc.h unknown.h watcom.h sync.h compiler.h \
  nasmint.h nasmlib.h
 macros.o: macros.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h outform.h insnsi.h regs.h
+ perfhash.h strlist.h tables.h outform.h insnsi.h regs.h
+badenum.o: badenum.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
+ nasmlib.h
 bsi.o: bsi.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
 crc64.o: crc64.c config.h msvc.h unknown.h watcom.h compiler.h hashtbl.h \
@@ -251,7 +253,7 @@ filename.o: filename.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
  nasmint.h nasmlib.h
 hashtbl.o: hashtbl.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
  watcom.h compiler.h hashtbl.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ perfhash.h strlist.h tables.h insnsi.h regs.h
 ilog2.o: ilog2.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
 malloc.o: malloc.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
@@ -259,13 +261,15 @@ malloc.o: malloc.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
 md5c.o: md5c.c config.h msvc.h unknown.h watcom.h compiler.h md5.h nasmint.h
 mmap.o: mmap.c config.h msvc.h unknown.h watcom.h compiler.h error.h \
  nasmint.h nasmlib.h file.h
+perfhash.o: perfhash.c config.h msvc.h unknown.h watcom.h compiler.h \
+ hashtbl.h nasmint.h nasmlib.h perfhash.h
 raa.o: raa.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h raa.h
 rbtree.o: rbtree.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  rbtree.h
 readnum.o: readnum.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h insnsi.h regs.h
 realpath.o: realpath.c config.h msvc.h unknown.h watcom.h compiler.h \
  nasmint.h nasmlib.h
 saa.o: saa.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
@@ -281,55 +285,60 @@ zerobuf.o: zerobuf.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  nasmlib.h
 codeview.o: codeview.c directiv.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h error.h hashtbl.h md5.h nasm.h nasmint.h \
- nasmlib.h opflags.h saa.h strlist.h tables.h outlib.h pecoff.h version.h \
- insnsi.h regs.h
+ nasmlib.h opflags.h perfhash.h saa.h strlist.h tables.h outlib.h pecoff.h \
+ version.h insnsi.h regs.h
 legacy.o: legacy.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h outlib.h insnsi.h regs.h
 nulldbg.o: nulldbg.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h outlib.h insnsi.h regs.h
 nullout.o: nullout.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h outlib.h insnsi.h regs.h
 outaout.o: outaout.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
  msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
- opflags.h raa.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ opflags.h perfhash.h raa.h saa.h strlist.h tables.h outform.h outlib.h \
+ insnsi.h regs.h
 outas86.o: outas86.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h raa.h \
- saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ raa.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
 outbin.o: outbin.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
  msvc.h unknown.h watcom.h compiler.h error.h labels.h nasm.h nasmint.h \
- nasmlib.h opflags.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h \
- regs.h
+ nasmlib.h opflags.h perfhash.h saa.h strlist.h tables.h outform.h outlib.h \
+ insnsi.h regs.h
 outcoff.o: outcoff.c directiv.h eval.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
- raa.h saa.h strlist.h tables.h outform.h outlib.h pecoff.h insnsi.h regs.h
-outdbg.o: outdbg.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h outform.h outlib.h insnsi.h regs.h
+ perfhash.h raa.h saa.h strlist.h tables.h outform.h outlib.h pecoff.h \
+ insnsi.h regs.h
+outdbg.o: outdbg.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
+ unknown.h watcom.h compiler.h error.h iflag.h insns.h nasm.h nasmint.h \
+ nasmlib.h opflags.h perfhash.h strlist.h tables.h outform.h outlib.h \
+ iflaggen.h insnsi.h regs.h
 outelf.o: outelf.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
  msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
- opflags.h raa.h rbtree.h saa.h strlist.h tables.h ver.h dwarf.h elf.h \
- outelf.h outform.h outlib.h stabs.h insnsi.h regs.h
+ opflags.h perfhash.h raa.h rbtree.h saa.h strlist.h tables.h ver.h dwarf.h \
+ elf.h outelf.h outform.h outlib.h stabs.h insnsi.h regs.h
 outform.o: outform.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h tables.h \
- outform.h insnsi.h regs.h
+ watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h outform.h insnsi.h regs.h
 outieee.o: outieee.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h ver.h outform.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h ver.h outform.h outlib.h insnsi.h regs.h
 outlib.o: outlib.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h outlib.h insnsi.h regs.h
 outmacho.o: outmacho.c directiv.h pptok.h preproc.h config.h msvc.h \
- unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h \
- raa.h rbtree.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ unknown.h watcom.h compiler.h error.h labels.h nasm.h nasmint.h nasmlib.h \
+ opflags.h perfhash.h raa.h rbtree.h saa.h strlist.h tables.h outform.h \
+ outlib.h insnsi.h regs.h
 outobj.o: outobj.c directiv.h eval.h pptok.h preproc.h stdscan.h config.h \
  msvc.h unknown.h watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h ver.h outform.h outlib.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h ver.h outform.h outlib.h insnsi.h \
+ regs.h
 outrdf2.o: outrdf2.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h rdoff.h \
- saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
+ watcom.h compiler.h error.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ rdoff.h saa.h strlist.h tables.h outform.h outlib.h insnsi.h regs.h
 snprintf.o: snprintf.c config.h msvc.h unknown.h watcom.h compiler.h \
  nasmint.h nasmlib.h
 strlcpy.o: strlcpy.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h
@@ -337,25 +346,25 @@ strnlen.o: strnlen.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h
 vsnprintf.o: vsnprintf.c config.h msvc.h unknown.h watcom.h compiler.h \
  error.h nasmint.h nasmlib.h
 disp8.o: disp8.c directiv.h pptok.h preproc.h config.h msvc.h unknown.h \
- watcom.h compiler.h disp8.h nasm.h nasmint.h nasmlib.h opflags.h strlist.h \
- tables.h insnsi.h regs.h
+ watcom.h compiler.h disp8.h nasm.h nasmint.h nasmlib.h opflags.h perfhash.h \
+ strlist.h tables.h insnsi.h regs.h
 iflag.o: iflag.c config.h msvc.h unknown.h watcom.h compiler.h iflag.h \
  nasmint.h iflaggen.h
 insnsa.o: insnsa.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 insnsb.o: insnsb.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 insnsd.o: insnsd.c directiv.h pptok.h preproc.h tokens.h config.h msvc.h \
  unknown.h watcom.h compiler.h iflag.h insns.h nasm.h nasmint.h nasmlib.h \
- opflags.h strlist.h tables.h iflaggen.h insnsi.h regs.h
+ opflags.h perfhash.h strlist.h tables.h iflaggen.h insnsi.h regs.h
 insnsn.o: insnsn.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  tables.h insnsi.h
 regdis.o: regdis.c regdis.h regs.h
 regflags.o: regflags.c directiv.h pptok.h preproc.h config.h msvc.h \
  unknown.h watcom.h compiler.h nasm.h nasmint.h nasmlib.h opflags.h \
- strlist.h tables.h insnsi.h regs.h
+ perfhash.h strlist.h tables.h insnsi.h regs.h
 regs.o: regs.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
  tables.h insnsi.h
 regvals.o: regvals.c config.h msvc.h unknown.h watcom.h compiler.h nasmint.h \
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 8e78213d..b88e0172 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -60,6 +60,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) &
@@ -277,134 +278,141 @@ asm/assemble.$(O): asm/assemble.c asm/assemble.h asm/directiv.h &
  asm/listing.h asm/pptok.h asm/preproc.h asm/tokens.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/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/iflaggen.h x86/insnsi.h x86/regs.h
+asm/directbl.$(O): asm/directbl.c asm/directiv.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/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/nasmint.h include/nasmlib.h include/opflags.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/msvc.h config/unknown.h config/watcom.h &
  include/compiler.h include/error.h include/nasmint.h include/nasmlib.h
 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/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/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/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/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/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/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/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/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/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/nasmint.h include/nasmlib.h include/opflags.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/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/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/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/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/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/msvc.h &
  config/unknown.h config/watcom.h include/compiler.h include/hashtbl.h &
  include/nasmint.h include/nasmlib.h
 asm/pragma.$(O): asm/pragma.c asm/assemble.h asm/directiv.h asm/pptok.h &
  asm/preproc.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/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/preproc-nop.$(O): asm/preproc-nop.c asm/directiv.h asm/listing.h &
  asm/pptok.h asm/preproc.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/msvc.h config/unknown.h &
+ config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/bsi.$(O): nasmlib/bsi.c config/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/crc64.$(O): nasmlib/crc64.c config/msvc.h config/unknown.h &
@@ -419,8 +427,8 @@ nasmlib/filename.$(O): nasmlib/filename.c config/msvc.h config/unknown.h &
 nasmlib/hashtbl.$(O): nasmlib/hashtbl.c asm/directiv.h asm/pptok.h &
  asm/preproc.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/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/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/malloc.$(O): nasmlib/malloc.c config/msvc.h config/unknown.h &
@@ -431,6 +439,9 @@ nasmlib/md5c.$(O): nasmlib/md5c.c config/msvc.h config/unknown.h &
 nasmlib/mmap.$(O): nasmlib/mmap.c 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/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/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h &
  include/raa.h
@@ -439,8 +450,8 @@ nasmlib/rbtree.$(O): nasmlib/rbtree.c config/msvc.h config/unknown.h &
 nasmlib/readnum.$(O): nasmlib/readnum.c asm/directiv.h asm/pptok.h &
  asm/preproc.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/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/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 nasmlib/saa.$(O): nasmlib/saa.c config/msvc.h config/unknown.h &
@@ -461,91 +472,94 @@ output/codeview.$(O): output/codeview.c asm/directiv.h asm/pptok.h &
  asm/preproc.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/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/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/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/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/nullout.$(O): output/nullout.c asm/directiv.h asm/pptok.h &
  asm/preproc.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/outaout.$(O): output/outaout.c asm/directiv.h asm/eval.h asm/pptok.h &
  asm/preproc.h asm/stdscan.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/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/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/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/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/nasmint.h include/nasmlib.h include/opflags.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/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/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/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/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/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 &
+ 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/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/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/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/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/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/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/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
+ 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/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/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/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/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/msvc.h config/unknown.h &
  config/watcom.h include/compiler.h include/nasmint.h include/nasmlib.h
 stdlib/strlcpy.$(O): stdlib/strlcpy.c config/msvc.h config/unknown.h &
@@ -558,32 +572,33 @@ stdlib/vsnprintf.$(O): stdlib/vsnprintf.c config/msvc.h config/unknown.h &
 x86/disp8.$(O): x86/disp8.c asm/directiv.h asm/pptok.h asm/preproc.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/opflags.h include/perfhash.h include/strlist.h include/tables.h &
+ x86/insnsi.h x86/regs.h
 x86/iflag.$(O): x86/iflag.c 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/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/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/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/msvc.h config/unknown.h config/watcom.h &
  include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
 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/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/perfhash.h include/strlist.h include/tables.h x86/insnsi.h &
+ x86/regs.h
 x86/regs.$(O): x86/regs.c config/msvc.h config/unknown.h config/watcom.h &
  include/compiler.h include/nasmint.h include/tables.h x86/insnsi.h
 x86/regvals.$(O): x86/regvals.c config/msvc.h config/unknown.h &