Finishing touches on perfect hash tokenizer; actually turn the thing on

Finish the perfect hash tokenizer, and actually enable it.

Move stdscan() et al to a separate file, since it's not needed in any
of the clients of nasmlib other than nasm itself.

Run make alldeps.

19 files changed, 205 insertions, 133 deletions

diff --git a/Mkfiles/Makefile.b32 b/Mkfiles/Makefile.b32
index ec5fe9b..3981898 100644
--- a/Mkfiles/Makefile.b32
+++ b/Mkfiles/Makefile.b32
@@ -189,42 +189,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output\outaout.$(OBJ): output\outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output\outas86.$(OBJ): output\outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outbin.$(OBJ): output\outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output\outcoff.$(OBJ): output\outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outdbg.$(OBJ): output\outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outelf32.$(OBJ): output\outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\outelf64.$(OBJ): output\outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\outieee.$(OBJ): output\outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outmacho.$(OBJ): output\outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output\outobj.$(OBJ): output\outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output\outrdf.$(OBJ): output\outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outrdf2.$(OBJ): output\outrdf2.c rdoff\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.bc3 b/Mkfiles/Makefile.bc3
index 91777ce..01cb586 100644
--- a/Mkfiles/Makefile.bc3
+++ b/Mkfiles/Makefile.bc3
@@ -149,42 +149,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output\\outaout.$(OBJ): output\\outaout.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\\outas86.$(OBJ): output\\outas86.c regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output\\outbin.$(OBJ): output\\outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output\\outcoff.$(OBJ): output\\outcoff.c regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output\\outdbg.$(OBJ): output\\outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\\outelf32.$(OBJ): output\\outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\\outelf64.$(OBJ): output\\outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\\outieee.$(OBJ): output\\outieee.c regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output\\outmacho.$(OBJ): output\\outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output\\outobj.$(OBJ): output\\outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output\\outrdf.$(OBJ): output\\outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\\outrdf2.$(OBJ): output\\outrdf2.c rdoff\\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.bor b/Mkfiles/Makefile.bor
index 92a9771..69a7e1d 100644
--- a/Mkfiles/Makefile.bor
+++ b/Mkfiles/Makefile.bor
@@ -78,42 +78,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.dcp b/Mkfiles/Makefile.dcp
index 3642247..e0d4b1f 100644
--- a/Mkfiles/Makefile.dcp
+++ b/Mkfiles/Makefile.dcp
@@ -171,41 +171,44 @@ listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
 nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.o: output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.o: output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.o: output/outbin.c labels.h eval.h regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.o: output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.o: output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.o: output/outelf32.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outelf64.o: output/outelf64.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outieee.o: output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.o: output/outmacho.c compiler.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output/outobj.o: output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.o: output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
 regvals.o: regvals.c
+stdscan.o: stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.o: sync.c sync.h
+tokhash.o: tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 61b1cdd..b6a5a5e 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -100,41 +100,44 @@ listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
 nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.o: output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.o: output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.o: output/outbin.c labels.h eval.h regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.o: output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.o: output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.o: output/outelf32.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outelf64.o: output/outelf64.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outieee.o: output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.o: output/outmacho.c compiler.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output/outobj.o: output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.o: output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
 regvals.o: regvals.c
+stdscan.o: stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.o: sync.c sync.h
+tokhash.o: tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.djo b/Mkfiles/Makefile.djo
index 82cede6..0c6f8aa 100644
--- a/Mkfiles/Makefile.djo
+++ b/Mkfiles/Makefile.djo
@@ -107,41 +107,44 @@ listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
 nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.o: output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.o: output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.o: output/outbin.c labels.h eval.h regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.o: output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.o: output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.o: output/outelf32.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outelf64.o: output/outelf64.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outieee.o: output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.o: output/outmacho.c compiler.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output/outobj.o: output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.o: output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
 regvals.o: regvals.c
+stdscan.o: stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.o: sync.c sync.h
+tokhash.o: tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.dl b/Mkfiles/Makefile.dl
index ceab7ea..662ecdd 100644
--- a/Mkfiles/Makefile.dl
+++ b/Mkfiles/Makefile.dl
@@ -63,42 +63,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.dos b/Mkfiles/Makefile.dos
index d4bbd3c..1537af0 100644
--- a/Mkfiles/Makefile.dos
+++ b/Mkfiles/Makefile.dos
@@ -76,42 +76,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.emx b/Mkfiles/Makefile.emx
index 57e0f2d..7127abb 100644
--- a/Mkfiles/Makefile.emx
+++ b/Mkfiles/Makefile.emx
@@ -157,41 +157,44 @@ listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
 nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.o: output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.o: output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.o: output/outbin.c labels.h eval.h regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.o: output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.o: output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.o: output/outelf32.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outelf64.o: output/outelf64.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outieee.o: output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.o: output/outmacho.c compiler.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output/outobj.o: output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.o: output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
 regvals.o: regvals.c
+stdscan.o: stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.o: sync.c sync.h
+tokhash.o: tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.lcc b/Mkfiles/Makefile.lcc
index fd8fc65..c74f56b 100644
--- a/Mkfiles/Makefile.lcc
+++ b/Mkfiles/Makefile.lcc
@@ -129,42 +129,46 @@ listing.${OBJ}: listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.${OBJ}: macros.c
 names.${OBJ}: names.c regs.c insnsn.c
 nasm.${OBJ}: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.${OBJ}: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.${OBJ}: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.${OBJ}: outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.${OBJ}: output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.${OBJ}: output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.${OBJ}: output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.${OBJ}: output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.${OBJ}: output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.${OBJ}: output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.${OBJ}: output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.${OBJ}: output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.${OBJ}: output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.${OBJ}: output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.${OBJ}: output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.${OBJ}: output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.${OBJ}: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.${OBJ}: preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.${OBJ}: regdis.c
 regflags.${OBJ}: regflags.c
 regs.${OBJ}: regs.c
 regvals.${OBJ}: regvals.c
+stdscan.${OBJ}: stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.${OBJ}: sync.c sync.h
+tokhash.${OBJ}: tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.ms7 b/Mkfiles/Makefile.ms7
index 31b486f..851d251 100644
--- a/Mkfiles/Makefile.ms7
+++ b/Mkfiles/Makefile.ms7
@@ -172,42 +172,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output\outaout.$(OBJ): output\outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output\outas86.$(OBJ): output\outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outbin.$(OBJ): output\outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output\outcoff.$(OBJ): output\outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outdbg.$(OBJ): output\outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outelf32.$(OBJ): output\outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\outelf64.$(OBJ): output\outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\outieee.$(OBJ): output\outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outmacho.$(OBJ): output\outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output\outobj.$(OBJ): output\outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output\outrdf.$(OBJ): output\outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\outrdf2.$(OBJ): output\outrdf2.c rdoff\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.os2 b/Mkfiles/Makefile.os2
index d903dbd..5aaac52 100644
--- a/Mkfiles/Makefile.os2
+++ b/Mkfiles/Makefile.os2
@@ -123,42 +123,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output\\outaout.$(OBJ): output\\outaout.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\\outas86.$(OBJ): output\\outas86.c regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output\\outbin.$(OBJ): output\\outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output\\outcoff.$(OBJ): output\\outcoff.c regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output\\outdbg.$(OBJ): output\\outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\\outelf32.$(OBJ): output\\outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\\outelf64.$(OBJ): output\\outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output\\outieee.$(OBJ): output\\outieee.c regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output\\outmacho.$(OBJ): output\\outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output\\outobj.$(OBJ): output\\outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output\\outrdf.$(OBJ): output\\outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output\\outrdf2.$(OBJ): output\\outrdf2.c rdoff\\rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.sc b/Mkfiles/Makefile.sc
index 0ee140f..6a080b5 100644
--- a/Mkfiles/Makefile.sc
+++ b/Mkfiles/Makefile.sc
@@ -105,42 +105,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.scw b/Mkfiles/Makefile.scw
index 44bbfb1..67b3413 100644
--- a/Mkfiles/Makefile.scw
+++ b/Mkfiles/Makefile.scw
@@ -102,42 +102,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.unx b/Mkfiles/Makefile.unx
index f0396cc..8c483fd 100644
--- a/Mkfiles/Makefile.unx
+++ b/Mkfiles/Makefile.unx
@@ -127,41 +127,44 @@ listing.o: listing.c regs.h config.h version.h nasmlib.h nasm.h listing.h
 macros.o: macros.c
 names.o: names.c regs.c insnsn.c
 nasm.o: nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h listing.h
 nasmlib.o: nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.o: ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.o: outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.o: output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.o: output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.o: output/outbin.c labels.h eval.h regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.o: output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.o: output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.o: output/outelf32.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outelf64.o: output/outelf64.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outieee.o: output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.o: output/outmacho.c compiler.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 output/outobj.o: output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.o: output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.o: output/outrdf2.c rdoff/rdoff.h regs.h outform.h config.h \
  version.h nasmlib.h nasm.h
 parser.o: parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.o: preproc.c macros.c regs.h config.h version.h nasmlib.h nasm.h
 regdis.o: regdis.c
 regflags.o: regflags.c
 regs.o: regs.c
 regvals.o: regvals.c
+stdscan.o: stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.o: sync.c sync.h
+tokhash.o: tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.vc b/Mkfiles/Makefile.vc
index 2d0ac38..1086921 100644
--- a/Mkfiles/Makefile.vc
+++ b/Mkfiles/Makefile.vc
@@ -117,42 +117,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.wc b/Mkfiles/Makefile.wc
index 84d4e76..61742dc 100644
--- a/Mkfiles/Makefile.wc
+++ b/Mkfiles/Makefile.wc
@@ -119,42 +119,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.wcd b/Mkfiles/Makefile.wcd
index 7a82e59..e64c062 100644
--- a/Mkfiles/Makefile.wcd
+++ b/Mkfiles/Makefile.wcd
@@ -104,39 +104,44 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 outaout.$(OBJ): outaout.c regs.h outform.h config.h version.h nasmlib.h \
- nasm.h
+ nasm.h stdscan.h
 outas86.$(OBJ): outas86.c regs.h outform.h config.h version.h nasmlib.h \
  nasm.h
 outbin.$(OBJ): outbin.c labels.h eval.h regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 outcoff.$(OBJ): outcoff.c regs.h outform.h config.h version.h nasmlib.h \
  nasm.h
 outdbg.$(OBJ): outdbg.c regs.h outform.h config.h version.h nasmlib.h nasm.h
 outelf32.$(OBJ): outelf32.c regs.h outform.h config.h version.h nasmlib.h \
- nasm.h
+ nasm.h stdscan.h
 outelf64.$(OBJ): outelf64.c regs.h outform.h config.h version.h nasmlib.h \
- nasm.h
+ nasm.h stdscan.h
 outieee.$(OBJ): outieee.c regs.h outform.h config.h version.h nasmlib.h \
  nasm.h
 outmacho.$(OBJ): outmacho.c compiler.h regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
-outobj.$(OBJ): outobj.c regs.h outform.h config.h version.h nasmlib.h nasm.h
+outobj.$(OBJ): outobj.c regs.h outform.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h
 outrdf.$(OBJ): outrdf.c regs.h outform.h config.h version.h nasmlib.h nasm.h
 outrdf2.$(OBJ): outrdf2.c rdoff.h regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h
diff --git a/Mkfiles/Makefile.wcw b/Mkfiles/Makefile.wcw
index 77f40bf..0409cd6 100644
--- a/Mkfiles/Makefile.wcw
+++ b/Mkfiles/Makefile.wcw
@@ -119,42 +119,46 @@ listing.$(OBJ): listing.c regs.h config.h version.h nasmlib.h nasm.h \
 macros.$(OBJ): macros.c
 names.$(OBJ): names.c regs.c insnsn.c
 nasm.$(OBJ): nasm.c labels.h preproc.h insns.h parser.h eval.h regs.h \
- outform.h config.h version.h nasmlib.h nasm.h assemble.h insnsi.h listing.h
+ outform.h config.h version.h nasmlib.h nasm.h stdscan.h assemble.h insnsi.h \
+ listing.h
 nasmlib.$(OBJ): nasmlib.c insns.h regs.h config.h regs.c version.h nasmlib.h \
  nasm.h insnsn.c names.c insnsi.h
 ndisasm.$(OBJ): ndisasm.c insns.h sync.h regs.h config.h version.h nasmlib.h \
  nasm.h insnsi.h disasm.h
 outform.$(OBJ): outform.c regs.h config.h outform.h version.h nasm.h
 output/outaout.$(OBJ): output/outaout.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outas86.$(OBJ): output/outas86.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outbin.$(OBJ): output/outbin.c labels.h eval.h regs.h outform.h \
- config.h version.h nasmlib.h nasm.h
+ config.h version.h nasmlib.h nasm.h stdscan.h
 output/outcoff.$(OBJ): output/outcoff.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outdbg.$(OBJ): output/outdbg.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outelf32.$(OBJ): output/outelf32.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outelf64.$(OBJ): output/outelf64.c regs.h outform.h config.h \
- version.h nasmlib.h nasm.h
+ version.h nasmlib.h nasm.h stdscan.h
 output/outieee.$(OBJ): output/outieee.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outmacho.$(OBJ): output/outmacho.c compiler.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 output/outobj.$(OBJ): output/outobj.c regs.h outform.h config.h version.h \
- nasmlib.h nasm.h
+ nasmlib.h nasm.h stdscan.h
 output/outrdf.$(OBJ): output/outrdf.c regs.h outform.h config.h version.h \
  nasmlib.h nasm.h
 output/outrdf2.$(OBJ): output/outrdf2.c rdoff/rdoff.h regs.h outform.h \
  config.h version.h nasmlib.h nasm.h
 parser.$(OBJ): parser.c insns.h parser.h float.h regs.h regflags.c config.h \
- version.h nasmlib.h nasm.h insnsi.h
+ version.h nasmlib.h nasm.h stdscan.h insnsi.h
 preproc.$(OBJ): preproc.c macros.c regs.h config.h version.h nasmlib.h \
  nasm.h
 regdis.$(OBJ): regdis.c
 regflags.$(OBJ): regflags.c
 regs.$(OBJ): regs.c
 regvals.$(OBJ): regvals.c
+stdscan.$(OBJ): stdscan.c insns.h regs.h config.h version.h nasmlib.h nasm.h \
+ stdscan.h insnsi.h
 sync.$(OBJ): sync.c sync.h
+tokhash.$(OBJ): tokhash.c insns.h regs.h config.h version.h nasm.h insnsi.h